urlpattern

Author: hoang.tran12

scripts/fb_toggleNewFeed.js

@@ -33,18 +33,13 @@ export default {
 };
 
 export const shared = {
-  toggleNewFeed: async function (willShow, tabId) {
-    runScriptInTab({
-      tabId: tabId || (await getCurrentTab()).id,
-      args: [willShow],
-      func: (value) => {
-        let div = document.querySelector("#ssrb_feed_end")?.parentElement;
-        if (!div) alert("Không tìm thấy NewFeed.");
-        else {
-          div.style.display =
-            value ?? div.style.display === "none" ? "block" : "none";
-        }
-      },
-    });
+  toggleNewFeed: async function (willShow) {
+    let div = document.querySelector("#ssrb_feed_end")?.parentElement;
+    if (!div) alert("Không tìm thấy NewFeed.");
+    else if (willShow != null) {
+      div.style.display = willShow ? "block" : "none";
+    } else {
+      div.style.display = div.style.display === "none" ? "block" : "none";
+    }
   },
 };

scripts/helpers/utils.js

@@ -162,15 +162,21 @@ export function checkBlackWhiteList(script, url) {
   return willRun;
 }
 
+// https://developer.mozilla.org/en-US/docs/Web/API/URL_Pattern_API
 export function isUrlMatchPattern(url, pattern) {
-  let curIndex = 0,
-    visiblePartsInPattern = pattern.split("*").filter((_) => _ !== "");
-  for (let p of visiblePartsInPattern) {
-    let index = url.indexOf(p, curIndex);
-    if (index < 0) return false;
-    curIndex = index + p.length;
-  }
-  return true;
+  return new URLPattern(pattern).test(url);
+
+  // if (pattern.indexOf("*") < 0)
+  //   return new URL(url).toString() == new URL(pattern).toString();
+
+  // let curIndex = 0,
+  //   visiblePartsInPattern = pattern.split("*").filter((_) => _ !== "");
+  // for (let p of visiblePartsInPattern) {
+  //   let index = url.indexOf(p, curIndex);
+  //   if (index < 0) return false;
+  //   curIndex = index + p.length;
+  // }
+  // return true;
 }
 
 // https://stackoverflow.com/a/68634884/11898496