Updated Instant View author section

src/api/status.ts

@@ -13,7 +13,7 @@ import { isGraphQLTweet } from '../utils/graphql';
    and using it to create FixTweet's streamlined API responses */
 const populateTweetProperties = async (
   tweet: GraphQLTweet,
-  conversation: any, // TimelineBlobPartial,
+  conversation: TweetResultsByRestIdResult, // TimelineBlobPartial,
   language: string | undefined
   // eslint-disable-next-line sonarjs/cognitive-complexity
 ): Promise<APITweet> => {
@@ -44,6 +44,8 @@ const populateTweetProperties = async (
   const graphQLUser = tweet.core.user_results.result;
   const apiUser = convertToApiUser(graphQLUser);
 
+  console.log(JSON.stringify(graphQLUser))
+
   /* Populating a lot of the basics */
   apiTweet.url = `${Constants.TWITTER_ROOT}/${apiUser.screen_name}/status/${tweet.rest_id}`;
   apiTweet.id = tweet.rest_id;
@@ -53,15 +55,24 @@ const populateTweetProperties = async (
     name: apiUser.name,
     screen_name: apiUser.screen_name,
     avatar_url: (apiUser.avatar_url || '').replace('_normal', '_200x200') || '',
-    avatar_color: '0000FF' /* colorFromPalette(
-      tweet.user?.profile_image_extensions_media_color?.palette || []
-    ),*/,
-    banner_url: apiUser.banner_url || ''
+    avatar_color: null,
+    banner_url: apiUser.banner_url || '',
+    description: apiUser.description || '',
+    location: apiUser.location || '',
+    url: apiUser.url || '',
+    followers: apiUser.followers,
+    following: apiUser.following,
+    joined: apiUser.joined,
+    tweets: apiUser.tweets,
+    likes: apiUser.likes,
+    protected: apiUser.protected,
+    birthday: apiUser.birthday,
+    website: apiUser.website,
   };
   apiTweet.replies = tweet.legacy.reply_count;
   apiTweet.retweets = tweet.legacy.retweet_count;
   apiTweet.likes = tweet.legacy.favorite_count;
-  apiTweet.color = apiTweet.author.avatar_color;
+  apiTweet.color = null;
   apiTweet.twitter_card = 'tweet';
   apiTweet.created_at = tweet.legacy.created_at;
   apiTweet.created_timestamp = new Date(tweet.legacy.created_at).getTime() / 1000;

src/api/user.ts

@@ -41,6 +41,16 @@ export const convertToApiUser = (user: GraphQLUser): APIUser => {
     if (typeof birthdate.month === 'number') apiUser.birthday.month = birthdate.month;
     if (typeof birthdate.year === 'number') apiUser.birthday.year = birthdate.year;
   }
+  const website = user.legacy.entities?.url?.urls?.[0];
+
+  if (website) {
+    apiUser.website = {
+      url: website.expanded_url,
+      display_url: website.display_url
+    };
+  } else {
+    apiUser.website = null;
+  }
 
   return apiUser;
 };
@@ -61,7 +71,7 @@ const populateUserProperties = async (
 export const userAPI = async (
   username: string,
   event: FetchEvent,
-  flags?: InputFlags
+  // flags?: InputFlags
 ): Promise<UserAPIResponse> => {
   const userResponse = await fetchUser(username, event);
   if (!userResponse || !Object.keys(userResponse).length) {

src/embed/status.ts

@@ -113,7 +113,8 @@ export const handleStatus = async (
 
   /* Base headers included in all responses */
   const headers = [
-    `<link rel="canonical" href="https://twitter.com/${tweet.author.screen_name}/status/${tweet.id}"/>`,
+    `<link rel="canonical" href="${Constants.TWITTER_ROOT}/${tweet.author.screen_name}/status/${tweet.id}"/>`,
+    `<meta property="og:url" content="${Constants.TWITTER_ROOT}/${tweet.author.screen_name}/status/${tweet.id}"/>`,
     `<meta property="theme-color" content="${tweet.color}"/>`,
     `<meta property="twitter:card" content="${
       tweet.quote?.twitter_card || tweet.twitter_card

src/render/instantview.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-irregular-whitespace */
 import { Constants } from '../constants';
 import { getSocialTextIV } from '../helpers/author';
 import { sanitizeText } from '../helpers/utils';
@@ -44,6 +45,13 @@ const generateTweetMedia = (tweet: APITweet): string => {
 //   return `${hh}:${min} - ${yyyy}/${mm}/${dd}`;
 // }
 
+const formatDate = (date: Date): string => {
+  const yyyy = date.getFullYear();
+  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;
   return input.replace(urlPattern, url => {
@@ -93,6 +101,50 @@ function getTranslatedText(tweet: APITweet, isQuote = false): string | null {
 
 const notApplicableComment = '<!-- N/A -->';
 
+// 1100 -> 1.1K, 1100000 -> 1.1M
+const truncateSocialCount = (count: number): string => {
+  if (count >= 1000000) {
+    return `${(count / 1000000).toFixed(1)}M`;
+  } else if (count >= 1000) {
+    return `${(count / 1000).toFixed(1)}K`;
+  } else {
+    return String(count);
+  }
+}
+
+
+const generateTweetFooter = (tweet: APITweet, isQuote = false): string => {
+  const { author } = tweet;
+
+  let description = author.description;
+  description = htmlifyLinks(description);
+  description = htmlifyHashtags(description);
+  description = populateUserLinks(tweet, description);
+
+  return `
+  <p>${getSocialTextIV(tweet)}</p>
+  <!-- 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" />
+    <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>${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);
   text = htmlifyLinks(text);
@@ -102,19 +154,6 @@ const generateTweet = (tweet: APITweet, isQuote = false): string => {
   const translatedText = getTranslatedText(tweet, isQuote);
 
   return `<!-- Telegram Instant View -->
-  <!-- Embed profile picture, display name, and screen name in table -->
-  ${
-    !isQuote
-      ? `<table>
-    <img src="${tweet.author.avatar_url?.replace('_200x200', '_400x400')}" alt="${
-      tweet.author.name
-    }'s profile picture" />
-    <h2>${tweet.author.name}</h2>
-    <p>@${tweet.author.screen_name}</p>
-    <p>${getSocialTextIV(tweet)}</p>
-  </table>`
-      : ''
-  }
   ${
     isQuote
       ? `
@@ -123,14 +162,15 @@ const generateTweet = (tweet: APITweet, isQuote = false): string => {
   `
       : ''
   }
+  <!-- Embed Tweet media -->
+  ${generateTweetMedia(tweet)} 
   <!-- Translated text (if applicable) -->
   ${translatedText ? translatedText : notApplicableComment}
   <!-- Embed Tweet text -->
   ${text}
-  <!-- Embed Tweet media -->
-  ${generateTweetMedia(tweet)} 
   <!-- Embedded quote tweet -->
   ${!isQuote && tweet.quote ? generateTweet(tweet.quote, true) : notApplicableComment}
+  ${generateTweetFooter(tweet)}
   <br>${!isQuote ? `<a href="${tweet.url}">View original</a>` : notApplicableComment}
   `;
 };

src/types/twitterTypes.d.ts

@@ -239,6 +239,14 @@ type GraphQLUser = {
           indices: [0, 23];
         }[];
       };
+      url?: {
+        urls?: {
+          display_url: string; // "about.twitter.com",
+          expanded_url: string; // "https://about.twitter.com/",
+          url: string; // "https://t.co/DAtOo6uuHk",
+          indices: [0, 23];
+        }[];
+      }
     };
     fast_followers_count: 0;
     favourites_count: number; // 126708,
@@ -502,6 +510,7 @@ type GraphQLTweetFoundResponse = {
   };
 };
 type TweetResultsByRestIdResult = {
+  guestToken?: string;
   errors?: unknown[];
   data?: {
     tweetResult?: {

src/types/types.d.ts

@@ -87,10 +87,6 @@ interface BaseUser {
   banner_url?: string;
 }
 
-interface APITweetAuthor extends BaseUser {
-  avatar_color: string;
-}
-
 interface APIExternalMedia {
   type: 'video';
   url: string;
@@ -155,7 +151,7 @@ interface APITweet {
   quote?: APITweet;
   poll?: APIPoll;
   translation?: APITranslate;
-  author: APITweetAuthor;
+  author: APIUser;
 
   media?: {
     external?: APIExternalMedia;
@@ -179,17 +175,22 @@ interface APITweet {
 }
 
 interface APIUser extends BaseUser {
+  // verified: 'legacy' | 'blue'| 'business' | 'government';
+  // verified_label: string;
   description: string;
   location: string;
   url: string;
+  avatar_color?: string | null;
   protected: boolean;
-  // verified: 'legacy' | 'blue'| 'business' | 'government';
-  // verified_label: string;
   followers: number;
   following: number;
   tweets: number;
   likes: number;
   joined: string;
+  website: {
+    url: string;
+    display_url: string;
+  } | null;
   birthday: {
     day?: number;
     month?: number;