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

Don't use cached tokens for fallback

Browse source
This commit is contained in:
dangered wolf 2023-04-06 18:29:49 -04:00
parent 7dce798648
commit 5a6deabd84
No known key found for this signature in database
GPG key ID: 41E4D37680ED8B58
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/api/status.ts
View file

@ -167,7 +167,11 @@ export const statusAPI = async (
typeof tweet.full_text === 'undefined' && typeof tweet.full_text === 'undefined' &&
conversation.timeline?.instructions?.length > 0 conversation.timeline?.instructions?.length > 0
) { ) {
console.log('Unfortunately, this Tweet is still not accessible despite trying fallback. Conversation: ', conversation, ' Tweet: ', tweet);
return { code: 401, message: 'PRIVATE_TWEET' }; return { code: 401, message: 'PRIVATE_TWEET' };
} else if (typeof tweet.full_text === 'undefined') {
console.log('Accessing the fallback resulted in an error');
return { code: 500, message: 'API_FAIL' };
} }
} else { } else {
/* {"errors":[{"code":34,"message":"Sorry, that page does not exist."}]} */ /* {"errors":[{"code":34,"message":"Sorry, that page does not exist."}]} */

7
src/fetch.ts
View file

@ -6,10 +6,11 @@ const API_ATTEMPTS = 16;
export const twitterFetch = async ( export const twitterFetch = async (
url: string, url: string,
event: FetchEvent, event: FetchEvent,
fallback = false,
validateFunction: (response: unknown) => boolean validateFunction: (response: unknown) => boolean
): Promise<unknown> => { ): Promise<unknown> => {
let apiAttempts = 0; let apiAttempts = 0;
let newTokenGenerated = false; let newTokenGenerated = fallback;
const [userAgent, secChUa] = generateUserAgent(); const [userAgent, secChUa] = generateUserAgent();
console.log(`Outgoing useragent for this request:`, userAgent); console.log(`Outgoing useragent for this request:`, userAgent);
@ -22,7 +23,7 @@ export const twitterFetch = async (
}; };
const guestTokenRequest = new Request( const guestTokenRequest = new Request(
`${Constants.TWITTER_API_ROOT}/1.1/guest/activate.json`, `${fallback ? Constants.API_FALLBACK_DOMAIN : Constants.TWITTER_API_ROOT}/1.1/guest/activate.json`,
{ {
method: 'POST', method: 'POST',
headers: tokenHeaders, headers: tokenHeaders,
@ -98,6 +99,7 @@ export const twitterFetch = async (
const guestToken = activateJson.guest_token; const guestToken = activateJson.guest_token;
console.log(guestTokenRequest);
console.log(newTokenGenerated ? 'Activated guest:' : 'Using guest:', activateJson); console.log(newTokenGenerated ? 'Activated guest:' : 'Using guest:', activateJson);
console.log('Guest token:', guestToken); console.log('Guest token:', guestToken);
@ -184,6 +186,7 @@ export const fetchConversation = async (
fallback ? Constants.API_FALLBACK_DOMAIN : Constants.TWITTER_API_ROOT fallback ? Constants.API_FALLBACK_DOMAIN : Constants.TWITTER_API_ROOT
}/2/timeline/conversation/${status}.json?${Constants.GUEST_FETCH_PARAMETERS}`, }/2/timeline/conversation/${status}.json?${Constants.GUEST_FETCH_PARAMETERS}`,
event, event,
fallback,
(_conversation: unknown) => { (_conversation: unknown) => {
const conversation = _conversation as TimelineBlobPartial; const conversation = _conversation as TimelineBlobPartial;
return !( return !(