From 42d657924c1fcc014e6954178458a8d0836aec8f Mon Sep 17 00:00:00 2001 From: dangered wolf Date: Sat, 16 Jul 2022 15:19:43 -0400 Subject: [PATCH] Add reply, retweet, like counter on Discord --- README.md | 32 ++++++++++++++++---------------- src/status.ts | 28 ++++++++++++++++++++++++---- src/strings.ts | 1 + 3 files changed, 41 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index cc7beec..68192b1 100644 --- a/README.md +++ b/README.md @@ -58,22 +58,22 @@ Otherwise, it will default to the first image. In many ways, pxTwitter has richer embeds and does more. Here's a table comparing some of pxTwitter's features compared to Twitter default embeds as well as other embedding services -| | pxTwitter | Twitter default | vxTwitter (BetterTwitFix) | Twxtter (sixFix) | -| --------------------------------------- | :--------------------: | :------------------------------: | :-----------------------------------: | :-----------------------------------: | -| Embed Tweets / Images | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | -| Embed profile pictures on text Tweets | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | -| Embed Twitter Videos | :heavy_check_mark: | :x:¹ | :heavy_check_mark: | :heavy_check_mark: | -| Embed External Videos (YouTube, etc.) | :heavy_check_mark: | :x: | :x:⁴ | :x: | -| Embed Poll results | :heavy_check_mark: | :x: | :x: | :x: | -| Embed Quote Tweets | :heavy_check_mark: | :x: | :ballot_box_with_check: Without Media | :ballot_box_with_check: Without Media | -| Embed Multiple Images | :x: | :heavy_minus_sign: Discord Only³ | With c.vxtwitter.com | :x: | -| Publicly accessible embed index | :x:² | N/A | :x:² | :heavy_check_mark: | -| Replace t.co with original links | :heavy_check_mark: | :x: | :x: | :x: | -| Media-based embed colors on Discord | :heavy_check_mark: | :x: | :x: | :x: | -| Redirect to media file (wihout embed) | :heavy_check_mark: | :x: | :x: | :heavy_check_mark: | -| Strip Twitter tracking info on redirect | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | -| Show retweet / like counts | Coming soon to Discord | :x: | :heavy_check_mark: | :heavy_check_mark: | -| Discord / sed (`s/` replace) friendly | twittpr.com | :x: | :x: | :heavy_check_mark: | +| | pxTwitter | Twitter default | vxTwitter (BetterTwitFix) | Twxtter (sixFix) | +| --------------------------------------- | :-----------------------------: | :------------------------------: | :-----------------------------------: | :-----------------------------------: | +| Embed Tweets / Images | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| Embed profile pictures on text Tweets | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | +| Embed Twitter Videos | :heavy_check_mark: | :x:¹ | :heavy_check_mark: | :heavy_check_mark: | +| Embed External Videos (YouTube, etc.) | :heavy_check_mark: | :x: | :x:⁴ | :x: | +| Embed Poll results | :heavy_check_mark: | :x: | :x: | :x: | +| Embed Quote Tweets | :heavy_check_mark: | :x: | :ballot_box_with_check: Without Media | :ballot_box_with_check: Without Media | +| Embed Multiple Images | :x: | :heavy_minus_sign: Discord Only³ | With c.vxtwitter.com | :x: | +| Publicly accessible embed index | :x:² | N/A | :x:² | :heavy_check_mark: | +| Replace t.co with original links | :heavy_check_mark: | :x: | :x: | :x: | +| Media-based embed colors on Discord | :heavy_check_mark: | :x: | :x: | :x: | +| Redirect to media file (wihout embed) | :heavy_check_mark: | :x: | :x: | :heavy_check_mark: | +| Strip Twitter tracking info on redirect | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | +| Show retweet / like counts | :heavy_minus_sign: Discord Only | :x: | :heavy_check_mark: | :heavy_check_mark: | +| Discord / sed (`s/` replace) friendly | twittpr.com | :x: | :x: | :heavy_check_mark: | ¹ Discord will attempt to embed Twitter's video player, but it is unreliable diff --git a/src/status.ts b/src/status.ts index 6c0ab69..5ba1e3a 100644 --- a/src/status.ts +++ b/src/status.ts @@ -81,6 +81,20 @@ export const handleStatus = async ( let authorText = Strings.DEFAULT_AUTHOR_TEXT; + if (tweet.favorite_count > 0 || tweet.retweet_count > 0 || tweet.reply_count > 0) { + authorText = ''; + if (tweet.reply_count > 0) { + authorText += `${tweet.reply_count} 🗩 `; + } + if (tweet.retweet_count > 0) { + authorText += `${tweet.retweet_count} ⮂ `; + } + if (tweet.favorite_count > 0) { + authorText += `${tweet.favorite_count} ❤ `; + } + authorText = authorText.trim(); + } + text = linkFixer(tweet, text); /* Cards are used by polls and non-Twitter video embeds */ @@ -257,11 +271,17 @@ export const handleStatus = async ( } if (mediaList.length > 1) { - authorText = `Photo ${actualMediaNumber + 1} of ${mediaList.length}`; + let photoCounter = Strings.PHOTO_COUNT.format({ + number: actualMediaNumber + 1, + total: mediaList.length + }); + + authorText = + authorText === Strings.DEFAULT_AUTHOR_TEXT + ? photoCounter + : `${authorText} ― ${photoCounter}`; headers.push( - `` + `` ); } else { headers.push( diff --git a/src/strings.ts b/src/strings.ts index e988e79..cab4db9 100644 --- a/src/strings.ts +++ b/src/strings.ts @@ -36,6 +36,7 @@ export const Strings = { {headers}`, DEFAULT_AUTHOR_TEXT: 'Twitter', QUOTE_TEXT: `═ ↘️ Quoting {name} (@{screen_name}) ═════`, + PHOTO_COUNT: `Photo {number} of {total}`, ERROR_API_FAIL: 'Tweet failed to load due to an API error :(', ERROR_PRIVATE: `I can't embed Tweets from private accounts, sorry about that :(`, ERROR_TWEET_NOT_FOUND: `Sorry, that Tweet doesn't exist :(`