diff --git a/.env.example b/.env.example index b4c372f..d99c76f 100644 --- a/.env.example +++ b/.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" diff --git a/esbuild.config.mjs b/esbuild.config.mjs index 9562607..65aa8a8 100644 --- a/esbuild.config.mjs +++ b/esbuild.config.mjs @@ -44,8 +44,7 @@ let envVariables = [ 'MOSAIC_DOMAIN_LIST', 'API_HOST_LIST', 'SENTRY_DSN', - 'DEPRECATED_DOMAIN_LIST', - 'DEPRECATED_DOMAIN_EPOCH' + 'DEPRECATED_DOMAIN_LIST' ]; // Create defines for all environment variables diff --git a/jestconfig.json b/jestconfig.json index 799557b..37e6521 100644 --- a/jestconfig.json +++ b/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", diff --git a/src/constants.ts b/src/constants.ts index af2d5f9..99cf212 100644 --- a/src/constants.ts +++ b/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, diff --git a/src/realms/twitter/routes/status.ts b/src/realms/twitter/routes/status.ts index 8b5d4c8..06b5e9a 100644 --- a/src/realms/twitter/routes/status.ts +++ b/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) && - BigInt(id?.match(/\d{2,20}/g)?.[0] || 0) > Constants.DEPRECATED_DOMAIN_EPOCH + Constants.DEPRECATED_DOMAIN_LIST.includes(url.hostname) ) { console.log('Request to deprecated domain'); flags.deprecated = true; diff --git a/src/types/env.d.ts b/src/types/env.d.ts index d7af39a..2b04cf2 100644 --- a/src/types/env.d.ts +++ b/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;