Scraper requests now report invalidated or expired sessions

pkg/scraper/api_errors.go

@@ -5,14 +5,15 @@ import (
 )
 
 var (
-	END_OF_FEED         = errors.New("End of feed")
+	END_OF_FEED           = errors.New("End of feed")
-	ErrDoesntExist      = errors.New("Doesn't exist")
+	ErrDoesntExist        = errors.New("Doesn't exist")
-	EXTERNAL_API_ERROR  = errors.New("Unexpected result from external API")
+	EXTERNAL_API_ERROR    = errors.New("Unexpected result from external API")
-	ErrorIsTombstone    = errors.New("tweet is a tombstone")
+	ErrorIsTombstone      = errors.New("tweet is a tombstone")
-	ErrRateLimited      = errors.New("rate limited")
+	ErrRateLimited        = errors.New("rate limited")
-	ErrorDMCA           = errors.New("video is DMCAed, unable to download (HTTP 403 Forbidden)")
+	ErrorDMCA             = errors.New("video is DMCAed, unable to download (HTTP 403 Forbidden)")
-	ErrMediaDownload404 = errors.New("media download HTTP 404")
+	ErrMediaDownload404   = errors.New("media download HTTP 404")
-	ErrLoginRequired    = errors.New("login required; please provide `--session <user>` flag")
+	ErrLoginRequired      = errors.New("login required; please provide `--session <user>` flag")
+	ErrSessionInvalidated = errors.New("session invalidated by Twitter")
 
 	// These are not API errors, but network errors generally
 	ErrNoInternet     = errors.New("no internet connection")

pkg/scraper/api_request_utils.go

@@ -155,6 +155,21 @@ func is_timeout(err error) bool {
 	return false
 }
 
+func is_session_invalidated(respBody []byte) bool {
+	var result struct {
+		Errors []struct {
+			Message string
+			Code    int
+		} `json:"errors"`
+	}
+	err := json.Unmarshal(respBody, &result)
+	if err != nil {
+		panic(err)
+	}
+	return len(result.Errors) == 1 &&
+		(result.Errors[0].Message == "Could not authenticate you" || result.Errors[0].Code == 32)
+}
+
 func (api *API) do_http_POST(remote_url string, body string, result interface{}) error {
 	req, err := http.NewRequest("POST", remote_url, strings.NewReader(body))
 	if err != nil {
@@ -198,6 +213,10 @@ func (api *API) do_http_POST(remote_url string, body string, result interface{})
 	}
 
 	if resp.StatusCode != 200 {
+		if resp.StatusCode == 401 && is_session_invalidated(respBody) {
+			return ErrSessionInvalidated
+		}
+
 		responseHeaders := ""
 		for header := range resp.Header {
 			responseHeaders += fmt.Sprintf("    %s: %s\n", header, resp.Header.Get(header))
@@ -260,6 +279,10 @@ func (api *API) do_http(remote_url string, cursor string, result interface{}) er
 	}
 
 	if resp.StatusCode != 200 && resp.StatusCode != 403 {
+		if resp.StatusCode == 401 && is_session_invalidated(body) {
+			return ErrSessionInvalidated
+		}
+
 		responseHeaders := ""
 		for header := range resp.Header {
 			responseHeaders += fmt.Sprintf("    %s: %s\n", header, resp.Header.Get(header))
@@ -365,6 +388,10 @@ func (api *API) DownloadMedia(remote_url string) ([]byte, error) {
 		}
 		print_curl_cmd(*req, api.Client.Jar.Cookies(url))
 
+		if resp.StatusCode == 401 && is_session_invalidated(body) {
+			return body, ErrSessionInvalidated
+		}
+
 		responseHeaders := ""
 		for header := range resp.Header {
 			responseHeaders += fmt.Sprintf("    %s: %s\n", header, resp.Header.Get(header))