From a27dbe8c820d82291df76afd4fdcefb306c72513 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Sat, 8 Jul 2023 22:58:33 +0200
Subject: [PATCH] [twitter] use 'TweetResultByRestId' endpoint (#4250)

allows accessing single Tweets without login
---
 gallery_dl/extractor/twitter.py | 57 +++++++++++++++++++++++++++------
 gallery_dl/version.py           |  2 +-
 2 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/gallery_dl/extractor/twitter.py b/gallery_dl/extractor/twitter.py
index 8c3fe8e4..3fe05738 100644
--- a/gallery_dl/extractor/twitter.py
+++ b/gallery_dl/extractor/twitter.py
@@ -929,16 +929,15 @@ Your reaction.""",
     def _tweets_single(self, tweet_id):
         tweets = []
 
-        for tweet in self.api.tweet_detail(tweet_id):
-            if tweet["rest_id"] == tweet_id or \
-                    tweet.get("_retweet_id_str") == tweet_id:
-                if self._user_obj is None:
-                    self._assign_user(tweet["core"]["user_results"]["result"])
-                tweets.append(tweet)
+        tweet = self.api.tweet_result_by_rest_id(tweet_id)
+        self._assign_user(tweet["core"]["user_results"]["result"])
 
-                tweet_id = tweet["legacy"].get("quoted_status_id_str")
-                if not tweet_id:
-                    break
+        while True:
+            tweets.append(tweet)
+            tweet_id = tweet["legacy"].get("quoted_status_id_str")
+            if not tweet_id:
+                break
+            tweet = self.api.tweet_result_by_rest_id(tweet_id)
 
         return tweets
 
@@ -1179,6 +1178,46 @@ class TwitterAPI():
             "responsive_web_enhance_cards_enabled": False,
         }
 
+    def tweet_result_by_rest_id(self, tweet_id):
+        endpoint = "/graphql/2ICDjqPd81tulZcYrtpTuQ/TweetResultByRestId"
+        params = {
+            "variables": self._json_dumps({
+                "tweetId": tweet_id,
+                "withCommunity": False,
+                "includePromotedContent": False,
+                "withVoice": False,
+            }),
+            "features": self._json_dumps({
+                "creator_subscriptions_tweet_preview_api_enabled": True,
+                "tweetypie_unmention_optimization_enabled": True,
+                "responsive_web_edit_tweet_api_enabled": True,
+                "graphql_is_translatable_rweb_tweet_is_translatable_enabled":
+                    True,
+                "view_counts_everywhere_api_enabled": True,
+                "longform_notetweets_consumption_enabled": True,
+                "responsive_web_twitter_article_tweet_consumption_enabled":
+                    False,
+                "tweet_awards_web_tipping_enabled": False,
+                "freedom_of_speech_not_reach_fetch_enabled": True,
+                "standardized_nudges_misinfo": True,
+                "tweet_with_visibility_results_prefer_gql_"
+                "limited_actions_policy_enabled": True,
+                "longform_notetweets_rich_text_read_enabled": True,
+                "longform_notetweets_inline_media_enabled": True,
+                "responsive_web_graphql_exclude_directive_enabled": True,
+                "verified_phone_label_enabled": False,
+                "responsive_web_media_download_video_enabled": False,
+                "responsive_web_graphql_skip_user_profile_"
+                "image_extensions_enabled": False,
+                "responsive_web_graphql_timeline_navigation_enabled": True,
+                "responsive_web_enhance_cards_enabled": False,
+            }),
+            "fieldToggles": self._json_dumps({
+                "withArticleRichContentState": False,
+            }),
+        }
+        return self._call(endpoint, params)["data"]["tweetResult"]["result"]
+
     def tweet_detail(self, tweet_id):
         endpoint = "/graphql/JlLZj42Ltr2qwjasw-l5lQ/TweetDetail"
         variables = {
diff --git a/gallery_dl/version.py b/gallery_dl/version.py
index 39cfbd1c..bb5c28b3 100644
--- a/gallery_dl/version.py
+++ b/gallery_dl/version.py
@@ -6,4 +6,4 @@
 # it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
 
-__version__ = "1.26.0-dev"
+__version__ = "1.25.8-dev"