Merge pull request #542 from FixTweet/discord-video-social-proof

Add social proof to videos by replacing provider name

.env.example

@@ -5,7 +5,6 @@ TEXT_ONLY_DOMAINS = "t.fxtwitter.com,t.twittpr.com,t.fixupx.com"
 INSTANT_VIEW_DOMAINS = "i.fxtwitter.com,i.twittpr.com,i.fixupx.com"
 GALLERY_DOMAINS = "g.fxtwitter.com,g.twittpr.com,g.fixupx.com"
 DEPRECATED_DOMAIN_LIST = "pxtwitter.com,www.pxtwitter.com"
-DEPRECATED_DOMAIN_EPOCH = "1559320000000000000"
 MOSAIC_DOMAIN_LIST = "mosaic.fxtwitter.com"
 API_HOST_LIST = "api.fxtwitter.com,api-canary.fxtwitter.com"
 HOST_URL = "https://fxtwitter.com"

esbuild.config.mjs

@@ -44,8 +44,7 @@ let envVariables = [
   'MOSAIC_DOMAIN_LIST',
   'API_HOST_LIST',
   'SENTRY_DSN',
-  'DEPRECATED_DOMAIN_LIST',
+  'DEPRECATED_DOMAIN_LIST'
-  'DEPRECATED_DOMAIN_EPOCH'
 ];
 
 // Create defines for all environment variables

jestconfig.json

@@ -12,7 +12,6 @@
     "DIRECT_MEDIA_DOMAINS": "d.fxtwitter.com,dl.fxtwitter.com,d.fixupx.com,dl.fixupx.com",
     "MOSAIC_DOMAIN_LIST": "mosaic.fxtwitter.com",
     "DEPRECATED_DOMAIN_LIST": "pxtwitter.com,www.pxtwitter.com",
-    "DEPRECATED_DOMAIN_EPOCH": "1559320000000000000",
     "API_HOST_LIST": "api.fxtwitter.com",
     "HOST_URL": "https://fxtwitter.com",
     "REDIRECT_URL": "https://github.com/FixTweet/FixTweet",

src/constants.ts

@@ -7,7 +7,6 @@ export const Constants = {
   INSTANT_VIEW_DOMAINS: INSTANT_VIEW_DOMAINS.split(','),
   GALLERY_DOMAINS: GALLERY_DOMAINS.split(','),
   DEPRECATED_DOMAIN_LIST: DEPRECATED_DOMAIN_LIST.split(','),
-  DEPRECATED_DOMAIN_EPOCH: BigInt(DEPRECATED_DOMAIN_EPOCH),
   MOSAIC_DOMAIN_LIST: MOSAIC_DOMAIN_LIST.split(','),
   API_HOST_LIST: API_HOST_LIST.split(','),
   HOST_URL: HOST_URL,

src/embed/status.ts

@@ -3,7 +3,7 @@ import { Constants } from '../constants';
 import { handleQuote } from '../helpers/quote';
 import { formatNumber, sanitizeText, truncateWithEllipsis } from '../helpers/utils';
 import { Strings } from '../strings';
-import { getAuthorText } from '../helpers/author';
+import { getSocialProof } from '../helpers/socialproof';
 import { renderPhoto } from '../render/photo';
 import { renderVideo } from '../render/video';
 import { renderInstantView } from '../render/instantview';
@@ -157,7 +157,7 @@ export const handleStatus = async (
   /* At this point, we know we're going to have to create a
      regular embed because it's not an API or direct media request */
 
-  let authorText = getAuthorText(status) || Strings.DEFAULT_AUTHOR_TEXT;
+  let authorText = getSocialProof(status) || Strings.DEFAULT_AUTHOR_TEXT;
   const engagementText = authorText.replace(/ {4}/g, ' ');
   let siteName = Constants.BRANDING_NAME;
   let newText = status.text;
@@ -435,8 +435,10 @@ export const handleStatus = async (
   if (!flags.gallery) {
     /* The additional oembed is pulled by Discord to enable improved embeds.
       Telegram does not use this. */
+    let providerEngagementText = getSocialProof(status) ?? Strings.DEFAULT_AUTHOR_TEXT;
+    providerEngagementText = providerEngagementText.replace(/ {4}/g, '  ');
     headers.push(
-      `<link rel="alternate" href="{base}/owoembed?text={text}{deprecatedFlag}&status={status}&author={author}" type="application/json+oembed" title="{name}">`.format(
+      `<link rel="alternate" href="{base}/owoembed?text={text}{deprecatedFlag}&status={status}&author={author}{provider}" type="application/json+oembed" title="{name}">`.format(
         {
           base: Constants.HOST_URL,
           text: flags.gallery
@@ -445,7 +447,8 @@ export const handleStatus = async (
           deprecatedFlag: flags?.deprecated ? '&deprecated=true' : '',
           status: encodeURIComponent(statusId),
           author: encodeURIComponent(status.author.screen_name || ''),
-          name: status.author.name || ''
+          name: status.author.name || '',
+          provider: (status.embed_card === 'player' && providerEngagementText !== Strings.DEFAULT_AUTHOR_TEXT) ? `&provider=${encodeURIComponent(providerEngagementText)}` : ''
         }
       )
     );

src/helpers/socialproof.ts

@@ -1,7 +1,7 @@
 import { formatNumber } from './utils';
 
 /* The embed "author" text we populate with replies, retweets, and likes unless it's a video */
-export const getAuthorText = (status: APITwitterStatus): string | null => {
+export const getSocialProof = (status: APITwitterStatus): string | null => {
   /* Build out reply, retweet, like counts */
   if (
     status.likes > 0 ||

src/realms/twitter/routes/oembed.ts

@@ -15,13 +15,13 @@ export const oembed = async (c: Context) => {
   const random = Math.floor(Math.random() * Object.keys(motd).length);
   const [name, url] = Object.entries(motd)[random];
 
+  const statusUrl = `${Constants.TWITTER_ROOT}/${encodeURIComponent(author)}/status/${status}`;
+
   const data: OEmbed = {
     author_name: text,
-    author_url: `${Constants.TWITTER_ROOT}/${encodeURIComponent(author)}/status/${status}`,
+    author_url: statusUrl,
-    /* Change provider name if status is on deprecated domain. */
+    provider_name: searchParams.get('provider') ?? name,
-    provider_name:
+    provider_url: searchParams.get('provider') ? statusUrl : url,
-      searchParams.get('deprecated') === 'true' ? Strings.DEPRECATED_DOMAIN_NOTICE_DISCORD : name,
-    provider_url: url,
     title: Strings.DEFAULT_AUTHOR_TEXT,
     type: 'link',
     version: '1.0'

src/realms/twitter/routes/status.ts

@@ -66,8 +66,7 @@ export const statusRequest = async (c: Context) => {
   /* The pxtwitter.com domain is deprecated and statuses posted after deprecation
      date will have a notice saying we've moved to fxtwitter.com! */
   if (
-    Constants.DEPRECATED_DOMAIN_LIST.includes(url.hostname) &&
+    Constants.DEPRECATED_DOMAIN_LIST.includes(url.hostname)
-    BigInt(id?.match(/\d{2,20}/g)?.[0] || 0) > Constants.DEPRECATED_DOMAIN_EPOCH
   ) {
     console.log('Request to deprecated domain');
     flags.deprecated = true;

src/render/instantview.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-irregular-whitespace */
 import { Constants } from '../constants';
-import { getSocialTextIV } from '../helpers/author';
+import { getSocialTextIV } from '../helpers/socialproof';
 import { sanitizeText } from '../helpers/utils';
 import { Strings } from '../strings';
 

src/types/env.d.ts

@@ -5,7 +5,6 @@ declare const TEXT_ONLY_DOMAINS: string;
 declare const INSTANT_VIEW_DOMAINS: string;
 declare const GALLERY_DOMAINS: string;
 declare const DEPRECATED_DOMAIN_LIST: string;
-declare const DEPRECATED_DOMAIN_EPOCH: string;
 declare const HOST_URL: string;
 declare const EMBED_URL: string;
 declare const REDIRECT_URL: string;