Merge branch 'main' into feature/user_profiles

README.md

@@ -96,7 +96,7 @@ We use Twitter's color data for either the first image/video of the tweet, or th
 
 FixTweet doesn't save logs of what tweets you're sending, nor do we have a public record of what tweets are being embedded by FixTweet.
 
-In fact, because our core embedding and API service uses Cloudflare Workers, FixTweet can only run when you send it a request. Its memory doesn't stick around, and it doesn't have a file system or database to access at all. That is how we keep our privacy promise by building it into the architecture. My goal is always to provide a good public service, and FixTweet doesn't have any ads or tracking to make money off of, nor do we sell data (or even have data _to_ sell).
+In fact, because our core embedding and API service uses Cloudflare Workers, FixTweet can only run when you send it a request. Its memory doesn't stick around, and it doesn't have a file system or database to read from at all. That is how we keep our privacy promise by building it into the architecture. We use Cloudflare Analytics Engine to aggregate basic, anonymous statistics, which do not include information that could identify individual users or Tweets. My goal is always to provide a good public service, and FixTweet doesn't have any ads or tracking to make money off of, nor do we sell data.
 
 Note: We use Cloudflare to cache FixTweet responses to make repeat access faster, which have a maximum TTL of 1 hour. Temporary real-time logging in the terminal (specifically `wrangler tail`) may be used only by the developer while the Worker is being serviced or debugged (to make sure things work as they should), however these logs are only shown in the terminal and are never saved or used for any other purpose. URLs that cause runtime errors in the script (aka Exceptions, usually exceedingly rare unless there was a faulty update pushed out or Twitter API is down) may be logged for a developer to diagnose the issue that is preventing your embed from working.
 
@@ -167,6 +167,8 @@ Once you're set up with your worker on `*.workers.dev`, [add your worker to your
 
 Populate Sentry details in your `.env` to use Sentry in your product to catch exceptions.
 
+In 2023, Twitter began blocking Tweets with NSFW media from the guest API. We use a service binding code-named [elongator](https://github.com/FixTweet/elongator), which use empty Twitter accounts to make these requests successfully. This is an optional component and is only necessary for those who plan to support embedding NSFW media. This method also means you never have to pay Elon Musk to use Twitter's official API.
+
 ---
 
 ## Q&A

package.json

@@ -15,27 +15,27 @@
   "author": "dangered wolf",
   "license": "MIT",
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20230404.0",
+    "@cloudflare/workers-types": "^4.20230511.0",
     "@microsoft/eslint-formatter-sarif": "^3.0.0",
-    "@sentry/webpack-plugin": "^1.20.0",
+    "@sentry/webpack-plugin": "^1.20.1",
     "@types/jest": "^29.5.1",
-    "@typescript-eslint/eslint-plugin": "^5.59.1",
-    "@typescript-eslint/parser": "^5.59.1",
+    "@typescript-eslint/eslint-plugin": "^5.59.5",
+    "@typescript-eslint/parser": "^5.59.5",
     "dotenv": "^16.0.3",
-    "eslint": "^8.39.0",
+    "eslint": "^8.40.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-config-typescript": "^3.0.0",
     "eslint-plugin-optimize-regex": "^1.2.1",
     "eslint-plugin-sonarjs": "^0.19.0",
     "jest": "^29.5.0",
-    "jest-environment-miniflare": "^2.13.0",
+    "jest-environment-miniflare": "^2.14.0",
     "prettier": "^2.8.8",
     "ts-jest": "^29.1.0",
     "ts-loader": "^9.4.2",
     "typescript": "^5.0.4",
-    "webpack": "^5.80.0",
-    "webpack-cli": "^5.0.2",
-    "wrangler": "^2.17.0"
+    "webpack": "^5.82.1",
+    "webpack-cli": "^5.1.1",
+    "wrangler": "^2.20.0"
   },
   "dependencies": {
     "itty-router": "^3.0.12",

src/api/status.ts

@@ -81,7 +81,6 @@ const populateTweetProperties = async (
       } else if (mediaObject.type === 'video' || mediaObject.type === 'gif') {
         apiTweet.twitter_card = 'player';
         apiTweet.media = apiTweet.media || {};
-        apiTweet.media.video = mediaObject as APIVideo;
         apiTweet.media.videos = apiTweet.media.videos || [];
         apiTweet.media.videos.push(mediaObject);
       }

src/helpers/media.ts

@@ -5,7 +5,8 @@ export const processMedia = (media: TweetMedia): APIPhoto | APIVideo | null => {
       type: 'photo',
       url: media.media_url_https,
       width: media.original_info.width,
-      height: media.original_info.height
+      height: media.original_info.height,
+      altText: media.ext_alt_text || ''
     };
   } else if (media.type === 'video' || media.type === 'animated_gif') {
     /* Find the variant with the highest bitrate */

src/status.ts

@@ -204,7 +204,8 @@ export const handleStatus = async (
         height: 0,
         width: 0,
         url: tweet.media.mosaic.formats.jpeg,
-        type: 'photo'
+        type: 'photo',
+        altText: ''
       };
       /* If mosaic isn't available or the link calls for a specific photo,
          we'll indicate which photo it is out of the total */
@@ -297,7 +298,7 @@ export const handleStatus = async (
   }
 
   /* If we have no media to display, instead we'll display the user profile picture in the embed */
-  if (!tweet.media?.video && !tweet.media?.photos && !flags?.textOnly) {
+  if (!tweet.media?.videos && !tweet.media?.photos && !flags?.textOnly) {
     headers.push(
       /* Use a slightly higher resolution image for profile pics */
       `<meta property="og:image" content="${tweet.author.avatar_url?.replace(

src/types/twitterTypes.d.ts

@@ -71,6 +71,7 @@ type TweetMedia = {
   ext_media_color?: {
     palette?: MediaPlaceholderColor[];
   };
+  ext_alt_text?: string;
   id_str: string;
   indices: [number, number];
   media_key: string;

src/types/types.d.ts

@@ -94,6 +94,7 @@ interface APIPhoto {
   url: string;
   width: number;
   height: number;
+  altText: string;
 }
 
 interface APIMosaicPhoto {
@@ -136,7 +137,6 @@ interface APITweet {
   media?: {
     external?: APIExternalMedia;
     photos?: APIPhoto[];
-    video?: APIVideo;
     videos?: APIVideo[];
     mosaic?: APIMosaicPhoto;
   };

test/index.test.ts

@@ -131,7 +131,6 @@ test('API fetch video Tweet', async () => {
   expect(tweet.created_timestamp).toEqual(1492543804);
   expect(tweet.lang).toEqual('en');
   expect(tweet.replying_to).toBeNull();
-  expect(tweet.media?.video).toBeTruthy();
   const video = tweet.media?.videos?.[0] as APIVideo;
   expect(video.url).toEqual(
     'https://video.twimg.com/amplify_video/854415175776059393/vid/720x720/dNEi0crU-jA4mTtr.mp4'
@@ -177,9 +176,11 @@ test('API fetch multi-photo Tweet', async () => {
   expect(photos[0].url).toEqual('https://pbs.twimg.com/media/FA4BaFaXoBUV3di.jpg');
   expect(photos[0].width).toEqual(950);
   expect(photos[0].height).toEqual(620);
+  expect(photos[0].altText).toBeTruthy();
   expect(photos[1].url).toEqual('https://pbs.twimg.com/media/FA4BaUyXEAcAHvK.jpg');
   expect(photos[1].width).toEqual(1386);
   expect(photos[1].height).toEqual(706);
+  expect(photos[1].altText).toBeTruthy();
   expect(tweet.media?.mosaic).toBeTruthy();
   const mosaic = tweet.media?.mosaic as APIMosaicPhoto;
   expect(mosaic.formats?.jpeg).toEqual(