Merge pull request #2518 from mneunomne/master

Fix minor bugs
dhowe · Mar 3, 2024 · bce9963 · bce9963
2 parents 8a3c830 + 43bc847
commit bce9963
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/filters/adnauseam.txt b/filters/adnauseam.txt
@@ -841,11 +841,6 @@ metro.co.uk##body.mol-fe-ab-dialog:style(overflow-y: auto !important;)
 # 1337x.to - fixing popups that can't be collected
 ||youradexchange.com^$important
 
-# youtube-ads-audible https://github.com/dhowe/AdNauseam/issues/2385
-youtube.com,youtubekids.com,youtube-nocookie.com##+js(trusted-replace-fetch-response, /\"adPlacements.*?\"\}\}\}\]\,/, , player?key=)
-youtube.com,youtubekids.com,youtube-nocookie.com##+js(trusted-replace-fetch-response, /\"adSlots.*?\}\]\}\}\]\,/, , player?key=)
-youtube.com,youtubekids.com,youtube-nocookie.com##+js(trusted-replace-fetch-response, /\"playerAds.*?\}\}\]\,/, , player?key=)
-
 # time-time.net https://github.com/dhowe/AdNauseam/issues/2432
 time-time.net##.info-ad-link
 

diff --git a/src/js/3p-filters.js b/src/js/3p-filters.js
@@ -674,7 +674,7 @@ const buttonUpdateAdNauseam = async function() {
      dom.cl.add(adnauseamEntry, 'obsolete');
      dom.cl.remove(adnauseamEntry, 'cached');
      setTimeout(function(){
-        messaging.send('dashboard', { what: 'forceUpdateAdnauseam' });
+        vAPI.messaging.send('dashboard', { what: 'forceUpdateAdnauseam' });
      },200);
 };
 

diff --git a/src/js/contentscript.js b/src/js/contentscript.js
@@ -1264,7 +1264,7 @@ const bootstrapPhaseAdn = function (response) {
     // check last time ran
     let now = Date.now()
     // run if its first time running or if the last time it ran was more than 1 sec ago
-    if (vAPI && lastRunBootstrapPhaseAdn === null || (lastRunBootstrapPhaseAdn && now - lastRunBootstrapPhaseAdn > intervalTime)) {
+    if (vAPI && (lastRunBootstrapPhaseAdn === null || (lastRunBootstrapPhaseAdn && now - lastRunBootstrapPhaseAdn > intervalTime))) {
         // avoid it running too many times;
         if (bootstrapPhaseAdnCounter >= maxTimesRunBootstrapPhaseAdn) {
             bootstrapAdnTimer.clear();

diff --git a/src/logger-ui.html b/src/logger-ui.html
@@ -64,7 +64,7 @@
                                 <span data-filtex="\x1F--\x1F|\x1F<<\x1F|\x1F##" data-i18n="loggerRowFiltererBuiltinBlocked"></span>
                                 <span data-filtex="\x1F\+\+\x1F|\x1F\*\*\x1F|\x1F#@#" data-i18n="loggerRowFiltererBuiltinAllowed"></span>
                                 <span data-filtex="[$,](?:csp|permissions|removeparam|redirect-rule|replace|urltransform)=|\x1F\<\<\x1F" data-i18n="loggerRowFiltererBuiltinModified"></span>
-                                <span data-filtex="\t~~">adn-<span style="pointer-events: none;" data-i18n="loggerRowFiltererBuiltinAllowed"></span> <!-- adnauseam allowed requests -->
+                                <span data-filtex="~~">adn-<span style="pointer-events: none;" data-i18n="loggerRowFiltererBuiltinAllowed"></span> <!-- adnauseam allowed requests -->
                             </div>
                             <div><span data-filtex="!" data-i18n="loggerRowFiltererBuiltinNot"></span>
                                 <span style="flex-direction: column;">