DevComp/fxtwitter-docker
1
0
Fork 0
mirror of https://github.com/CompeyDev/fxtwitter-docker.git synced 2025-04-04 18:10:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Separate x / twitter redirects #822"

Browse source 
This reverts commit ac32c0a863.
This commit is contained in:
dangered wolf 2024-08-05 17:15:59 -07:00
parent 054dbd6473
commit 649f82ef52
No known key found for this signature in database
GPG key ID: 41E4D37680ED8B58
4 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/constants.ts
View file

@ -17,7 +17,6 @@ export const Constants = {
GIF_TRANSCODE_DOMAIN: GIF_TRANSCODE_DOMAIN, GIF_TRANSCODE_DOMAIN: GIF_TRANSCODE_DOMAIN,
API_DOCS_URL: `https://github.com/FixTweet/FxTwitter/wiki/API-Home`, API_DOCS_URL: `https://github.com/FixTweet/FxTwitter/wiki/API-Home`,
TWITTER_ROOT: 'https://twitter.com', TWITTER_ROOT: 'https://twitter.com',
X_ROOT: 'https://x.com',
TWITTER_GLOBAL_NAME_ROOT: 'twitter.com', TWITTER_GLOBAL_NAME_ROOT: 'twitter.com',
TWITTER_API_ROOT: 'https://api.twitter.com', TWITTER_API_ROOT: 'https://api.twitter.com',
TWITTER_VIDEO_BASE: 'https://video.twimg.com', TWITTER_VIDEO_BASE: 'https://video.twimg.com',

5
src/realms/twitter/router.ts
View file

@ -24,12 +24,7 @@ export const getBaseRedirectUrl = (c: Context) => {
return baseRedirect.endsWith('/') ? baseRedirect.slice(0, -1) : baseRedirect; return baseRedirect.endsWith('/') ? baseRedirect.slice(0, -1) : baseRedirect;
} }
// Workaround to redirect to correct root depending on request URL
if (c.req.url.includes('fixup')) {
return Constants.X_ROOT
} else {
return Constants.TWITTER_ROOT; return Constants.TWITTER_ROOT;
}
}; };
/* Workaround for some dumb maybe-build time issue where statusRequest isn't ready or something because none of these trigger*/ /* Workaround for some dumb maybe-build time issue where statusRequest isn't ready or something because none of these trigger*/

2
src/realms/twitter/routes/redirects.ts
View file

@ -14,7 +14,7 @@ export const genericTwitterRedirect = async (c: Context) => {
c.header('cache-control', cacheControl); c.header('cache-control', cacheControl);
} }
return c.redirect(`${baseUrl}${url.pathname}?mx=1`, 302); return c.redirect(`${baseUrl}${url.pathname}`, 302);
}; };
export const setRedirectRequest = async (c: Context) => { export const setRedirectRequest = async (c: Context) => {

2
src/realms/twitter/routes/status.ts
View file

@ -119,7 +119,7 @@ export const statusRequest = async (c: Context) => {
if (!isBotUA && !flags.api && !flags.direct) { if (!isBotUA && !flags.api && !flags.direct) {
const baseUrl = getBaseRedirectUrl(c); const baseUrl = getBaseRedirectUrl(c);
return c.redirect(`${baseUrl}/${handle || 'i'}/status/${id}?mx=1`, 302); return c.redirect(`${baseUrl}/${handle || 'i'}/status/${id}`, 302);
} }
c.status(200); c.status(200);