fix check blacklist/whitelist

Author: HoangTran0410

popup/helpers/modal.js

@@ -19,7 +19,12 @@ function initModal() {
 
 export function openModal(title, body) {
   modalTitle.innerHTML = title;
-  modalBody.innerHTML = body;
+  if (typeof body === "string") {
+    modalBody.innerHTML = body;
+  } else if (typeof body === "object" && nodeName in body) {
+    modalBody.innerHTML = "";
+    modalBody.appendChild(body);
+  }
   modal.style.display = "block";
 }
 

popup/helpers/scriptHelpers.js

@@ -2,26 +2,28 @@ import { allScripts } from "../../scripts/index.js";
 import { getCurrentURL } from "./utils.js";
 
 export async function getAvailableScripts() {
-  let hostname = (await getCurrentURL()).hostname;
+  let url = await getCurrentURL();
   let avai = [];
   for (let script of Object.values(allScripts)) {
-    if (await checkBlackWhiteList(script, hostname)) {
+    if (await checkBlackWhiteList(script, url)) {
       avai.push(script);
     }
   }
 
   return avai;
 }
 
-export async function checkBlackWhiteList(script, hostname = null) {
-  if (!hostname) {
-    hostname = (await getCurrentURL()).hostname;
+export async function checkBlackWhiteList(script, url = null) {
+  if (!url) {
+    url = await getCurrentURL();
   }
 
-  let hasWhiteList = script.whiteList?.length > 0;
-  let hasBlackList = script.blackList?.length > 0;
-  let inWhiteList = script.whiteList?.findIndex((_) => _ === hostname) >= 0;
-  let inBlackList = script.blackList?.findIndex((_) => _ === hostname) >= 0;
+  let w = script.whiteList,
+    b = script.blackList,
+    hasWhiteList = w?.length > 0,
+    hasBlackList = b?.length > 0,
+    inWhiteList = w?.findIndex((_) => isUrlMatchPattern(url, _)) >= 0,
+    inBlackList = b?.findIndex((_) => isUrlMatchPattern(url, _)) >= 0;
 
   let willRun =
     (!hasWhiteList && !hasBlackList) ||
@@ -30,3 +32,16 @@ export async function checkBlackWhiteList(script, hostname = null) {
 
   return willRun;
 }
+
+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;
+}

popup/helpers/utils.js

@@ -42,8 +42,7 @@ export const openUrlAndRunScript = async (url, func) => {
 
 export async function getCurrentURL() {
   let tabs = await chrome.tabs.query({ active: true, currentWindow: true });
-  let url = tabs[0].url;
-  return new URL(url);
+  return tabs[0].url;
 }
 
 export function viewScriptSource(script) {

popup/index.js

@@ -241,19 +241,21 @@ async function runScript(script) {
     recentScriptsSaver.add(script);
     runScriptInCurrentTab(script.func);
   } else {
-    const { whiteList: w, blackList: b } = script;
+    let w = script.whiteList?.join(", ");
+    let b = script.blackList?.join(", ");
+
     openModal(
       t({
         en: `Script not supported in current website`,
         vi: `Script không hỗ trợ website hiện tại`,
       }),
       t({
         en:
-          `${w?.length ? `+ Only run at:  ${w?.join(", ")}` : ""}\n` +
-          `${b?.length ? `+ Not run at:  ${b?.join(", ")}` : ""}`,
+          `${w ? `+ Only run at:  ${w}` : ""}\n` +
+          `${b ? `+ Not run at:  ${b}` : ""}`,
         vi:
-          `${w?.length ? `+ Chỉ chạy tại:  ${w?.join(", ")}` : ""}\n` +
-          `${b?.length ? `+ Không chạy tại:  ${b?.join(", ")}` : ""}`,
+          `${w ? `+ Chỉ chạy tại:  ${w}` : ""}\n` +
+          `${b ? `+ Không chạy tại:  ${b}` : ""}`,
       })
     );
   }

scripts/doutube_getAllVideoInUserProfile.js

@@ -8,7 +8,7 @@ export default {
     vi: "Tải tất cả video từ profile của user doutu.be bất kỳ",
   },
   blackList: [],
-  whiteList: ["doutu.be"],
+  whiteList: ["*://doutu.be"],
 
   func: async function () {
     const WAIT_FOR_FULL_VIDEO_LOADED = 5000;

scripts/download_video.js

@@ -8,7 +8,7 @@ export default {
     en: "Can be used on almost any website",
     vi: "Dùng được cho gần như tất cả trang web",
   },
-  blackList: ["www.youtube.com"],
+  blackList: ["*://*.youtube.com"],
   whiteList: [],
 
   func: function () {

scripts/fb_downloadAlbumMedia.js

@@ -8,7 +8,7 @@ export default {
     vi: "Tải về danh sách link ảnh/video",
   },
   blackList: [],
-  whiteList: ["www.facebook.com"],
+  whiteList: ["*://www.facebook.com"],
 
   func: function () {
     const accessToken = prompt("Enter access token:", "");

scripts/fb_downloadCurrentVideo.js

@@ -8,7 +8,7 @@ export default {
     vi: "Lấy link để tải video đang xem",
   },
   blackList: [],
-  whiteList: ["www.facebook.com"],
+  whiteList: ["*://www.facebook.com"],
 
   func: function () {
     // Tải video đang xem - khi đang trong trang web video, dạng: https://www.facebook.com/watch?v=254222479732213

scripts/fb_getAlbumId.js

@@ -9,7 +9,7 @@ export default {
     vi: "Lấy id của album trong trang web hiện tại",
   },
   blackList: [],
-  whiteList: ["www.facebook.com"],
+  whiteList: ["*://www.facebook.com"],
 
   func: function () {
     // Lấy album id - khi đang xem 1 album, ví dụ https://www.facebook.com/media/set/?vanity=ColourfulSpace&set=a.945632905514659

scripts/fb_getAllAlbumId.js

@@ -8,7 +8,7 @@ export default {
     vi: "Lấy tất cả album id có trong trang web",
   },
   blackList: [],
-  whiteList: ["www.facebook.com"],
+  whiteList: ["*://www.facebook.com"],
 
   func: function () {
     // Lấy tất cả album id có trong trang web - Khi đang xem 1 danh sách album của user/group/page