From 2b2966794f1a22a1f74af7094a323407b289c711 Mon Sep 17 00:00:00 2001 From: dangered wolf Date: Mon, 25 Jul 2022 11:45:07 -0400 Subject: [PATCH] API work (very much incomplete) --- src/api.ts | 65 +++++++++++++++++++++++++++++++++++++++++++++++ src/status.ts | 51 ++++++++++--------------------------- src/translate.ts | 35 +++++-------------------- src/tweetTypes.ts | 1 + src/types.d.ts | 30 ++++++++++++++++++---- 5 files changed, 110 insertions(+), 72 deletions(-) create mode 100644 src/api.ts diff --git a/src/api.ts b/src/api.ts new file mode 100644 index 0000000..ff39e08 --- /dev/null +++ b/src/api.ts @@ -0,0 +1,65 @@ +import { fetchUsingGuest } from "./fetch"; +import { translateTweet } from "./translate"; + +export const statueAPI = async (event: FetchEvent, status: string, language: string): Promise => { + const conversation = await fetchUsingGuest(status, event); + const tweet = conversation?.globalObjects?.tweets?.[status] || {}; + /* With v2 conversation API we re-add the user object ot the tweet because + Twitter stores it separately in the conversation API. This is to consolidate + it in case a user appears multiple times in a thread. */ + tweet.user = conversation?.globalObjects?.users?.[tweet.user_id_str] || {}; + + /* Fallback for if Tweet did not load */ + if (typeof tweet.full_text === 'undefined') { + console.log('Invalid status, got tweet ', tweet, ' conversation ', conversation); + + /* We've got timeline instructions, so the Tweet is probably private */ + if (conversation.timeline?.instructions?.length > 0) { + return { code: 401, message: 'PRIVATE_TWEET' }; + } + + /* {"errors":[{"code":34,"message":"Sorry, that page does not exist."}]} */ + if (conversation.errors?.[0]?.code === 34) { + return { code: 404, message: 'STATUS_NOT_FOUND' }; + } + + /* Tweets object is completely missing, smells like API failure */ + if (typeof conversation?.globalObjects?.tweets === 'undefined') { + return { code: 500, message: 'API_FAIL' }; + } + + /* If we have no idea what happened then just return API error */ + return { code: 500, message: 'API_FAIL' }; + } + + let response: APIResponse = {} as APIResponse; + let apiTweet: APITweet = {} as APITweet; + + const user = tweet.user; + const screenName = user?.screen_name || ''; + const name = user?.name || ''; + + apiTweet.text = tweet.full_text; + apiTweet.author = { + name: name, + screen_name: screenName, + profile_picture_url: user?.profile_image_url_https || '', + profile_banner_url: user?.profile_banner_url || '' + } + apiTweet.replies = tweet.reply_count; + apiTweet.retweets = tweet.retweet_count; + apiTweet.likes = tweet.favorite_count; + + /* If a language is specified, let's try translating it! */ + if (typeof language === 'string' && language.length === 2 && language !== tweet.lang) { + let translateAPI = await translateTweet(tweet, conversation.guestToken || '', language || 'en'); + apiTweet.translation = { + translated_text: translateAPI?.translation || '', + source_language: tweet.lang, + target_language: language + } + } + + response.tweet = apiTweet; + return response; +} \ No newline at end of file diff --git a/src/status.ts b/src/status.ts index 6cc4f64..d0e1171 100644 --- a/src/status.ts +++ b/src/status.ts @@ -9,6 +9,7 @@ import { Strings } from './strings'; import { handleMosaic } from './mosaic'; import { translateTweet } from './translate'; import { getAuthorText } from './author'; +import { statueAPI } from './api'; export const returnError = (error: string): StatusResponse => { return { @@ -32,52 +33,26 @@ export const handleStatus = async ( ): Promise => { console.log('Direct?', flags?.direct); - const conversation = await fetchUsingGuest(status, event); + let api = await statueAPI(event, status, language || 'en'); - const tweet = conversation?.globalObjects?.tweets?.[status] || {}; - /* With v2 conversation API we re-add the user object ot the tweet because - Twitter stores it separately in the conversation API. This is to consolidate - it in case a user appears multiple times in a thread. */ - tweet.user = conversation?.globalObjects?.users?.[tweet.user_id_str] || {}; + switch(api.code) { + case 401: + return returnError(Strings.ERROR_PRIVATE); + case 404: + return returnError(Strings.ERROR_TWEET_NOT_FOUND); + case 500: + return returnError(Strings.ERROR_API_FAIL); + } let headers: string[] = []; let redirectMedia = ''; - - /* Fallback for if Tweet did not load */ - if (typeof tweet.full_text === 'undefined') { - console.log('Invalid status, got tweet ', tweet, ' conversation ', conversation); - - /* We've got timeline instructions, so the Tweet is probably private */ - if (conversation.timeline?.instructions?.length > 0) { - return returnError(Strings.ERROR_PRIVATE); - } - - /* {"errors":[{"code":34,"message":"Sorry, that page does not exist."}]} */ - if (conversation.errors?.[0]?.code === 34) { - return returnError(Strings.ERROR_TWEET_NOT_FOUND); - } - - /* Tweets object is completely missing, smells like API failure */ - if (typeof conversation?.globalObjects?.tweets === 'undefined') { - return returnError(Strings.ERROR_API_FAIL); - } - - /* If we have no idea what happened then just return API error */ - return returnError(Strings.ERROR_API_FAIL); - } - - let text = tweet.full_text; let engagementText = ''; - const user = tweet.user; - const screenName = user?.screen_name || ''; - const name = user?.name || ''; - - /* If a language is specified, let's try translating it! */ - if (typeof language === 'string' && language.length === 2) { - text = await translateTweet(tweet, conversation.guestToken || '', language || 'en'); + if (api?.tweet?.translation) { + } + let mediaList = Array.from( tweet.extended_entities?.media || tweet.entities?.media || [] diff --git a/src/translate.ts b/src/translate.ts index 2ae6688..9ff7be0 100644 --- a/src/translate.ts +++ b/src/translate.ts @@ -1,12 +1,10 @@ import { Constants } from './constants'; -import { linkFixer } from './linkFixer'; -import { Strings } from './strings'; export const translateTweet = async ( tweet: TweetPartial, guestToken: string, language: string -): Promise => { +): Promise => { const csrfToken = crypto.randomUUID().replace(/-/g, ''); // Generate a random CSRF token, this doesn't matter, Twitter just cares that header and cookie match let headers: { [header: string]: string } = { @@ -25,7 +23,6 @@ export const translateTweet = async ( let apiRequest; let translationResults: TranslationPartial; - let resultText = tweet.full_text; headers['x-twitter-client-language'] = language; @@ -39,35 +36,15 @@ export const translateTweet = async ( ); translationResults = (await apiRequest.json()) as TranslationPartial; - console.log(translationResults); - - if ( - translationResults.sourceLanguage === translationResults.destinationLanguage || - translationResults.translationState !== 'Success' - ) { - return tweet.full_text; // No work to do + if (translationResults.translationState !== 'Success') { + return null; } - console.log(`Twitter interpreted language as ${tweet.lang}`); + console.log(translationResults); + return translationResults; - let formatText = - language === 'en' - ? Strings.TRANSLATE_TEXT.format({ - language: translationResults.localizedSourceLanguage - }) - : Strings.TRANSLATE_TEXT_INTL.format({ - source: translationResults.sourceLanguage.toUpperCase(), - destination: translationResults.destinationLanguage.toUpperCase() - }); - - resultText = - `${translationResults.translation}\n\n` + - `${formatText}\n\n` + - `${tweet.full_text}`; } catch (e: any) { console.error('Unknown error while fetching from Translation API'); - return tweet.full_text; // No work to do + return {} as TranslationPartial; // No work to do } - - return linkFixer(tweet, resultText); }; diff --git a/src/tweetTypes.ts b/src/tweetTypes.ts index b0caa43..cf9012b 100644 --- a/src/tweetTypes.ts +++ b/src/tweetTypes.ts @@ -157,6 +157,7 @@ type UserPartial = { name: string; screen_name: string; profile_image_url_https: string; + profile_banner_url: string; profile_image_extensions_media_color?: { palette?: MediaPlaceholderColor[]; }; diff --git a/src/types.d.ts b/src/types.d.ts index 8638f03..fbef954 100644 --- a/src/types.d.ts +++ b/src/types.d.ts @@ -17,6 +17,29 @@ interface Request { }; } +interface APIResponse { + code: number; + message: string; + tweet?: APITweet; +} + +interface APITranslate { + translated_text: string; + source_language: string; + target_language: string; +} + +interface APIAuthor { + name?: string; + screen_name?: string; + profile_picture_url?: string; + profile_banner_url?: string; +} + +interface APIPoll { + +} + interface APITweet { id: string; tweet: string; @@ -27,12 +50,9 @@ interface APITweet { retweets: number; replies: number; - name?: string; - screen_name?: string; - profile_picture_url?: string; - profile_banner_url?: string; - quote_tweet?: APITweet; + translation?: APITranslate; + author: APIAuthor; thumbnail: string;