From b53fe9983151899abc0c295ea13d29f6688d6ed2 Mon Sep 17 00:00:00 2001 From: dangered wolf Date: Tue, 21 Nov 2023 00:57:47 -0500 Subject: [PATCH] Generally use the term status instead of post --- src/embed/status.ts | 2 +- src/helpers/quote.ts | 2 +- src/providers/twitter/conversation.ts | 34 +++++++++++++-------------- src/providers/twitter/processor.ts | 6 ++--- src/providers/twitter/profile.ts | 2 +- src/render/instantview.ts | 10 ++++---- src/types/types.d.ts | 14 +++++------ 7 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/embed/status.ts b/src/embed/status.ts index 14d56e5..3f0a2ea 100644 --- a/src/embed/status.ts +++ b/src/embed/status.ts @@ -48,7 +48,7 @@ export const handleStatus = async ( flags?.api ?? false ); - const tweet = thread?.post as APITweet; + const tweet = thread?.status as APITweet; const api = { code: thread.code, diff --git a/src/helpers/quote.ts b/src/helpers/quote.ts index d1b4a0a..d3fdacf 100644 --- a/src/helpers/quote.ts +++ b/src/helpers/quote.ts @@ -1,7 +1,7 @@ import { Strings } from '../strings'; /* Helper for Quote Tweets */ -export const handleQuote = (quote: APIPost): string | null => { +export const handleQuote = (quote: APIStatus): string | null => { console.log('Quoting status ', quote.id); let str = `\n`; diff --git a/src/providers/twitter/conversation.ts b/src/providers/twitter/conversation.ts index d2d53f8..955f602 100644 --- a/src/providers/twitter/conversation.ts +++ b/src/providers/twitter/conversation.ts @@ -267,7 +267,7 @@ export const constructTwitterThread = async ( console.log('language', language); let response: TweetDetailResult | TweetResultsByRestIdResult | null = null; - let post: APITweet; + let status: APITweet; /* We can use TweetDetail on elongator accounts to increase per-account rate limit. We also use TweetDetail to process threads (WIP) @@ -284,7 +284,7 @@ export const constructTwitterThread = async ( console.log('response', response); if (!response?.data) { - return { post: null, thread: null, author: null, code: 404 }; + return { status: null, thread: null, author: null, code: 404 }; } } @@ -296,20 +296,20 @@ export const constructTwitterThread = async ( const result = response?.data?.tweetResult?.result as GraphQLTweet; if (typeof result === 'undefined') { - return { post: null, thread: null, author: null, code: 404 }; + return { status: null, thread: null, author: null, code: 404 }; } - const buildPost = await buildAPITweet(c, result, language, false, legacyAPI); + const buildStatus = await buildAPITweet(c, result, language, false, legacyAPI); - if ((buildPost as FetchResults)?.status === 401) { - return { post: null, thread: null, author: null, code: 401 }; - } else if (buildPost === null || (buildPost as FetchResults)?.status === 404) { - return { post: null, thread: null, author: null, code: 404 }; + if ((buildStatus as FetchResults)?.status === 401) { + return { status: null, thread: null, author: null, code: 401 }; + } else if (buildStatus === null || (buildStatus as FetchResults)?.status === 404) { + return { status: null, thread: null, author: null, code: 404 }; } - post = buildPost as APITweet; + status = buildStatus as APITweet; - return { post: post, thread: null, author: post.author, code: 200 }; + return { status: status, thread: null, author: status.author, code: 200 }; } const bucket = processResponse( @@ -319,20 +319,20 @@ export const constructTwitterThread = async ( /* Don't bother processing thread on a null tweet */ if (originalTweet === null) { - return { post: null, thread: null, author: null, code: 404 }; + return { status: null, thread: null, author: null, code: 404 }; } - post = (await buildAPITweet(c, originalTweet, undefined, false, legacyAPI)) as APITweet; + status = (await buildAPITweet(c, originalTweet, undefined, false, legacyAPI)) as APITweet; - if (post === null) { - return { post: null, thread: null, author: null, code: 404 }; + if (status === null) { + return { status: null, thread: null, author: null, code: 404 }; } - const author = post.author; + const author = status.author; /* If we're not processing threads, let's be done here */ if (!processThread) { - return { post: post, thread: null, author: author, code: 200 }; + return { status: status, thread: null, author: author, code: 200 }; } const threadTweets = [originalTweet]; @@ -473,7 +473,7 @@ export const constructTwitterThread = async ( } const socialThread: SocialThread = { - post: post, + status: status, thread: [], author: author, code: 200 diff --git a/src/providers/twitter/processor.ts b/src/providers/twitter/processor.ts index 58d140b..f0d070d 100644 --- a/src/providers/twitter/processor.ts +++ b/src/providers/twitter/processor.ts @@ -72,7 +72,7 @@ export const buildAPITweet = async ( followers: apiUser.followers, following: apiUser.following, joined: apiUser.joined, - posts: apiUser.posts, + statuses: apiUser.statuses, likes: apiUser.likes, protected: apiUser.protected, birthday: apiUser.birthday, @@ -85,13 +85,13 @@ export const buildAPITweet = async ( apiTweet.retweets = tweet.legacy.retweet_count; // @ts-expect-error `tweets` is only part of legacy API - apiTweet.author.tweets = apiTweet.author.posts; + apiTweet.author.tweets = apiTweet.author.statuses; // @ts-expect-error Part of legacy API that we no longer are able to track apiTweet.author.avatar_color = null; // @ts-expect-error Use retweets for legacy API delete apiTweet.reposts; // @ts-expect-error Use tweets and not posts for legacy API - delete apiTweet.author.posts; + delete apiTweet.author.statuses; delete apiTweet.author.global_screen_name; } else { apiTweet.reposts = tweet.legacy.retweet_count; diff --git a/src/providers/twitter/profile.ts b/src/providers/twitter/profile.ts index c8c63e9..3fa3b00 100644 --- a/src/providers/twitter/profile.ts +++ b/src/providers/twitter/profile.ts @@ -15,7 +15,7 @@ export const convertToApiUser = (user: GraphQLUser, legacyAPI = false): APIUser // @ts-expect-error Use tweets for legacy API apiUser.tweets = user.legacy.statuses_count; } else { - apiUser.posts = user.legacy.statuses_count; + apiUser.statuses = user.legacy.statuses_count; } apiUser.name = user.legacy.name; apiUser.screen_name = user.legacy.screen_name; diff --git a/src/render/instantview.ts b/src/render/instantview.ts index d46dc51..40a5fa9 100644 --- a/src/render/instantview.ts +++ b/src/render/instantview.ts @@ -4,7 +4,7 @@ import { getSocialTextIV } from '../helpers/author'; import { sanitizeText } from '../helpers/utils'; import { Strings } from '../strings'; -const populateUserLinks = (tweet: APIPost, text: string): string => { +const populateUserLinks = (tweet: APIStatus, text: string): string => { /* TODO: Maybe we can add username splices to our API so only genuinely valid users are linked? */ text.match(/@(\w{1,15})/g)?.forEach(match => { const username = match.replace('@', ''); @@ -16,7 +16,7 @@ const populateUserLinks = (tweet: APIPost, text: string): string => { return text; }; -const generateTweetMedia = (tweet: APIPost): string => { +const generateTweetMedia = (tweet: APIStatus): string => { let media = ''; if (tweet.media?.all?.length) { tweet.media.all.forEach(mediaItem => { @@ -117,7 +117,7 @@ const truncateSocialCount = (count: number): string => { } }; -const generateTweetFooter = (tweet: APIPost, isQuote = false): string => { +const generateTweetFooter = (tweet: APIStatus, isQuote = false): string => { const { author } = tweet; let description = author.description; @@ -156,12 +156,12 @@ const generateTweetFooter = (tweet: APIPost, isQuote = false): string => { joined: author.joined ? `📆 ${formatDate(new Date(author.joined))}` : '', following: truncateSocialCount(author.following), followers: truncateSocialCount(author.followers), - tweets: truncateSocialCount(author.posts) + tweets: truncateSocialCount(author.statuses) }) }); }; -const generateTweet = (tweet: APIPost, isQuote = false): string => { +const generateTweet = (tweet: APIStatus, isQuote = false): string => { let text = paragraphify(sanitizeText(tweet.text), isQuote); text = htmlifyLinks(text); text = htmlifyHashtags(text); diff --git a/src/types/types.d.ts b/src/types/types.d.ts index 61360cb..48d360e 100644 --- a/src/types/types.d.ts +++ b/src/types/types.d.ts @@ -110,7 +110,7 @@ interface APIMosaicPhoto extends APIMedia { }; } -interface APIPost { +interface APIStatus { id: string; url: string; text: string; @@ -121,7 +121,7 @@ interface APIPost { reposts: number; replies: number; - quote?: APIPost; + quote?: APIStatus; poll?: APIPoll; author: APIUser; @@ -146,7 +146,7 @@ interface APIPost { embed_card: 'tweet' | 'summary' | 'summary_large_image' | 'player'; } -interface APITweet extends APIPost { +interface APITweet extends APIStatus { views?: number | null; translation?: APITranslate; @@ -168,7 +168,7 @@ interface APIUser { protected: boolean; followers: number; following: number; - posts: number; + statuses: number; likes: number; joined: string; website: { @@ -183,13 +183,13 @@ interface APIUser { } interface SocialPost { - post: APIPost | APITweet | null; + status: APIStatus | APITweet | null; author: APIUser | null; } interface SocialThread { - post: APIPost | APITweet | null; - thread: (APIPost | APITweet)[] | null; + status: APIStatus | APITweet | null; + thread: (APIStatus | APITweet)[] | null; author: APIUser | null; code: number; }