prehistoric-systems/FMHY-SafeGuard
1
0
Fork 0
mirror of https://github.com/fmhy/FMHY-SafeGuard.git synced 2026-03-11 08:55:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update background.js

Browse source
This commit is contained in:
Kenneth Hendricks 2024-10-21 23:30:50 -04:00 committed by GitHub
parent 78c02c0a35
commit ad7703e7c4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
platform/chromium/js/background.js
View file

@ -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