From 6c24ba323d0477832d99ce1fd268dabd06a19d95 Mon Sep 17 00:00:00 2001 From: Brian <18603393+brian6932@users.noreply.github.com> Date: Thu, 12 Mar 2026 17:53:00 -0400 Subject: [PATCH] fix: disableTwimg fixes #1026 --- src/assets/javascripts/services.js | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js index f2d06ed6..07bd9a67 100644 --- a/src/assets/javascripts/services.js +++ b/src/assets/javascripts/services.js @@ -35,24 +35,21 @@ function all(service, frontend, options, config) { * @param {string} frontend */ function regexArray(service, url, config, options, frontend) { - let targetList = config.services[service].targets + const targetList = new Set(config.services[service].targets) if (frontend) { if ( "excludeTargets" in config.services[service].frontends[frontend] && (service !== "search" || !options["search"].redirectGoogle) ) { - targetList = targetList.filter( - val => !config.services[service].frontends[frontend].excludeTargets.includes(targetList.indexOf(val)) - ) - } - if (service === "twitter" && options["twitter"].disableTwimg) { - targetList = targetList.splice(2) + for (const target of config.services[service].frontends[frontend].excludeTargets) + targetList.delete(target) } + if (service === "twitter" && options["twitter"].disableTwimg) + targetList.delete(String.raw`^https?:\/{2}(pbs\.|video\.)twimg\.com\/`) } - for (const targetString in targetList) { - const target = new RegExp(targetList[targetString]) - if (target.test(url.href)) return true - } + for (const target of targetList) + if (new RegExp(target).test(url.href)) + return true return false }