From 2b90894315ed519fa509abe08e05c9d12579a25d Mon Sep 17 00:00:00 2001 From: Pierce Date: Mon, 24 Oct 2022 18:50:43 -0400 Subject: [PATCH 1/2] Add .jpeg to direct media request extensions --- src/server.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server.ts b/src/server.ts index 09dda3c..74d96ed 100644 --- a/src/server.ts +++ b/src/server.ts @@ -38,7 +38,7 @@ const statusRequest = async ( /* Check if domain is a direct media domain (i.e. d.fxtwitter.com), the tweet is prefixed with /dl/ or /dir/ (for TwitFix interop), or the - tweet ends in .mp4, .jpg, or .png + tweet ends in .mp4, .jpg, .jpeg, or .png Note that .png is not documented because images always redirect to a jpg, but it will help someone who does it mistakenly on something like Discord @@ -46,7 +46,7 @@ const statusRequest = async ( Also note that all we're doing here is setting the direct flag. If someone links a video and ends it with .jpg, it will still redirect to a .mp4! */ if ( - url.pathname.match(/\/status(es)?\/\d{2,20}\.(mp4|png|jpg)/g) !== null || + url.pathname.match(/\/status(es)?\/\d{2,20}\.(mp4|png|jpe?g)/g) !== null || Constants.DIRECT_MEDIA_DOMAINS.includes(url.hostname) || prefix === 'dl' || prefix === 'dir' From 02c702387ddd8abf06ecce11d5357c76477c9651 Mon Sep 17 00:00:00 2001 From: Pierce Date: Mon, 24 Oct 2022 19:06:07 -0400 Subject: [PATCH 2/2] Improve logging for direct media requests --- src/server.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/server.ts b/src/server.ts index 74d96ed..590b005 100644 --- a/src/server.ts +++ b/src/server.ts @@ -45,14 +45,15 @@ const statusRequest = async ( Also note that all we're doing here is setting the direct flag. If someone links a video and ends it with .jpg, it will still redirect to a .mp4! */ - if ( - url.pathname.match(/\/status(es)?\/\d{2,20}\.(mp4|png|jpe?g)/g) !== null || - Constants.DIRECT_MEDIA_DOMAINS.includes(url.hostname) || - prefix === 'dl' || - prefix === 'dir' - ) { + if ( url.pathname.match(/\/status(es)?\/\d{2,20}\.(mp4|png|jpe?g)/g)) { console.log('Direct media request by extension'); flags.direct = true; + } else if (Constants.DIRECT_MEDIA_DOMAINS.includes(url.hostname)) { + console.log('Direct media request by domain'); + flags.direct = true; + } else if (prefix === 'dl' || prefix === 'dir') { + console.log('Direct media request by path prefix'); + flags.direct = true; } /* The pxtwitter.com domain is deprecated and Tweets posted after deprecation