From 49413d5e4964c8c16d394e377a0242224ff3f5b7 Mon Sep 17 00:00:00 2001
From: dangered wolf <d@ngeredwolf.me>
Date: Mon, 21 Aug 2023 21:12:41 -0400
Subject: [PATCH] Fix note tweets urls

---
 src/api/status.ts           | 26 ++++++++++++++------------
 src/types/twitterTypes.d.ts | 21 ++++++++++++++++-----
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/api/status.ts b/src/api/status.ts
index ba12198..5e511ec 100644
--- a/src/api/status.ts
+++ b/src/api/status.ts
@@ -84,6 +84,20 @@ const populateTweetProperties = async (
   } else {
     apiTweet.views = null;
   }
+  console.log('note_tweet', JSON.stringify(tweet.note_tweet));
+  const noteTweetText = tweet.note_tweet?.note_tweet_results?.result?.text;
+  /* For now, don't include note tweets */
+  if (noteTweetText) {
+    tweet.legacy.entities.urls = tweet.note_tweet?.note_tweet_results?.result?.entity_set.urls;
+    tweet.legacy.entities.hashtags = tweet.note_tweet?.note_tweet_results?.result?.entity_set.hashtags;
+    tweet.legacy.entities.symbols = tweet.note_tweet?.note_tweet_results?.result?.entity_set.symbols;
+
+    console.log('We meet the conditions to use new note tweets');
+    apiTweet.text = unescapeText(linkFixer(tweet, noteTweetText));
+    apiTweet.is_note_tweet = true;
+  } else {
+    apiTweet.is_note_tweet = false;
+  }
 
   if (tweet.legacy.lang !== 'unk') {
     apiTweet.lang = tweet.legacy.lang;
@@ -126,18 +140,6 @@ const populateTweetProperties = async (
     apiTweet.color = colorFromPalette(mediaList[0].ext_media_color.palette);
   }
   */
-  console.log('note_tweet', JSON.stringify(tweet.note_tweet));
-  const noteTweetText = tweet.note_tweet?.note_tweet_results?.result?.text;
-  /* For now, don't include note tweets */
-  if (
-    noteTweetText /*&& mediaList.length <= 0 && tweet.legacy.entities?.urls?.length <= 0*/
-  ) {
-    console.log('We meet the conditions to use new note tweets');
-    apiTweet.text = unescapeText(linkFixer(tweet, noteTweetText));
-    apiTweet.is_note_tweet = true;
-  } else {
-    apiTweet.is_note_tweet = false;
-  }
 
   /* Handle photos and mosaic if available */
   if ((apiTweet?.media?.photos?.length || 0) > 1) {
diff --git a/src/types/twitterTypes.d.ts b/src/types/twitterTypes.d.ts
index bdf395e..485bc2d 100644
--- a/src/types/twitterTypes.d.ts
+++ b/src/types/twitterTypes.d.ts
@@ -390,13 +390,24 @@ type GraphQLTweet = {
   legacy: GraphQLTweetLegacy;
   note_tweet: {
     is_expandable: boolean;
-    entity_set: {
-      hashtags: unknown[];
-      urls: unknown[];
-      user_mentions: unknown[];
-    };
     note_tweet_results: {
       result: {
+        entity_set: {
+          hashtags: unknown[];
+          symbols: unknown[];
+          urls: TcoExpansion[];
+          user_mentions: unknown[];
+        };
+        media: {
+          inline_media: unknown[]
+        };
+        richtext: {
+          richtext_tags: {
+            from_index: number
+            to_index: number
+            richtext_types: string[]
+          }[]
+        };
         text: string;
       };
     };