diff --git a/src/api/status.ts b/src/api/status.ts index ce71e6c..a610182 100644 --- a/src/api/status.ts +++ b/src/api/status.ts @@ -71,6 +71,8 @@ const populateTweetProperties = async ( tweet.extended_entities?.media || tweet.entities?.media || [] ); + console.log('tweet', JSON.stringify(tweet)) + /* Populate this Tweet's media */ mediaList.forEach(media => { const mediaObject = processMedia(media); diff --git a/src/constants.ts b/src/constants.ts index 4d6d6be..45be395 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -29,10 +29,13 @@ export const Constants = { 'include_quote_count=true', 'include_reply_count=1', 'tweet_mode=extended', + 'include_entities=true', 'include_ext_media_color=true', 'include_ext_media_availability=true', 'include_ext_sensitive_media_warning=true', - 'simple_quoted_tweet=true' + 'include_ext_has_birdwatch_notes=true', + 'simple_quoted_tweet=true', + 'ext=mediaStats%2ChighlightedLabel' ].join('&'), BASE_HEADERS: { 'DNT': `1`, diff --git a/src/embed/status.ts b/src/embed/status.ts index 9f3b264..39dcfc1 100644 --- a/src/embed/status.ts +++ b/src/embed/status.ts @@ -5,6 +5,7 @@ import { Strings } from '../strings'; import { getAuthorText } from '../helpers/author'; import { statusAPI } from '../api/status'; import { renderPhoto } from '../render/photo'; +import { renderVideo } from '../render/video'; export const returnError = (error: string): StatusResponse => { return { @@ -149,7 +150,7 @@ export const handleStatus = async ( switch (overrideMedia.type) { case 'photo': /* This Tweet has a photo to render. */ - instructions = renderPhoto( {tweet: tweet, authorText: authorText, engagementText: engagementText, isOverrideMedia: true, userAgent: userAgent }, overrideMedia as APIPhoto ); + instructions = renderPhoto( {tweet: tweet, authorText: authorText, engagementText: engagementText, userAgent: userAgent, isOverrideMedia: true }, overrideMedia as APIPhoto ); headers.push(...instructions.addHeaders); if (instructions.authorText) { authorText = instructions.authorText; @@ -159,6 +160,14 @@ export const handleStatus = async ( } break; case 'video': + instructions = renderVideo( {tweet: tweet, userAgent: userAgent, text: newText, isOverrideMedia: true }, overrideMedia as APIVideo ); + headers.push(...instructions.addHeaders); + if (instructions.authorText) { + authorText = instructions.authorText; + } + if (instructions.siteName) { + siteName = instructions.siteName; + } /* This Tweet has a video to render. */ break; } @@ -166,63 +175,14 @@ export const handleStatus = async ( const instructions = renderPhoto( {tweet: tweet, authorText: authorText, engagementText: engagementText, userAgent: userAgent }, tweet.media?.mosaic ); headers.push(...instructions.addHeaders); } else if (tweet.media?.videos) { - authorText = tweet.translation?.text || newText || ''; - - const videos = tweet.media?.videos; - const all = tweet.media?.all || []; - const video = videos?.[0]; - - /* This fix is specific to Discord not wanting to render videos that are too large, - or rendering low quality videos too small. - - Basically, our solution is to cut the dimensions in half if the video is too big (> 1080p), - or double them if it's too small. (<400p) - - We check both height and width so we can apply this to both horizontal and vertical videos equally*/ - - let sizeMultiplier = 1; - - if (video.width > 1920 || video.height > 1920) { - sizeMultiplier = 0.5; + const instructions = renderVideo( {tweet: tweet, userAgent: userAgent, text: newText }, tweet.media?.videos[0] ); + headers.push(...instructions.addHeaders); + if (instructions.authorText) { + authorText = instructions.authorText; } - if (video.width < 400 && video.height < 400) { - sizeMultiplier = 2; + if (instructions.siteName) { + siteName = instructions.siteName; } - - /* Like photos when picking a specific one (not using mosaic), - we'll put an indicator if there are more than one video */ - if (all && all.length > 1) { - const videoCounter = Strings.VIDEO_COUNT.format({ - number: String(all.indexOf(video) + 1), - total: String(all.length) - }); - - authorText = - authorText === Strings.DEFAULT_AUTHOR_TEXT - ? videoCounter - : `${authorText}${authorText ? ' ― ' : ''}${videoCounter}`; - - siteName = `${Constants.BRANDING_NAME} - ${videoCounter}`; - - if (engagementText) { - siteName = `${Constants.BRANDING_NAME} - ${engagementText} - ${videoCounter}`; - } - } - - /* Push the raw video-related headers */ - headers.push( - ``, - ``, - ``, - ``, - ``, - ``, - ``, - ``, - `` - ); } else if (tweet.media?.external) { const { external } = tweet.media; authorText = newText || ''; diff --git a/src/render/video.ts b/src/render/video.ts new file mode 100644 index 0000000..ff380a6 --- /dev/null +++ b/src/render/video.ts @@ -0,0 +1,57 @@ +import { Constants } from "../constants"; +import { Strings } from "../strings"; + +export const renderVideo = (properties: RenderProperties, video: APIVideo): ResponseInstructions => { + const { tweet, userAgent, text } = properties; + const instructions: ResponseInstructions = { addHeaders: [] }; + + const all = tweet.media?.all as APIMedia[]; + + /* This fix is specific to Discord not wanting to render videos that are too large, + or rendering low quality videos too small. + + Basically, our solution is to cut the dimensions in half if the video is too big (> 1080p), + or double them if it's too small. (<400p) + + We check both height and width so we can apply this to both horizontal and vertical videos equally*/ + + let sizeMultiplier = 1; + + if (video.width > 1920 || video.height > 1920) { + sizeMultiplier = 0.5; + } + if (video.width < 400 && video.height < 400) { + sizeMultiplier = 2; + } + + /* Like photos when picking a specific one (not using mosaic), + we'll put an indicator if there are more than one video */ + if (all && all.length > 1 && (userAgent?.indexOf('Telegram') ?? 0) > -1) { + const baseString = all.length === tweet.media?.videos?.length ? Strings.VIDEO_COUNT : Strings.MEDIA_COUNT; + const videoCounter = baseString.format({ + number: String(all.indexOf(video) + 1), + total: String(all.length) + }); + + instructions.siteName = `${Constants.BRANDING_NAME} - ${videoCounter}`; + } + + instructions.authorText = tweet.translation?.text || text || ''; + + /* Push the raw video-related headers */ + instructions.addHeaders = [ + ``, + ``, + ``, + ``, + ``, + ``, + ``, + ``, + `` + ]; + + return instructions; +} \ No newline at end of file diff --git a/src/types/types.d.ts b/src/types/types.d.ts index f7f6799..64652ca 100644 --- a/src/types/types.d.ts +++ b/src/types/types.d.ts @@ -20,6 +20,7 @@ interface ResponseInstructions { authorText?: string; siteName?: string; engagementText?: string; + text?: string; } interface RenderProperties { @@ -29,6 +30,7 @@ interface RenderProperties { engagementText?: string; isOverrideMedia?: boolean; userAgent?: string; + text?: string; } interface Request {