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

Just ignore garbage characters in tweet id (fixes #482)

Browse source
This commit is contained in:
dangered wolf 2023-11-12 00:10:40 -05:00
parent f339eb7f07
commit 19dbeee43f
No known key found for this signature in database
GPG key ID: 41E4D37680ED8B58
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,28 +30,28 @@ export const getBaseRedirectUrl = (c: Context) => {
const tweetRequest = async (c: Context) => await statusRequest(c); const tweetRequest = async (c: Context) => await statusRequest(c);
const _profileRequest = async (c: Context) => await profileRequest(c); const _profileRequest = async (c: Context) => await profileRequest(c);
twitter.get('/:handle{[0-9a-zA-Z_]+}/:endpoint{status(es)?}/:id{[0-9]+}/:language{[a-z]+}?', tweetRequest); twitter.get('/:handle{[0-9a-zA-Z_]+}/:endpoint{status(es)?}/:id{.+}/:language{[a-z]+}?', tweetRequest);
twitter.get('/:handle{[0-9a-zA-Z_]+}/:endpoint{status(es)?}/:id{[0-9]+}/', tweetRequest); twitter.get('/:handle{[0-9a-zA-Z_]+}/:endpoint{status(es)?}/:id{.+}/', tweetRequest);
twitter.get('/:prefix{(dir|dl)}/:handle{[0-9a-zA-Z_]+}/status/:id{[0-9]+}/:language{[a-z]+}?', tweetRequest); twitter.get('/:prefix{(dir|dl)}/:handle{[0-9a-zA-Z_]+}/status/:id{.+}/:language{[a-z]+}?', tweetRequest);
twitter.get('/:prefix{(dir|dl)}/:handle{[0-9a-zA-Z_]+}/status/:id{[0-9]+}/', tweetRequest); twitter.get('/:prefix{(dir|dl)}/:handle{[0-9a-zA-Z_]+}/status/:id{.+}/', tweetRequest);
twitter.get( twitter.get(
'/:handle{[0-9a-zA-Z_]+}/status/:id{[0-9]+}/:mediaType{(photos?|videos?)}/:mediaNumber{[1-4]}/', '/:handle{[0-9a-zA-Z_]+}/status/:id{.+}/:mediaType{(photos?|videos?)}/:mediaNumber{[1-4]}/',
tweetRequest tweetRequest
); );
twitter.get( twitter.get(
'/:handle{[0-9a-zA-Z_]+}/status/:id{[0-9]+}/:mediaType{(photos?|videos?)}/:mediaNumber{[1-4]}/:language{[a-z]+}?', '/:handle{[0-9a-zA-Z_]+}/status/:id{.+}/:mediaType{(photos?|videos?)}/:mediaNumber{[1-4]}/:language{[a-z]+}?',
tweetRequest tweetRequest
); );
twitter.get( twitter.get(
'/:handle{[0-9a-zA-Z_]+}/status/:id{[0-9]+}/:mediaType{(photos?|videos?)}/:mediaNumber{[1-4]}/', '/:handle{[0-9a-zA-Z_]+}/status/:id{.+}/:mediaType{(photos?|videos?)}/:mediaNumber{[1-4]}/',
tweetRequest tweetRequest
); );
twitter.get( twitter.get(
'/:prefix{(dir|dl)}/:handle{[0-9a-zA-Z_]+}/status/:id{[0-9]+}/:mediaType{(photos?|videos?)}/:mediaNumber{[1-4]}/:language{[a-z]+}?', '/:prefix{(dir|dl)}/:handle{[0-9a-zA-Z_]+}/status/:id{.+}/:mediaType{(photos?|videos?)}/:mediaNumber{[1-4]}/:language{[a-z]+}?',
tweetRequest tweetRequest
); );
twitter.get( twitter.get(
'/:prefix{(dir|dl)}/:handle{[0-9a-zA-Z_]+}/status/:id{[0-9]+}/:mediaType{(photos?|videos?)}/:mediaNumber{[1-4]}/', '/:prefix{(dir|dl)}/:handle{[0-9a-zA-Z_]+}/status/:id{.+}/:mediaType{(photos?|videos?)}/:mediaNumber{[1-4]}/',
tweetRequest tweetRequest
); );

9
src/worker.ts
View file

@ -11,6 +11,15 @@ import { cacheMiddleware } from './caches';
const noCache = 'max-age=0, no-cache, no-store, must-revalidate'; const noCache = 'max-age=0, no-cache, no-store, must-revalidate';
/* This is the root app which contains route trees for multiple "realms".
We use the term "realms" rather than domains because of the way FixTweet is structured.
fxtwitter.com and fixupx.com both contain the exact same content, but api.fxtwitter.com does not*, despite technically
being the same domain as fxtwitter.com. Similarly, d.fxtwitter.com and other subdomain flags, etc.
This allows us to connect a single FixTweet worker to tons of domains and still route them to the correct content.
This will prove useful if/when we add other data providers to FixTweet.
* Under the old system with itty-router, this was not the case, but it is since adopting Hono. This will be necessary for FixTweet API v2. */
export const app = new Hono<{ export const app = new Hono<{
Bindings: { TwitterProxy: Fetcher; AnalyticsEngine: AnalyticsEngineDataset }; Bindings: { TwitterProxy: Fetcher; AnalyticsEngine: AnalyticsEngineDataset };
}>({ }>({