From d9e101a740dbc659d80d98224b7f6de5aaf9c738 Mon Sep 17 00:00:00 2001
From: dangered wolf <d@ngeredwolf.me>
Date: Mon, 21 Aug 2023 21:58:29 -0400
Subject: [PATCH] Prettier & improved IV accessibility

---
 src/api/status.ts           | 13 ++++++++-----
 src/api/user.ts             |  2 +-
 src/fetch.ts                | 10 ++++++++--
 src/render/instantview.ts   | 31 ++++++++++++++++++-------------
 src/types/twitterTypes.d.ts | 14 +++++++-------
 5 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/src/api/status.ts b/src/api/status.ts
index 5e511ec..a52306c 100644
--- a/src/api/status.ts
+++ b/src/api/status.ts
@@ -44,7 +44,7 @@ const populateTweetProperties = async (
   const graphQLUser = tweet.core.user_results.result;
   const apiUser = convertToApiUser(graphQLUser);
 
-  console.log(JSON.stringify(graphQLUser))
+  console.log(JSON.stringify(graphQLUser));
 
   /* Populating a lot of the basics */
   apiTweet.url = `${Constants.TWITTER_ROOT}/${apiUser.screen_name}/status/${tweet.rest_id}`;
@@ -67,7 +67,7 @@ const populateTweetProperties = async (
     likes: apiUser.likes,
     protected: apiUser.protected,
     birthday: apiUser.birthday,
-    website: apiUser.website,
+    website: apiUser.website
   };
   apiTweet.replies = tweet.legacy.reply_count;
   apiTweet.retweets = tweet.legacy.retweet_count;
@@ -88,9 +88,12 @@ const populateTweetProperties = async (
   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;
+    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));
diff --git a/src/api/user.ts b/src/api/user.ts
index 09cadf1..9f3e811 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -70,7 +70,7 @@ const populateUserProperties = async (
    available for free using api.fxtwitter.com. */
 export const userAPI = async (
   username: string,
-  event: FetchEvent,
+  event: FetchEvent
   // flags?: InputFlags
 ): Promise<UserAPIResponse> => {
   const userResponse = await fetchUser(username, event);
diff --git a/src/fetch.ts b/src/fetch.ts
index 149ee61..02aa9be 100644
--- a/src/fetch.ts
+++ b/src/fetch.ts
@@ -9,7 +9,10 @@ let wasElongatorDisabled = false;
 export const twitterFetch = async (
   url: string,
   event: FetchEvent,
-  useElongator = experimentCheck(Experiment.ELONGATOR_BY_DEFAULT, typeof TwitterProxy !== 'undefined'),
+  useElongator = experimentCheck(
+    Experiment.ELONGATOR_BY_DEFAULT,
+    typeof TwitterProxy !== 'undefined'
+  ),
   validateFunction: (response: unknown) => boolean
 ): Promise<unknown> => {
   let apiAttempts = 0;
@@ -214,7 +217,10 @@ export const twitterFetch = async (
 export const fetchConversation = async (
   status: string,
   event: FetchEvent,
-  useElongator = experimentCheck(Experiment.ELONGATOR_BY_DEFAULT, typeof TwitterProxy !== 'undefined')
+  useElongator = experimentCheck(
+    Experiment.ELONGATOR_BY_DEFAULT,
+    typeof TwitterProxy !== 'undefined'
+  )
 ): Promise<TweetResultsByRestIdResult> => {
   return (await twitterFetch(
     `${
diff --git a/src/render/instantview.ts b/src/render/instantview.ts
index 8829b56..dbbffc0 100644
--- a/src/render/instantview.ts
+++ b/src/render/instantview.ts
@@ -22,13 +22,16 @@ const generateTweetMedia = (tweet: APITweet): string => {
     tweet.media.all.forEach(mediaItem => {
       switch (mediaItem.type) {
         case 'photo':
-          media += `<img src="${mediaItem.url}" alt="${tweet.author.name}'s photo"/>`;
+          // eslint-disable-next-line no-case-declarations
+          const { altText } = mediaItem as APIPhoto;
+          // eslint-disable-next-line sonarjs/no-nested-template-literals
+          media += `<img src="${mediaItem.url}" ${altText ? `alt="${altText}"` : ''}/>`;
           break;
         case 'video':
-          media += `<video src="${mediaItem.url}" alt="${tweet.author.name}'s video"/>`;
+          media += `<video src="${mediaItem.url}" alt="${tweet.author.name}'s video. Alt text not available."/>`;
           break;
         case 'gif':
-          media += `<video src="${mediaItem.url}" alt="${tweet.author.name}'s gif"/>`;
+          media += `<video src="${mediaItem.url}" alt="${tweet.author.name}'s gif. Alt text not available."/>`;
           break;
       }
     });
@@ -50,7 +53,7 @@ const formatDate = (date: Date): string => {
   const mm = String(date.getMonth() + 1).padStart(2, '0'); // Months are 0-indexed
   const dd = String(date.getDate()).padStart(2, '0');
   return `${yyyy}/${mm}/${dd}`;
-}
+};
 
 const htmlifyLinks = (input: string): string => {
   const urlPattern = /\bhttps?:\/\/\S+/g;
@@ -110,8 +113,7 @@ const truncateSocialCount = (count: number): string => {
   } else {
     return String(count);
   }
-}
-
+};
 
 const generateTweetFooter = (tweet: APITweet, isQuote = false): string => {
   const { author } = tweet;
@@ -123,27 +125,30 @@ const generateTweetFooter = (tweet: APITweet, isQuote = false): string => {
 
   return `
   <p>${getSocialTextIV(tweet)}</p>
+  <br>${!isQuote ? `<a href="${tweet.url}">View original post</a>` : notApplicableComment}
   <!-- Embed profile picture, display name, and screen name in table -->
   <h3>About author</h3>
   ${
     !isQuote
       ? `<table>
       <img src="${author.avatar_url?.replace('_200x200', '_400x400')}" alt="${
-      author.name
-    }'s profile picture" />
+        author.name
+      }'s profile picture" />
     <h2>${author.name}</h2>
     <p><a href="${author.url}">@${author.screen_name}</a></p>
     <p><b>${description}</b></p>
-    <p>${author.location ? `📌 ${author.location}` : ''}${' '
-    }${author.website ? `🔗 <a href=${author.website.url}>${author.website.display_url}</a>` : ''}${' '
-    }${author.joined ? `📆 ${formatDate(new Date(author.joined))}` : ''}</p>
+    <p>${author.location ? `📌 ${author.location}` : ''}${' '}${
+      author.website
+        ? `🔗 <a href=${author.website.url}>${author.website.display_url}</a>`
+        : ''
+    }${' '}${author.joined ? `📆 ${formatDate(new Date(author.joined))}` : ''}</p>
     <p>${truncateSocialCount(author.following)} <b>Following</b> 
     ${truncateSocialCount(author.followers)} <b>Followers</b> 
     ${truncateSocialCount(author.tweets)} <b>Posts</b></p>
   </table>`
       : ''
   }`;
-}
+};
 
 const generateTweet = (tweet: APITweet, isQuote = false): string => {
   let text = paragraphify(sanitizeText(tweet.text), isQuote);
@@ -171,7 +176,7 @@ const generateTweet = (tweet: APITweet, isQuote = false): string => {
   <!-- Embedded quote tweet -->
   ${!isQuote && tweet.quote ? generateTweet(tweet.quote, true) : notApplicableComment}
   ${generateTweetFooter(tweet)}
-  <br>${!isQuote ? `<a href="${tweet.url}">View original</a>` : notApplicableComment}
+  <br>${!isQuote ? `<a href="${tweet.url}">View original post</a>` : notApplicableComment}
   `;
 };
 
diff --git a/src/types/twitterTypes.d.ts b/src/types/twitterTypes.d.ts
index 485bc2d..41d6591 100644
--- a/src/types/twitterTypes.d.ts
+++ b/src/types/twitterTypes.d.ts
@@ -246,7 +246,7 @@ type GraphQLUser = {
           url: string; // "https://t.co/DAtOo6uuHk",
           indices: [0, 23];
         }[];
-      }
+      };
     };
     fast_followers_count: 0;
     favourites_count: number; // 126708,
@@ -376,7 +376,7 @@ type GraphQLTweet = {
       user_results: {
         result: GraphQLUser;
       };
-    }
+    };
   };
   edit_control: unknown;
   edit_perspective: unknown;
@@ -399,14 +399,14 @@ type GraphQLTweet = {
           user_mentions: unknown[];
         };
         media: {
-          inline_media: unknown[]
+          inline_media: unknown[];
         };
         richtext: {
           richtext_tags: {
-            from_index: number
-            to_index: number
-            richtext_types: string[]
-          }[]
+            from_index: number;
+            to_index: number;
+            richtext_types: string[];
+          }[];
         };
         text: string;
       };