From ad7703e7c4ec756c27edfbca059b1585e780b2ee Mon Sep 17 00:00:00 2001
From: Kenneth Hendricks <50819541+kenhendricks00@users.noreply.github.com>
Date: Mon, 21 Oct 2024 23:30:50 -0400
Subject: [PATCH] Update background.js

---
 platform/chromium/js/background.js | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/platform/chromium/js/background.js b/platform/chromium/js/background.js
index b114fef..5997a7d 100644
--- a/platform/chromium/js/background.js
+++ b/platform/chromium/js/background.js
@@ -169,18 +169,20 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
     console.log("Checking site status for:", currentUrl);
 
     let isStarred = starredSites.some(
-      (site) => rootUrl === extractRootUrl(site)
+      (site) =>
+        normalizeUrl(site) === rootUrl || normalizeUrl(site) === currentUrl
+    );
+    let isSafe = safeSites.some(
+      (site) =>
+        normalizeUrl(site) === rootUrl || normalizeUrl(site) === currentUrl
     );
-    let isSafe = safeSites.some((site) => rootUrl === extractRootUrl(site));
     let isUnsafe = unsafeSites.some(
       (site) =>
-        currentUrl.includes(normalizeUrl(site)) ||
-        rootUrl.includes(normalizeUrl(site))
+        normalizeUrl(site) === rootUrl || normalizeUrl(site) === currentUrl
     );
     let isPotentiallyUnsafe = potentiallyUnsafeSites.some(
       (site) =>
-        currentUrl.includes(normalizeUrl(site)) ||
-        rootUrl.includes(normalizeUrl(site))
+        normalizeUrl(site) === rootUrl || normalizeUrl(site) === currentUrl
     );
 
     // Return appropriate status to the popup
@@ -218,23 +220,23 @@ function checkSiteAndUpdatePageAction(tabId, url) {
 
   // Check if the site is starred, safe, unsafe, or potentially unsafe
   let isStarred = starredSites.some(
-    (site) => rootUrl === extractRootUrl(site) // Root URL check
+    (site) =>
+      normalizeUrl(site) === rootUrl || normalizeUrl(site) === currentUrl
   );
 
   let isSafe = safeSites.some(
-    (site) => rootUrl === extractRootUrl(site) // Root URL check
+    (site) =>
+      normalizeUrl(site) === rootUrl || normalizeUrl(site) === currentUrl
   );
 
   let isUnsafe = unsafeSites.some(
     (site) =>
-      currentUrl.includes(normalizeUrl(site)) ||
-      rootUrl.includes(normalizeUrl(site)) // Match either current URL or root
+      normalizeUrl(site) === rootUrl || normalizeUrl(site) === currentUrl
   );
 
   let isPotentiallyUnsafe = potentiallyUnsafeSites.some(
     (site) =>
-      currentUrl.includes(normalizeUrl(site)) ||
-      rootUrl.includes(normalizeUrl(site)) // Match either current URL or root
+      normalizeUrl(site) === rootUrl || normalizeUrl(site) === currentUrl
   );
 
   // Prioritize starred sites first, then safe sites