diff --git a/src/render/instantview.ts b/src/render/instantview.ts
index 53f19a3..ff77f3e 100644
--- a/src/render/instantview.ts
+++ b/src/render/instantview.ts
@@ -124,29 +124,41 @@ const generateTweetFooter = (tweet: APITweet, isQuote = false): string => {
description = populateUserLinks(tweet, description);
return `
-
${getSocialTextIV(tweet)}
-
${!isQuote ? `View original post` : notApplicableComment}
-
- About author
- ${
- !isQuote
- ? `
-
- ${author.name}
- @${author.screen_name}
- ${description}
- ${author.location ? `📌 ${author.location}` : ''}${' '}${
- author.website
- ? `🔗 ${author.website.display_url}`
- : ''
- }${' '}${author.joined ? `📆 ${formatDate(new Date(author.joined))}` : ''}
- ${truncateSocialCount(author.following)} Following 
- ${truncateSocialCount(author.followers)} Followers 
- ${truncateSocialCount(author.tweets)} Posts
`
- : ''
- }`;
+ {socialText}
+
{viewOriginal}
+
+ {aboutSection}
+ `.format({
+ socialText: getSocialTextIV(tweet) || '',
+ viewOriginal: !isQuote
+ ? `View original post`
+ : notApplicableComment,
+ aboutSection: isQuote
+ ? ''
+ : `About author
+ {pfp}
+ ${author.name}
+ @${author.screen_name}
+ ${description}
+ {location} {website} {joined}
+
+ {following} Following 
+ {followers} Followers 
+ {tweets} Posts
+
`.format({
+ pfp: `
`,
+ location: author.location ? `📌 ${author.location}` : '',
+ website: author.website
+ ? `🔗 ${author.website.display_url}`
+ : '',
+ joined: author.joined ? `📆 ${formatDate(new Date(author.joined))}` : '',
+ following: truncateSocialCount(author.following),
+ followers: truncateSocialCount(author.followers),
+ tweets: truncateSocialCount(author.tweets)
+ })
+ });
};
const generateTweet = (tweet: APITweet, isQuote = false): string => {
@@ -158,14 +170,7 @@ const generateTweet = (tweet: APITweet, isQuote = false): string => {
const translatedText = getTranslatedText(tweet, isQuote);
return `
- ${
- isQuote
- ? `
-
- `
- : ''
- }
+ {quoteHeader}
${generateTweetMedia(tweet)}
@@ -176,7 +181,11 @@ const generateTweet = (tweet: APITweet, isQuote = false): string => {
${!isQuote && tweet.quote ? generateTweet(tweet.quote, true) : notApplicableComment}
${!isQuote ? generateTweetFooter(tweet) : ''}
${!isQuote ? `View original post` : notApplicableComment}
- `;
+ `.format({
+ quoteHeader: isQuote
+ ? ``
+ : ''
+ });
};
export const renderInstantView = (properties: RenderProperties): ResponseInstructions => {