twitter: add freebind support

imputnet · May 23, 2024 · 930faea · 930faea
1 parent 4bd3f54
commit 930faea
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/src/modules/processing/match.js b/src/modules/processing/match.js
@@ -62,7 +62,8 @@ export default async function(host, patternMatch, lang, obj) {
                 r = await twitter({
                     id: patternMatch.id,
                     index: patternMatch.index - 1,
-                    toGif: !!obj.twitterGif
+                    toGif: !!obj.twitterGif,
+                    dispatcher
                 });
                 break;
             case "vk":

diff --git a/src/modules/processing/services/twitter.js b/src/modules/processing/services/twitter.js
@@ -37,22 +37,23 @@ function bestQuality(arr) {
 }
 
 let _cachedToken;
-const getGuestToken = async (forceReload = false) => {
+const getGuestToken = async (dispatcher, forceReload = false) => {
     if (_cachedToken && !forceReload) {
         return _cachedToken;
     }
 
     const tokenResponse = await fetch(tokenURL, {
         method: 'POST',
-        headers: commonHeaders
+        headers: commonHeaders,
+        dispatcher
     }).then(r => r.status === 200 && r.json()).catch(() => {})
 
     if (tokenResponse?.guest_token) {
         return _cachedToken = tokenResponse.guest_token
     }
 }
 
-const requestTweet = async(tweetId, token, cookie) => {
+const requestTweet = async(dispatcher, tweetId, token, cookie) => {
     const graphqlTweetURL = new URL(graphqlURL);
 
     let headers = {
@@ -83,7 +84,7 @@ const requestTweet = async(tweetId, token, cookie) => {
     graphqlTweetURL.searchParams.set('features', tweetFeatures);
     graphqlTweetURL.searchParams.set('fieldToggles', tweetFieldToggles);
 
-    let result = await fetch(graphqlTweetURL, { headers });
+    let result = await fetch(graphqlTweetURL, { headers, dispatcher });
     updateCookie(cookie, result.headers);
 
     // we might have been missing the `ct0` cookie, retry
@@ -92,25 +93,26 @@ const requestTweet = async(tweetId, token, cookie) => {
             headers: {
                 ...headers,
                 'x-csrf-token': cookie.values().ct0
-            }
+            },
+            dispatcher
         });
     }
 
     return result
 }
 
-export default async function({ id, index, toGif }) {
+export default async function({ id, index, toGif, dispatcher }) {
     const cookie = await getCookie('twitter');
 
-    let guestToken = await getGuestToken();
+    let guestToken = await getGuestToken(dispatcher);
     if (!guestToken) return { error: 'ErrorCouldntFetch' };
 
-    let tweet = await requestTweet(id, guestToken);
+    let tweet = await requestTweet(dispatcher, id, guestToken);
 
     // get new token & retry if old one expired
     if ([403, 429].includes(tweet.status)) {
-        guestToken = await getGuestToken(true);
-        tweet = await requestTweet(id, guestToken)
+        guestToken = await getGuestToken(dispatcher, true);
+        tweet = await requestTweet(dispatcher, id, guestToken)
     }
 
     tweet = await tweet.json();
@@ -124,7 +126,7 @@ export default async function({ id, index, toGif }) {
                 return { error: 'ErrorTweetProtected' }
             case "NsfwLoggedOut":
                 if (cookie) {
-                    tweet = await requestTweet(id, guestToken, cookie);
+                    tweet = await requestTweet(dispatcher, id, guestToken, cookie);
                     tweet = await tweet.json();
                     tweetTypename = tweet?.data?.tweetResult?.result?.__typename;
                 } else return { error: 'ErrorTweetNSFW' }