diff --git a/esbuild.config.mjs b/esbuild.config.mjs index 959ca2c..12b749e 100644 --- a/esbuild.config.mjs +++ b/esbuild.config.mjs @@ -81,7 +81,7 @@ if (process.env.SENTRY_DSN) { // https://sentry.io/orgredirect/organizations/:orgslug/settings/auth-tokens/ authToken: process.env.SENTRY_AUTH_TOKEN }) - ) + ); } await esbuild.build({ diff --git a/src/embed/status.ts b/src/embed/status.ts index 6f2a793..4205a92 100644 --- a/src/embed/status.ts +++ b/src/embed/status.ts @@ -36,7 +36,11 @@ export const handleStatus = async ( let fetchWithThreads = false; - if (c.req.header('user-agent')?.includes('Telegram') && !flags?.direct && flags.instantViewUnrollThreads) { + if ( + c.req.header('user-agent')?.includes('Telegram') && + !flags?.direct && + flags.instantViewUnrollThreads + ) { fetchWithThreads = true; } diff --git a/src/providers/twitter/conversation.ts b/src/providers/twitter/conversation.ts index 3119b44..c61cc60 100644 --- a/src/providers/twitter/conversation.ts +++ b/src/providers/twitter/conversation.ts @@ -90,17 +90,16 @@ export const fetchTweetDetail = async ( useElongator, (_conversation: unknown) => { const conversation = _conversation as TweetDetailResult; - const response = processResponse(conversation?.data?.threaded_conversation_with_injections_v2?.instructions); - const tweet = findStatusInBucket( - status, - response + const response = processResponse( + conversation?.data?.threaded_conversation_with_injections_v2?.instructions ); + const tweet = findStatusInBucket(status, response); if (tweet && isGraphQLTwitterStatus(tweet)) { return true; } console.log('invalid graphql tweet', tweet); console.log('finding status', status); - console.log('from response', JSON.stringify(response)) + console.log('from response', JSON.stringify(response)); return Array.isArray(conversation?.errors); }, @@ -268,13 +267,15 @@ const findNextStatus = (id: string, bucket: GraphQLProcessBucket): number => { }; const findPreviousStatus = (id: string, bucket: GraphQLProcessBucket): number => { - const status = bucket.allStatuses.find(status => (status.rest_id ?? status.legacy?.id_str) === id); + const status = bucket.allStatuses.find( + status => (status.rest_id ?? status.legacy?.id_str) === id + ); if (!status) { console.log('uhhh, we could not even find that tweet, dunno how that happened'); return -1; } if ((status.rest_id ?? status.legacy?.id_str) === status.legacy?.in_reply_to_status_id_str) { - console.log('Tweet does not have a parent') + console.log('Tweet does not have a parent'); return 0; } return bucket.allStatuses.findIndex( @@ -317,7 +318,7 @@ export const constructTwitterThread = async ( let response: TweetDetailResult | TweetResultsByRestIdResult | null = null; let status: APITwitterStatus; - console.log('env', c.env) + console.log('env', c.env); /* We can use TweetDetail on elongator accounts to increase per-account rate limit. We also use TweetDetail to process threads (WIP) @@ -543,11 +544,19 @@ export const constructTwitterThread = async ( author: author, code: 200 }; - - await Promise.all(threadStatuses.map(async status => { - const builtStatus = await buildAPITwitterStatus(c, status, undefined, author, false) as APITwitterStatus; - socialThread.thread?.push(builtStatus); - })); + + await Promise.all( + threadStatuses.map(async status => { + const builtStatus = (await buildAPITwitterStatus( + c, + status, + undefined, + author, + false + )) as APITwitterStatus; + socialThread.thread?.push(builtStatus); + }) + ); // Sort socialThread.thread by id converted to bigint socialThread.thread?.sort((a, b) => { diff --git a/src/providers/twitter/processor.ts b/src/providers/twitter/processor.ts index fefe4f7..05a721e 100644 --- a/src/providers/twitter/processor.ts +++ b/src/providers/twitter/processor.ts @@ -59,24 +59,24 @@ export const buildAPITwitterStatus = async ( linkFixer(status.legacy.entities?.urls, status.legacy.full_text || '') ); // if (threadAuthor && threadAuthor.id !== apiUser.id) { - apiStatus.author = { - id: apiUser.id, - name: apiUser.name, - screen_name: apiUser.screen_name, - avatar_url: apiUser.avatar_url?.replace?.('_normal', '_200x200') ?? null, - banner_url: apiUser.banner_url, - description: apiUser.description, - location: apiUser.location, - url: apiUser.url, - followers: apiUser.followers, - following: apiUser.following, - joined: apiUser.joined, - statuses: apiUser.statuses, - likes: apiUser.likes, - protected: apiUser.protected, - birthday: apiUser.birthday, - website: apiUser.website - }; + apiStatus.author = { + id: apiUser.id, + name: apiUser.name, + screen_name: apiUser.screen_name, + avatar_url: apiUser.avatar_url?.replace?.('_normal', '_200x200') ?? null, + banner_url: apiUser.banner_url, + description: apiUser.description, + location: apiUser.location, + url: apiUser.url, + followers: apiUser.followers, + following: apiUser.following, + joined: apiUser.joined, + statuses: apiUser.statuses, + likes: apiUser.likes, + protected: apiUser.protected, + birthday: apiUser.birthday, + website: apiUser.website + }; // } apiStatus.replies = status.legacy.reply_count; if (legacyAPI) { @@ -95,7 +95,7 @@ export const buildAPITwitterStatus = async ( } else { apiStatus.reposts = status.legacy.retweet_count; // if ((threadAuthor && threadAuthor.id !== apiUser.id)) { - apiStatus.author.global_screen_name = apiUser.global_screen_name; + apiStatus.author.global_screen_name = apiUser.global_screen_name; // } } apiStatus.likes = status.legacy.favorite_count; diff --git a/src/realms/twitter/routes/status.ts b/src/realms/twitter/routes/status.ts index e70b32f..dea9c21 100644 --- a/src/realms/twitter/routes/status.ts +++ b/src/realms/twitter/routes/status.ts @@ -56,7 +56,10 @@ export const statusRequest = async (c: Context) => { } else if (Constants.INSTANT_VIEW_DOMAINS.includes(url.hostname)) { console.log('Forced instant view request'); flags.forceInstantView = true; - } else if (experimentCheck(Experiment.IV_FORCE_THREAD_UNROLL, userAgent.includes('Telegram')) || Constants.INSTANT_VIEW_THREADS_DOMAINS.includes(url.hostname)) { + } else if ( + experimentCheck(Experiment.IV_FORCE_THREAD_UNROLL, userAgent.includes('Telegram')) || + Constants.INSTANT_VIEW_THREADS_DOMAINS.includes(url.hostname) + ) { console.log('Forced unroll instant view'); flags.forceInstantView = true; flags.instantViewUnrollThreads = true; diff --git a/src/render/instantview.ts b/src/render/instantview.ts index d11b8be..f2594cc 100644 --- a/src/render/instantview.ts +++ b/src/render/instantview.ts @@ -123,11 +123,22 @@ const truncateSocialCount = (count: number): string => { } }; -const generateInlineAuthorHeader = (status: APIStatus, author: APIUser, authorActionType: AuthorActionType | null): string => { - return `

{AuthorAction} from ${author.name} (@${author.screen_name}):

`.format({ - AuthorAction: authorActionType === AuthorActionType.Reply ? 'Reply' : authorActionType === AuthorActionType.Original ? 'Original' : 'Follow-up' - }); -} +const generateInlineAuthorHeader = ( + status: APIStatus, + author: APIUser, + authorActionType: AuthorActionType | null +): string => { + return `

{AuthorAction} from ${author.name} (@${author.screen_name}):

`.format( + { + AuthorAction: + authorActionType === AuthorActionType.Reply + ? 'Reply' + : authorActionType === AuthorActionType.Original + ? 'Original' + : 'Follow-up' + } + ); +}; const wrapForeignLinks = (url: string) => { let unwrap = false; @@ -160,9 +171,7 @@ const generateStatusFooter = (status: APIStatus, isQuote = false, author: APIUse {aboutSection} `.format({ socialText: getSocialTextIV(status as APITwitterStatus) || '', - viewOriginal: !isQuote - ? `View full thread` - : notApplicableComment, + viewOriginal: !isQuote ? `View full thread` : notApplicableComment, aboutSection: isQuote ? '' : `

About author

@@ -194,7 +203,7 @@ const generateStatusFooter = (status: APIStatus, isQuote = false, author: APIUse const generatePoll = (poll: APIPoll, language: string): string => { // const formatNumber = Intl.NumberFormat(language ?? 'en') let str = ''; - + const barLength = 20; poll.choices.forEach(choice => { @@ -206,11 +215,11 @@ const generatePoll = (poll: APIPoll, language: string): string => { str += `
${formatNumber(poll.total_votes)} votes · ${poll.time_left_en}`; return str; -} +}; const generateCommunityNote = (status: APITwitterStatus): string => { if (status.community_note) { - console.log('community_note', status.community_note) + console.log('community_note', status.community_note); const note = status.community_note; const entities = note.entities; entities.sort((a, b) => a.fromIndex - b.fromIndex); // sort entities by fromIndex @@ -220,7 +229,7 @@ const generateCommunityNote = (status: APITwitterStatus): string => { entities.forEach(entity => { if (entity?.ref?.type !== 'TimelineUrl') { - return + return; } const fromIndex = entity.fromIndex; const toIndex = entity.toIndex; @@ -248,9 +257,14 @@ const generateCommunityNote = (status: APITwitterStatus): string => { return result; } return ''; -} +}; -const generateStatus = (status: APIStatus, author: APIUser, isQuote = false, authorActionType: AuthorActionType | null): string => { +const generateStatus = ( + status: APIStatus, + author: APIUser, + isQuote = false, + authorActionType: AuthorActionType | null +): string => { let text = paragraphify(sanitizeText(status.text), isQuote); text = htmlifyLinks(text); text = htmlifyHashtags(text); @@ -323,34 +337,43 @@ export const renderInstantView = (properties: RenderProperties): ResponseInstruc View full thread

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

- ${thread?.thread?.map((status) => { - console.log('previousThreadPieceAuthor', previousThreadPieceAuthor) - if (originalAuthor === null) { - originalAuthor = status.author?.id; - } - const differentAuthor = thread?.author?.id !== status.author?.id || (previousThreadPieceAuthor !== null && previousThreadPieceAuthor !== status.author?.id); - const isOriginal = thread?.author?.id !== status.author?.id && previousThreadPieceAuthor === null; - const isFollowup = thread?.author?.id === status.author?.id && previousThreadPieceAuthor !== null && previousThreadPieceAuthor !== thread?.author?.id && originalAuthor === status.author?.id; - console.log('differentAuthor', differentAuthor) - console.log('isOriginal', isOriginal) - console.log('isFollowup', isFollowup) - - let authorAction = null; - - if (differentAuthor) { - if (isFollowup) { - authorAction = AuthorActionType.FollowUp; - } else if (isOriginal) { - authorAction = AuthorActionType.Original; - } else if (previousThreadPieceAuthor !== status.author?.id) { - authorAction = AuthorActionType.Reply; + ${thread?.thread + ?.map(status => { + console.log('previousThreadPieceAuthor', previousThreadPieceAuthor); + if (originalAuthor === null) { + originalAuthor = status.author?.id; } - } + const differentAuthor = + thread?.author?.id !== status.author?.id || + (previousThreadPieceAuthor !== null && previousThreadPieceAuthor !== status.author?.id); + const isOriginal = + thread?.author?.id !== status.author?.id && previousThreadPieceAuthor === null; + const isFollowup = + thread?.author?.id === status.author?.id && + previousThreadPieceAuthor !== null && + previousThreadPieceAuthor !== thread?.author?.id && + originalAuthor === status.author?.id; + console.log('differentAuthor', differentAuthor); + console.log('isOriginal', isOriginal); + console.log('isFollowup', isFollowup); - previousThreadPieceAuthor = status.author?.id; + let authorAction = null; - return generateStatus(status, status.author ?? thread?.author, false, authorAction) - }).join('')} + if (differentAuthor) { + if (isFollowup) { + authorAction = AuthorActionType.FollowUp; + } else if (isOriginal) { + authorAction = AuthorActionType.Original; + } else if (previousThreadPieceAuthor !== status.author?.id) { + authorAction = AuthorActionType.Reply; + } + } + + previousThreadPieceAuthor = status.author?.id; + + return generateStatus(status, status.author ?? thread?.author, false, authorAction); + }) + .join('')} ${generateStatusFooter(status, false, thread?.author ?? status.author)}
${`View full thread`} `; diff --git a/src/types/vendor/twitter.d.ts b/src/types/vendor/twitter.d.ts index 3a589f5..57fd681 100644 --- a/src/types/vendor/twitter.d.ts +++ b/src/types/vendor/twitter.d.ts @@ -352,14 +352,14 @@ type GraphQLTwitterStatusLegacy = { }; type BirdwatchEntity = { - fromIndex: number, // 119 - toIndex: number, // 154 + fromIndex: number; // 119 + toIndex: number; // 154 ref: { - type: "TimelineUrl", - url: string, // https://t.co/jxvVatCVCz - urlType: "ExternalUrl" - } -} + type: 'TimelineUrl'; + url: string; // https://t.co/jxvVatCVCz + urlType: 'ExternalUrl'; + }; +}; type GraphQLTwitterStatus = { // Workaround @@ -369,15 +369,15 @@ type GraphQLTwitterStatus = { rest_id: string; // "1674824189176590336", has_birdwatch_notes: boolean; birdwatch_pivot: { - destinationUrl: string, // https://twitter.com/i/birdwatch/n/1784594925926973714 + destinationUrl: string; // https://twitter.com/i/birdwatch/n/1784594925926973714 note: { - rest_id: string // 1784594925926973714 - }, + rest_id: string; // 1784594925926973714 + }; subtitle: { - text: string, // "This screenshot is from Sonic 1\n\ninfo.sonicretro.org/Sonic_the_Hedg…" - entities: BirdwatchEntity[] - }, - } + text: string; // "This screenshot is from Sonic 1\n\ninfo.sonicretro.org/Sonic_the_Hedg…" + entities: BirdwatchEntity[]; + }; + }; core: { user_results: { result: GraphQLUser;