Invert forcemosaic -> native multi-image

This commit is contained in:
dangered wolf 2024-03-01 15:08:43 -05:00
parent 9866433bee
commit 7008bb18b9
No known key found for this signature in database
GPG key ID: 41E4D37680ED8B58
8 changed files with 9 additions and 9 deletions

View file

@ -4,7 +4,7 @@ DIRECT_MEDIA_DOMAINS = "d.fxtwitter.com,dl.fxtwitter.com,d.twittpr.com,dl.twittp
TEXT_ONLY_DOMAINS = "t.fxtwitter.com,t.twittpr.com,t.fixupx.com" TEXT_ONLY_DOMAINS = "t.fxtwitter.com,t.twittpr.com,t.fixupx.com"
INSTANT_VIEW_DOMAINS = "i.fxtwitter.com,i.twittpr.com,i.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" GALLERY_DOMAINS = "g.fxtwitter.com,g.twittpr.com,g.fixupx.com"
FORCE_MOSAIC_DOMAINS = "m.fxtwitter.com,m.twittpr.com,m.fixupx.com" NATIVE_MULTI_IMAGE_DOMAINS = "m.fxtwitter.com,m.twittpr.com,m.fixupx.com"
MOSAIC_DOMAIN_LIST = "mosaic.fxtwitter.com" MOSAIC_DOMAIN_LIST = "mosaic.fxtwitter.com"
API_HOST_LIST = "api.fxtwitter.com,api-canary.fxtwitter.com" API_HOST_LIST = "api.fxtwitter.com,api-canary.fxtwitter.com"
HOST_URL = "https://fxtwitter.com" HOST_URL = "https://fxtwitter.com"

View file

@ -38,7 +38,7 @@ let envVariables = [
'TEXT_ONLY_DOMAINS', 'TEXT_ONLY_DOMAINS',
'INSTANT_VIEW_DOMAINS', 'INSTANT_VIEW_DOMAINS',
'GALLERY_DOMAINS', 'GALLERY_DOMAINS',
'FORCE_MOSAIC_DOMAINS', 'NATIVE_MULTI_IMAGE_DOMAINS',
'HOST_URL', 'HOST_URL',
'REDIRECT_URL', 'REDIRECT_URL',
'EMBED_URL', 'EMBED_URL',

View file

@ -8,7 +8,7 @@
"TEXT_ONLY_DOMAINS": "t.fxtwitter.com,t.twittpr.com,t.fixupx.com", "TEXT_ONLY_DOMAINS": "t.fxtwitter.com,t.twittpr.com,t.fixupx.com",
"INSTANT_VIEW_DOMAINS": "i.fxtwitter.com,i.twittpr.com,i.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", "GALLERY_DOMAINS": "g.fxtwitter.com,g.twittpr.com,g.fixupx.com",
"FORCE_MOSAIC_DOMAINS": "m.fxtwitter.com,m.twittpr.com,m.fixupx.com", "NATIVE_MULTI_IMAGE_DOMAINS": "m.fxtwitter.com,m.twittpr.com,m.fixupx.com",
"STANDARD_DOMAIN_LIST": "fxtwitter.com,fixupx.com,twittpr.com", "STANDARD_DOMAIN_LIST": "fxtwitter.com,fixupx.com,twittpr.com",
"DIRECT_MEDIA_DOMAINS": "d.fxtwitter.com,dl.fxtwitter.com,d.fixupx.com,dl.fixupx.com", "DIRECT_MEDIA_DOMAINS": "d.fxtwitter.com,dl.fxtwitter.com,d.fixupx.com,dl.fixupx.com",
"MOSAIC_DOMAIN_LIST": "mosaic.fxtwitter.com", "MOSAIC_DOMAIN_LIST": "mosaic.fxtwitter.com",

View file

@ -6,7 +6,7 @@ export const Constants = {
TEXT_ONLY_DOMAINS: TEXT_ONLY_DOMAINS.split(','), TEXT_ONLY_DOMAINS: TEXT_ONLY_DOMAINS.split(','),
INSTANT_VIEW_DOMAINS: INSTANT_VIEW_DOMAINS.split(','), INSTANT_VIEW_DOMAINS: INSTANT_VIEW_DOMAINS.split(','),
GALLERY_DOMAINS: GALLERY_DOMAINS.split(','), GALLERY_DOMAINS: GALLERY_DOMAINS.split(','),
FORCE_MOSAIC_DOMAINS: FORCE_MOSAIC_DOMAINS.split(','), NATIVE_MULTI_IMAGE_DOMAINS: NATIVE_MULTI_IMAGE_DOMAINS.split(','),
MOSAIC_DOMAIN_LIST: MOSAIC_DOMAIN_LIST.split(','), MOSAIC_DOMAIN_LIST: MOSAIC_DOMAIN_LIST.split(','),
API_HOST_LIST: API_HOST_LIST.split(','), API_HOST_LIST: API_HOST_LIST.split(','),
HOST_URL: HOST_URL, HOST_URL: HOST_URL,

View file

@ -291,7 +291,7 @@ export const handleStatus = async (
siteName = instructions.siteName; siteName = instructions.siteName;
} }
} else if (media?.mosaic) { } else if (media?.mosaic) {
if (experimentCheck(Experiment.DISCORD_NATIVE_MULTI_IMAGE, isDiscord) && !flags.forceMosaic) { if (experimentCheck(Experiment.DISCORD_NATIVE_MULTI_IMAGE, isDiscord) && flags.nativeMultiImage) {
const photos = status.media?.photos || []; const photos = status.media?.photos || [];
photos.forEach(photo => { photos.forEach(photo => {

View file

@ -58,9 +58,9 @@ export const statusRequest = async (c: Context) => {
} else if (Constants.GALLERY_DOMAINS.includes(url.hostname)) { } else if (Constants.GALLERY_DOMAINS.includes(url.hostname)) {
console.log('Gallery embed request'); console.log('Gallery embed request');
flags.gallery = true; flags.gallery = true;
} else if (Constants.FORCE_MOSAIC_DOMAINS.includes(url.hostname)) { } else if (Constants.NATIVE_MULTI_IMAGE_DOMAINS.includes(url.hostname)) {
console.log('Force mosaic request'); console.log('Force mosaic request');
flags.forceMosaic = true; flags.nativeMultiImage = true;
} else if (prefix === 'dl' || prefix === 'dir') { } else if (prefix === 'dl' || prefix === 'dir') {
console.log('Direct media request by path prefix'); console.log('Direct media request by path prefix');
flags.direct = true; flags.direct = true;

2
src/types/env.d.ts vendored
View file

@ -4,7 +4,7 @@ declare const DIRECT_MEDIA_DOMAINS: string;
declare const TEXT_ONLY_DOMAINS: string; declare const TEXT_ONLY_DOMAINS: string;
declare const INSTANT_VIEW_DOMAINS: string; declare const INSTANT_VIEW_DOMAINS: string;
declare const GALLERY_DOMAINS: string; declare const GALLERY_DOMAINS: string;
declare const FORCE_MOSAIC_DOMAINS: string; declare const NATIVE_MULTI_IMAGE_DOMAINS: string;
declare const HOST_URL: string; declare const HOST_URL: string;
declare const EMBED_URL: string; declare const EMBED_URL: string;
declare const REDIRECT_URL: string; declare const REDIRECT_URL: string;

View file

@ -10,7 +10,7 @@ type InputFlags = {
forceInstantView?: boolean; forceInstantView?: boolean;
archive?: boolean; archive?: boolean;
gallery?: boolean; gallery?: boolean;
forceMosaic?: boolean; nativeMultiImage?: boolean;
}; };
interface StatusResponse { interface StatusResponse {