From 4b98e36caaf6d5a6cb5a59b74ba4f2b3b7d5838a Mon Sep 17 00:00:00 2001
From: greyguy21 <e0559779@u.nus.edu>
Date: Tue, 21 Nov 2023 17:10:28 +0800
Subject: [PATCH] Modify condition to check for pages with meta refresh

---
 constants/common.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/constants/common.js b/constants/common.js
index 3c6ca862..50babdd3 100644
--- a/constants/common.js
+++ b/constants/common.js
@@ -269,15 +269,17 @@ const requestToUrl = async (url, isNewCustomFlow) => {
       const redirectUrl = response.request.res.responseUrl;
       res.status = constants.urlCheckStatuses.success.code;
 
-      if (redirectUrl != null && !isNewCustomFlow) {
-        res.url = redirectUrl;
-      } else {
-        res.url = url;
-      }
-      
       let modifiedHTML = response.data.replace(/<noscript>[\s\S]*?<\/noscript>/gi, '');
       const metaRefreshMatch = /<meta\s+http-equiv="refresh"\s+content="(?:\d+;)?([^"]*)"/i.exec(modifiedHTML);
-      if (metaRefreshMatch && metaRefreshMatch[1]) {
+      const hasMetaRefresh = metaRefreshMatch && metaRefreshMatch[1];
+
+      if (redirectUrl != null && (hasMetaRefresh || !isNewCustomFlow)) {
+        res.url = redirectUrl; 
+      } else {
+        res.url = url; 
+      }
+
+      if (hasMetaRefresh) {
         const urlOrRelativePath = metaRefreshMatch[1];
         if (urlOrRelativePath.includes('URL=')) {
           res.url = urlOrRelativePath.split('URL=').pop();