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

Make logging less verbose with elongator use

Browse source
This commit is contained in:
dangered wolf 2023-04-13 17:29:43 -04:00
parent 23b5baae1e
commit b784adaa90
No known key found for this signature in database
GPG key ID: 41E4D37680ED8B58
1 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/api/status.ts
View file

@ -149,31 +149,35 @@ const populateTweetProperties = async (
return apiTweet; return apiTweet;
}; };
const writeDataPoint = (event: FetchEvent, language: string | undefined, nsfw: boolean, returnCode: string, flags?: InputFlags) => { const writeDataPoint = (
event: FetchEvent,
language: string | undefined,
nsfw: boolean,
returnCode: string,
flags?: InputFlags
) => {
console.log('Writing data point...'); console.log('Writing data point...');
if (typeof AnalyticsEngine !== 'undefined') { if (typeof AnalyticsEngine !== 'undefined') {
const flagString = Object.keys(flags || {}) const flagString =
// @ts-expect-error - TypeScript doesn't like iterating over the keys, but that's OK Object.keys(flags || {})
.filter(flag => flags?.[flag])[0] || 'standard'; // @ts-expect-error - TypeScript doesn't like iterating over the keys, but that's OK
.filter(flag => flags?.[flag])[0] || 'standard';
AnalyticsEngine.writeDataPoint({ AnalyticsEngine.writeDataPoint({
blobs: [ blobs: [
event.request.cf?.colo as string, /* Datacenter location */ event.request.cf?.colo as string /* Datacenter location */,
event.request.cf?.country as string, /* Country code */ event.request.cf?.country as string /* Country code */,
event.request.headers.get('user-agent') ?? '', /* User agent (for aggregating bots calling) */ event.request.headers.get('user-agent') ??
returnCode, /* Return code */ '' /* User agent (for aggregating bots calling) */,
flagString, /* Type of request */ returnCode /* Return code */,
language ?? '', /* For translate feature */ flagString /* Type of request */,
language ?? '' /* For translate feature */
], ],
doubles: [ doubles: [nsfw ? 1 : 0 /* NSFW media = 1, No NSFW Media = 0 */],
nsfw ? 1 : 0 /* NSFW media = 1, No NSFW Media = 0 */ indexes: [event.request.headers.get('cf-ray') ?? '' /* CF Ray */]
],
indexes: [
event.request.headers.get('cf-ray') ?? '', /* CF Ray */
]
}); });
} }
} };
/* API for Twitter statuses (Tweets) /* API for Twitter statuses (Tweets)
Used internally by FixTweet's embed service, or Used internally by FixTweet's embed service, or
@ -195,8 +199,6 @@ export const statusAPI = async (
/* Fallback for if Tweet did not load (i.e. NSFW) */ /* Fallback for if Tweet did not load (i.e. NSFW) */
if (typeof tweet.full_text === 'undefined') { if (typeof tweet.full_text === 'undefined') {
console.log('Invalid status, got tweet ', tweet, ' conversation ', conversation);
if (conversation.timeline?.instructions?.length > 0) { if (conversation.timeline?.instructions?.length > 0) {
/* Try again using elongator API proxy */ /* Try again using elongator API proxy */
console.log('No Tweet was found, loading again from elongator'); console.log('No Tweet was found, loading again from elongator');
@ -211,8 +213,12 @@ export const statusAPI = async (
conversation.timeline?.instructions?.length > 0 conversation.timeline?.instructions?.length > 0
) { ) {
console.log( console.log(
'Tweet could not be accessed with elongator, must be private/suspended' 'Tweet could not be accessed with elongator, must be private/suspende, got tweet ',
tweet,
' conversation ',
conversation
); );
writeDataPoint(event, language, wasMediaBlockedNSFW, 'PRIVATE_TWEET', flags); writeDataPoint(event, language, wasMediaBlockedNSFW, 'PRIVATE_TWEET', flags);
return { code: 401, message: 'PRIVATE_TWEET' }; return { code: 401, message: 'PRIVATE_TWEET' };
} }