diff --git a/src/api/status.ts b/src/api/status.ts index 65bace7..3c69107 100644 --- a/src/api/status.ts +++ b/src/api/status.ts @@ -225,7 +225,7 @@ export const statusAPI = async ( // console.log(JSON.stringify(tweet)) if (tweet.__typename === 'TweetUnavailable') { - if ((tweet as {reason: string})?.reason === 'Protected') { + if ((tweet as { reason: string })?.reason === 'Protected') { writeDataPoint(event, language, false, 'PRIVATE_TWEET', flags); return { code: 401, message: 'PRIVATE_TWEET' }; // } else if (tweet.reason === 'NsfwLoggedOut') { diff --git a/src/embed/status.ts b/src/embed/status.ts index bb110fc..97f9d8d 100644 --- a/src/embed/status.ts +++ b/src/embed/status.ts @@ -42,7 +42,11 @@ export const handleStatus = async ( isTelegram /*&& !tweet.possibly_sensitive*/ && !flags?.direct && !flags?.api && - (tweet.media?.mosaic || tweet.is_note_tweet || tweet.quote || tweet.translation || flags?.forceInstantView); + (tweet.media?.mosaic || + tweet.is_note_tweet || + tweet.quote || + tweet.translation || + flags?.forceInstantView); let ivbody = ''; diff --git a/src/experiments.ts b/src/experiments.ts index 88b72aa..f4e0af5 100644 --- a/src/experiments.ts +++ b/src/experiments.ts @@ -3,10 +3,10 @@ export enum Experiment { } type ExperimentConfig = { - name: string, - description: string, + name: string; + description: string; percentage: number; -} +}; const Experiments: { [key in Experiment]: ExperimentConfig } = { [Experiment.ELONGATOR_BY_DEFAULT]: { @@ -14,11 +14,12 @@ const Experiments: { [key in Experiment]: ExperimentConfig } = { description: 'Enable Elongator by default (guest token lockout bypass)', percentage: 0.5 } -} +}; export const experimentCheck = (experiment: Experiment, condition = true) => { - console.log(`Checking experiment ${experiment}`) - const experimentEnabled = Experiments[experiment].percentage > Math.random() && condition; - console.log(`Experiment ${experiment} enabled: ${experimentEnabled}`) + console.log(`Checking experiment ${experiment}`); + const experimentEnabled = + Experiments[experiment].percentage > Math.random() && condition; + console.log(`Experiment ${experiment} enabled: ${experimentEnabled}`); return experimentEnabled; -} \ No newline at end of file +}; diff --git a/src/fetch.ts b/src/fetch.ts index c31190c..a29046c 100644 --- a/src/fetch.ts +++ b/src/fetch.ts @@ -15,7 +15,8 @@ function generateCSRFToken() { export const twitterFetch = async ( url: string, event: FetchEvent, - useElongator = typeof TwitterProxy !== 'undefined' && experimentCheck(Experiment.ELONGATOR_BY_DEFAULT), + useElongator = typeof TwitterProxy !== 'undefined' && + experimentCheck(Experiment.ELONGATOR_BY_DEFAULT), validateFunction: (response: unknown) => boolean ): Promise => { let apiAttempts = 0; @@ -144,7 +145,8 @@ export const twitterFetch = async ( /* We'll usually only hit this if we get an invalid response from Twitter. It's uncommon, but it happens */ console.error('Unknown error while fetching from API', e); - !useElongator && event && + !useElongator && + event && event.waitUntil( cache.delete(guestTokenRequestCacheDummy.clone(), { ignoreMethod: true }) ); @@ -158,7 +160,13 @@ export const twitterFetch = async ( } // @ts-expect-error This is safe due to optional chaining - if (!wasElongatorDisabled && !useElongator && typeof TwitterProxy !== 'undefined' && (response as TweetResultsByRestIdResult)?.data?.tweetResult?.result?.reason === 'NsfwLoggedOut') { + if ( + !wasElongatorDisabled && + !useElongator && + typeof TwitterProxy !== 'undefined' && + (response as TweetResultsByRestIdResult)?.data?.tweetResult?.result?.reason === + 'NsfwLoggedOut' + ) { console.log(`nsfw tweet detected, it's elongator time`); useElongator = true; continue; @@ -213,7 +221,8 @@ export const twitterFetch = async ( export const fetchConversation = async ( status: string, event: FetchEvent, - useElongator = typeof TwitterProxy !== 'undefined' && experimentCheck(Experiment.ELONGATOR_BY_DEFAULT) + useElongator = typeof TwitterProxy !== 'undefined' && + experimentCheck(Experiment.ELONGATOR_BY_DEFAULT) ): Promise => { return (await twitterFetch( `${ @@ -272,7 +281,7 @@ export const fetchConversation = async ( return true; } if (tweet?.__typename === 'TweetUnavailable') { - console.log('generic tweet unavailable error') + console.log('generic tweet unavailable error'); return true; } // Final clause for checking if it's valid is if there's errors diff --git a/src/helpers/translate.ts b/src/helpers/translate.ts index 8098df8..a4f619e 100644 --- a/src/helpers/translate.ts +++ b/src/helpers/translate.ts @@ -20,14 +20,14 @@ export const translateTweet = async ( 'x-csrf-token': csrfToken, 'x-twitter-active-user': 'yes', 'x-guest-token': guestToken, - 'Referer': `${Constants.TWITTER_ROOT}/i/status/${tweet.rest_id}`, + 'Referer': `${Constants.TWITTER_ROOT}/i/status/${tweet.rest_id}` }; let translationApiResponse; let translationResults: TranslationPartial; /* Fix up some language codes that may be mistakenly used */ - switch(language) { + switch (language) { case 'jp': language = 'ja'; break; @@ -45,19 +45,16 @@ export const translateTweet = async ( /* As of August 2023, you can no longer fetch translations with guest token */ if (typeof TwitterProxy === 'undefined') { - return null + return null; } try { const url = `${Constants.TWITTER_ROOT}/i/api/1.1/strato/column/None/tweetId=${tweet.rest_id},destinationLanguage=None,translationSource=Some(Google),feature=None,timeout=None,onlyCached=None/translation/service/translateTweet`; console.log(url, headers); - translationApiResponse = await TwitterProxy.fetch( - url, - { - method: 'GET', - headers: headers - } - ); + translationApiResponse = await TwitterProxy.fetch(url, { + method: 'GET', + headers: headers + }); translationResults = (await translationApiResponse.json()) as TranslationPartial; console.log(`translationResults`, translationResults); diff --git a/src/render/instantview.ts b/src/render/instantview.ts index 1dcb66b..9d64fb8 100644 --- a/src/render/instantview.ts +++ b/src/render/instantview.ts @@ -79,14 +79,14 @@ function getTranslatedText(tweet: APITweet, isQuote = false): string | null { text = populateUserLinks(tweet, text); const formatText = - tweet.translation.target_lang === 'en' - ? Strings.TRANSLATE_TEXT.format({ - language: tweet.translation.source_lang_en - }) - : Strings.TRANSLATE_TEXT_INTL.format({ - source: tweet.translation.source_lang.toUpperCase(), - destination: tweet.translation.target_lang.toUpperCase() - }); + tweet.translation.target_lang === 'en' + ? Strings.TRANSLATE_TEXT.format({ + language: tweet.translation.source_lang_en + }) + : Strings.TRANSLATE_TEXT_INTL.format({ + source: tweet.translation.source_lang.toUpperCase(), + destination: tweet.translation.target_lang.toUpperCase() + }); return `

${formatText}

${text}

Original

`; } @@ -106,7 +106,9 @@ const generateTweet = (tweet: APITweet, isQuote = false): string => { ${ !isQuote ? ` - ${tweet.author.name}'s profile picture + ${ + tweet.author.name + }'s profile picture

${tweet.author.name}

@${tweet.author.screen_name}

${getSocialTextIV(tweet)}

@@ -154,17 +156,16 @@ export const renderInstantView = (properties: RenderProperties): ResponseInstruc
-
${'' - }If you can see this, your browser is doing something weird with your user agent.View original post +
${''}If you can see this, your browser is doing something weird with your user agent.View original post

${tweet.author.name} (@${tweet.author.screen_name})

Instant View (✨ Beta) - View original

${generateTweet(tweet)} -
` + `; return instructions; }; diff --git a/src/strings.ts b/src/strings.ts index a150aa5..cb34ba0 100644 --- a/src/strings.ts +++ b/src/strings.ts @@ -146,7 +146,7 @@ This is caused by Twitter API downtime or a new bug. Try again in a little while FINAL_POLL_RESULTS: 'Final results', ERROR_API_FAIL: - "Post failed to load due to an API error. The account may be private or suspended, or there may be another issue :(", + 'Post failed to load due to an API error. The account may be private or suspended, or there may be another issue :(', ERROR_PRIVATE: `Sorry, we can't embed this post because the user is private or suspended :(`, ERROR_TWEET_NOT_FOUND: `Sorry, that post doesn't exist :(`, ERROR_USER_NOT_FOUND: `Sorry, that user doesn't exist :(`, diff --git a/src/types/env.d.ts b/src/types/env.d.ts index 369e8fb..568d1e6 100644 --- a/src/types/env.d.ts +++ b/src/types/env.d.ts @@ -1,7 +1,7 @@ declare const BRANDING_NAME: string; declare const DIRECT_MEDIA_DOMAINS: string; declare const TEXT_ONLY_DOMAINS: string; -declare const INSTANT_VIEW_DOMAINS: string; +declare const INSTANT_VIEW_DOMAINS: string; declare const DEPRECATED_DOMAIN_LIST: string; declare const DEPRECATED_DOMAIN_EPOCH: string; declare const HOST_URL: string; diff --git a/src/utils/graphql.ts b/src/utils/graphql.ts index 0f19409..57faf01 100644 --- a/src/utils/graphql.ts +++ b/src/utils/graphql.ts @@ -17,6 +17,7 @@ export const isGraphQLTweet = (response: unknown): response is GraphQLTweet => { typeof response === 'object' && response !== null && '__typename' in response && - (response.__typename === 'Tweet' || response.__typename === 'TweetWithVisibilityResults') + (response.__typename === 'Tweet' || + response.__typename === 'TweetWithVisibilityResults') ); };