From d57136bf8fb60eb51c0b2dae1394d1a68e1796c7 Mon Sep 17 00:00:00 2001
From: dangered wolf <d@ngeredwolf.me>
Date: Tue, 16 Aug 2022 16:02:22 -0400
Subject: [PATCH] Consistency in id handling

---
 src/server.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/server.ts b/src/server.ts
index 9011100..7b6a530 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -22,7 +22,7 @@ const statusRequest = async (
     ) !== null;
 
   if (
-    url.pathname.match(/\/status(es)?\/\d+\.(mp4|png|jpg)/g) !== null ||
+    url.pathname.match(/\/status(es)?\/\d{2,20}\.(mp4|png|jpg)/g) !== null ||
     Constants.DIRECT_MEDIA_DOMAINS.includes(url.hostname) ||
     prefix === 'dl' ||
     prefix === 'dir'
@@ -40,7 +40,7 @@ const statusRequest = async (
   }
 
   if (
-    url.pathname.match(/\/status(es)?\/\d+\.(json)/g) !== null ||
+    url.pathname.match(/\/status(es)?\/\d{2,20}\.(json)/g) !== null ||
     Constants.API_HOST_LIST.includes(url.hostname)
   ) {
     console.log('JSON API request');
@@ -84,7 +84,7 @@ const statusRequest = async (
     return response;
   } else {
     console.log('Matched human UA', userAgent);
-    return Response.redirect(`${Constants.TWITTER_ROOT}/${handle}/status/${id}`, 302);
+    return Response.redirect(`${Constants.TWITTER_ROOT}/${handle}/status/${id?.match(/\d{2,20}/)?.[0]}`, 302);
   }
 };