Run prettier

src/caches.ts

@@ -23,13 +23,12 @@ export const cacheMiddleware = (): MiddlewareHandler => async (c, next) => {
 
   try {
     cacheKey = new Request(cacheUrl.toString(), request);
-  } catch(e) {
+  } catch (e) {
     /* In Miniflare, you can't really create requests like this, so we ignore caching in the test environment */
     await next();
     return c.res.clone();
   }
 
-  
   const cache = caches.default;
 
   switch (request.method) {
@@ -58,8 +57,7 @@ export const cacheMiddleware = (): MiddlewareHandler => async (c, next) => {
          Use waitUntil so you can return the response without blocking on
          writing to cache */
       try {
-        c.executionCtx &&
+        c.executionCtx && c.executionCtx.waitUntil(cache.put(cacheKey, response.clone()));
-        c.executionCtx.waitUntil(cache.put(cacheKey, response.clone()));
       } catch (error) {
         console.error((error as Error).stack);
       }

src/fetch.ts

@@ -138,20 +138,25 @@ export const twitterFetch = async (
       if (useElongator && typeof c.env?.TwitterProxy !== 'undefined') {
         console.log('Fetching using elongator');
         const performanceStart = performance.now();
-        apiRequest = await withTimeout((signal: AbortSignal) => c.env?.TwitterProxy.fetch(url, {
+        apiRequest = await withTimeout(
-          method: 'GET',
+          (signal: AbortSignal) =>
-          headers: headers,
+            c.env?.TwitterProxy.fetch(url, {
-          signal: signal
+              method: 'GET',
-        }));
+              headers: headers,
+              signal: signal
+            })
+        );
         const performanceEnd = performance.now();
         console.log(`Elongator request successful after ${performanceEnd - performanceStart}ms`);
       } else {
         const performanceStart = performance.now();
-        apiRequest = await withTimeout((signal: AbortSignal) => fetch(url, {
+        apiRequest = await withTimeout((signal: AbortSignal) =>
-          method: 'GET',
+          fetch(url, {
-          headers: headers,
+            method: 'GET',
-          signal: signal
+            headers: headers,
-        }));
+            signal: signal
+          })
+        );
         const performanceEnd = performance.now();
         console.log(`Guest API request successful after ${performanceEnd - performanceStart}ms`);
       }
@@ -166,7 +171,7 @@ export const twitterFetch = async (
         console.log('Tweet was not found');
         return null;
       }
-      try{
+      try {
         !useElongator &&
           c.executionCtx &&
           c.executionCtx.waitUntil(
@@ -184,7 +189,6 @@ export const twitterFetch = async (
       continue;
     }
 
-
     if (
       !wasElongatorDisabled &&
       !useElongator &&

src/helpers/author.ts

@@ -3,7 +3,12 @@ import { formatNumber } from './utils';
 /* The embed "author" text we populate with replies, retweets, and likes unless it's a video */
 export const getAuthorText = (tweet: APITweet): string | null => {
   /* Build out reply, retweet, like counts */
-  if (tweet.likes > 0 || tweet.reposts > 0 || tweet.replies > 0 || (tweet.views ? tweet.views > 0 : false)) {
+  if (
+    tweet.likes > 0 ||
+    tweet.reposts > 0 ||
+    tweet.replies > 0 ||
+    (tweet.views ? tweet.views > 0 : false)
+  ) {
     let authorText = '';
     if (tweet.replies > 0) {
       authorText += `${formatNumber(tweet.replies)} 💬    `;

src/helpers/translate.ts

@@ -54,11 +54,14 @@ export const translateTweet = async (
   try {
     const url = `${Constants.TWITTER_ROOT}/i/api/1.1/strato/column/None/tweetId=${tweet.rest_id},destinationLanguage=None,translationSource=Some(Google),feature=None,timeout=None,onlyCached=None/translation/service/translateTweet`;
     console.log(url, headers);
-    translationApiResponse = await withTimeout((signal: AbortSignal) => c.env?.TwitterProxy.fetch(url, {
+    translationApiResponse = (await withTimeout(
-      method: 'GET',
+      (signal: AbortSignal) =>
-      headers: headers,
+        c.env?.TwitterProxy.fetch(url, {
-      signal: signal
+          method: 'GET',
-    })) as Response;
+          headers: headers,
+          signal: signal
+        })
+    )) as Response;
     translationResults = (await translationApiResponse.json()) as TranslationPartial;
 
     console.log(`translationResults`, translationResults);

src/helpers/utils.ts

@@ -40,17 +40,17 @@ export async function withTimeout<T>(
   const timeoutId = setTimeout(() => controller.abort(), timeout);
 
   try {
-      const result = await asyncTask(controller.signal);
+    const result = await asyncTask(controller.signal);
-      /* Clear the timeout if the task completes in time */
+    /* Clear the timeout if the task completes in time */
-      clearTimeout(timeoutId); 
+    clearTimeout(timeoutId);
-      return result;
+    return result;
   } catch (error) {
-      if ((error as Error).name === 'AbortError') {
+    if ((error as Error).name === 'AbortError') {
-          throw new Error('Asynchronous task was aborted due to timeout');
+      throw new Error('Asynchronous task was aborted due to timeout');
-      } else {
+    } else {
-        /* Re-throw other errors for further handling */
+      /* Re-throw other errors for further handling */
-          throw error as Error; 
+      throw error as Error;
-      }
+    }
   }
 }
 

src/providers/twitter/conversation.ts

@@ -69,7 +69,8 @@ export const fetchTweetDetail = async (
       }
       console.log('invalid graphql tweet', conversation);
       const firstInstruction = (
-        conversation?.data?.threaded_conversation_with_injections_v2?.instructions?.[0] as TimelineAddEntriesInstruction
+        conversation?.data?.threaded_conversation_with_injections_v2
+          ?.instructions?.[0] as TimelineAddEntriesInstruction
       )?.entries?.[0];
       if (
         (
@@ -296,7 +297,8 @@ export const constructTwitterThread = async (
     console.log(response);
 
     const firstInstruction = (
-      response?.data?.threaded_conversation_with_injections_v2?.instructions?.[0] as TimelineAddEntriesInstruction
+      response?.data?.threaded_conversation_with_injections_v2
+        ?.instructions?.[0] as TimelineAddEntriesInstruction
     )?.entries?.[0];
     if (
       (

src/realms/twitter/router.ts

@@ -32,10 +32,19 @@ const _profileRequest = async (c: Context) => await profileRequest(c);
 
 twitter.get('/:endpoint{status(es)?}/:id{.+}/:language{[a-z]+}?', tweetRequest);
 twitter.get('/:endpoint{status(es)?}/:id{.+}/', 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{.+}/:language{[a-z]+}?',
+  tweetRequest
+);
 twitter.get('/:handle{[0-9a-zA-Z_]+}/:endpoint{status(es)?}/:id{.+}/', tweetRequest);
-twitter.get('/:prefix{(dir|dl)}/:handle{[0-9a-zA-Z_]+}/:endpoint{status(es)?}/:id{.+}/:language{[a-z]+}?', tweetRequest);
+twitter.get(
-twitter.get('/:prefix{(dir|dl)}/:handle{[0-9a-zA-Z_]+}/:endpoint{status(es)?}/:id{.+}/', tweetRequest);
+  '/:prefix{(dir|dl)}/:handle{[0-9a-zA-Z_]+}/:endpoint{status(es)?}/:id{.+}/:language{[a-z]+}?',
+  tweetRequest
+);
+twitter.get(
+  '/:prefix{(dir|dl)}/:handle{[0-9a-zA-Z_]+}/:endpoint{status(es)?}/:id{.+}/',
+  tweetRequest
+);
 twitter.get(
   '/:handle{[0-9a-zA-Z_]+}/:endpoint{status(es)?}/:id{.+}/:mediaType{(photos?|videos?)}/:mediaNumber{[1-4]}/',
   tweetRequest

src/realms/twitter/routes/status.ts

@@ -80,9 +80,7 @@ export const statusRequest = async (c: Context) => {
 
   const baseUrl = getBaseRedirectUrl(c);
 
-  if (
+  if (Constants.API_HOST_LIST.includes(url.hostname)) {
-    Constants.API_HOST_LIST.includes(url.hostname)
-  ) {
     console.log('JSON API request');
     flags.api = true;
   }

src/strings.ts

@@ -31,7 +31,7 @@ export const Strings = {
 ███   Worker build ${RELEASE_NAME}
 
 --><head>{headers}</head><body>{body}</body></html>`,
-ERROR_HTML: `<!DOCTYPE html>
+  ERROR_HTML: `<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="utf-8">
@@ -63,8 +63,8 @@ This may be caused by API downtime or a new bug. Try again in a little while." p
     <p>${RELEASE_NAME}</p>
   </body>
 </html>`
-  .replace(/( {2})/g, '')
+    .replace(/( {2})/g, '')
-  .replace(/>\s+</gm, '><'),
+    .replace(/>\s+</gm, '><'),
   TIMEOUT_ERROR_HTML: `<!DOCTYPE html>
 <html lang="en">
   <head>
@@ -156,8 +156,8 @@ This may be caused by API downtime or a new bug. Try again in a little while." p
       {ua}</h2>
     </body>
   </html>`
-  .replace(/( {2})/g, '')
+    .replace(/( {2})/g, '')
-  .replace(/>\s+</gm, '><'),
+    .replace(/>\s+</gm, '><'),
   MESSAGE_HTML: `<!DOCTYPE html>
   <html lang="en">
     <head>
@@ -190,8 +190,8 @@ This may be caused by API downtime or a new bug. Try again in a little while." p
       <h2>{message}</h2>
     </body>
   </html>`
-  .replace(/( {2})/g, '')
+    .replace(/( {2})/g, '')
-  .replace(/>\s+</gm, '><'),
+    .replace(/>\s+</gm, '><'),
   DEFAULT_AUTHOR_TEXT: 'Twitter',
 
   QUOTE_TEXT: `↘️ Quoting {name} (@{screen_name})`,

src/worker.ts

@@ -85,7 +85,11 @@ app.onError((err, c) => {
     errorCode = 504;
   }
   /* We return it as a 200 so embedded applications can display the error */
-  if (c.req.header('User-Agent')?.match(/(discordbot|telegrambot|facebook|whatsapp|firefox\/92|vkshare)/gi)) {
+  if (
+    c.req
+      .header('User-Agent')
+      ?.match(/(discordbot|telegrambot|facebook|whatsapp|firefox\/92|vkshare)/gi)
+  ) {
     errorCode = 200;
   }
   c.status(errorCode);
@@ -117,7 +121,11 @@ app.route(`/twitter`, twitter);
 app.all('/error', async c => {
   c.header('cache-control', noCache);
 
-  if (c.req.header('User-Agent')?.match(/(discordbot|telegrambot|facebook|whatsapp|firefox\/92|vkshare)/gi)) {
+  if (
+    c.req
+      .header('User-Agent')
+      ?.match(/(discordbot|telegrambot|facebook|whatsapp|firefox\/92|vkshare)/gi)
+  ) {
     c.status(200);
     return c.html(Strings.ERROR_HTML);
   }
@@ -140,18 +148,25 @@ export default {
         errorCode = 504;
       }
       /* We return it as a 200 so embedded applications can display the error */
-      if (request.headers.get('user-agent')?.match(/(discordbot|telegrambot|facebook|whatsapp|firefox\/92|vkshare)/gi)) {
+      if (
+        request.headers
+          .get('user-agent')
+          ?.match(/(discordbot|telegrambot|facebook|whatsapp|firefox\/92|vkshare)/gi)
+      ) {
         errorCode = 200;
       }
 
-      return new Response(e.name === 'AbortError' ? Strings.TIMEOUT_ERROR_HTML : Strings.ERROR_HTML, {
+      return new Response(
-        headers: {
+        e.name === 'AbortError' ? Strings.TIMEOUT_ERROR_HTML : Strings.ERROR_HTML,
-          ...Constants.RESPONSE_HEADERS,
+        {
-          'content-type': 'text/html;charset=utf-8',
+          headers: {
-          'cache-control': noCache
+            ...Constants.RESPONSE_HEADERS,
-        },
+            'content-type': 'text/html;charset=utf-8',
-        status: errorCode
+            'cache-control': noCache
-      });
+          },
+          status: errorCode
+        }
+      );
     }
   }
 };