From 791a61240b86ccc08e8dfdffb7a913c6f5f30f90 Mon Sep 17 00:00:00 2001 From: SukkaW Date: Fri, 3 Jan 2025 19:39:49 +0000 Subject: [PATCH] deploy: https://github.com/SukkaW/Surge/commit/16ecf378a65e646883191dc21d23ef08127107b8 --- Internal/reject-adguardhome.txt | 2 +- Mock/amazon-adsystem-com_amazon-apstag.js | 8 ++++---- Mock/www-google-analytics-com_analytics.js | 10 +++++----- Mock/www-google-analytics-com_ga.js | 14 ++++++------- Mock/www-googlesyndication-com_adsbygoogle.js | 12 +++++------ Mock/www-googletagservices-com_gpt.js | 20 +++++++++---------- index.html | 2 +- 7 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Internal/reject-adguardhome.txt b/Internal/reject-adguardhome.txt index afcc56d79..4c65c1aba 100644 --- a/Internal/reject-adguardhome.txt +++ b/Internal/reject-adguardhome.txt @@ -1,5 +1,5 @@ ! Title: Sukka's Ruleset - Blocklist for AdGuardHome -! Last modified: Fri, 03 Jan 2025 19:34:55 GMT +! Last modified: Fri, 03 Jan 2025 19:39:29 GMT ! Expires: 6 hours ! License: https://github.com/SukkaW/Surge/blob/master/LICENSE ! Homepage: https://github.com/SukkaW/Surge diff --git a/Mock/amazon-adsystem-com_amazon-apstag.js b/Mock/amazon-adsystem-com_amazon-apstag.js index f1527a18b..83fb4fdc9 100644 --- a/Mock/amazon-adsystem-com_amazon-apstag.js +++ b/Mock/amazon-adsystem-com_amazon-apstag.js @@ -27,17 +27,17 @@ } try { var trace = console.trace.bind(console); - var label = "".concat(ADGUARD_PREFIX, " "); + var label = `${ADGUARD_PREFIX} `; if (source.engine === "corelibs") { label += source.ruleText; } else { if (source.domainName) { - label += "".concat(source.domainName); + label += `${source.domainName}`; } if (source.args) { - label += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join("', '"), "')"); + label += `#%#//scriptlet('${source.name}', '${source.args.join("', '")}')`; } else { - label += "#%#//scriptlet('".concat(source.name, "')"); + label += `#%#//scriptlet('${source.name}')`; } } if (trace) { diff --git a/Mock/www-google-analytics-com_analytics.js b/Mock/www-google-analytics-com_analytics.js index 2d8b5ac75..a3d0b52ee 100644 --- a/Mock/www-google-analytics-com_analytics.js +++ b/Mock/www-google-analytics-com_analytics.js @@ -52,7 +52,7 @@ queue.push = push; queue.forEach(push); } - var _window = window, dataLayer = _window.dataLayer, google_optimize = _window.google_optimize; + var {dataLayer: dataLayer, google_optimize: google_optimize} = window; if (dataLayer instanceof Object === false) { return; } @@ -98,17 +98,17 @@ } try { var trace = console.trace.bind(console); - var label = "".concat(ADGUARD_PREFIX, " "); + var label = `${ADGUARD_PREFIX} `; if (source.engine === "corelibs") { label += source.ruleText; } else { if (source.domainName) { - label += "".concat(source.domainName); + label += `${source.domainName}`; } if (source.args) { - label += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join("', '"), "')"); + label += `#%#//scriptlet('${source.name}', '${source.args.join("', '")}')`; } else { - label += "#%#//scriptlet('".concat(source.name, "')"); + label += `#%#//scriptlet('${source.name}')`; } } if (trace) { diff --git a/Mock/www-google-analytics-com_ga.js b/Mock/www-google-analytics-com_ga.js index 9122e40a3..9da84b4da 100644 --- a/Mock/www-google-analytics-com_ga.js +++ b/Mock/www-google-analytics-com_ga.js @@ -87,17 +87,17 @@ } try { var trace = console.trace.bind(console); - var label = "".concat(ADGUARD_PREFIX, " "); + var label = `${ADGUARD_PREFIX} `; if (source.engine === "corelibs") { label += source.ruleText; } else { if (source.domainName) { - label += "".concat(source.domainName); + label += `${source.domainName}`; } if (source.args) { - label += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join("', '"), "')"); + label += `#%#//scriptlet('${source.name}', '${source.args.join("', '")}')`; } else { - label += "#%#//scriptlet('".concat(source.name, "')"); + label += `#%#//scriptlet('${source.name}')`; } } if (trace) { @@ -112,16 +112,16 @@ function logMessage(source, message) { var forced = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false; var convertMessageToString = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true; - var name = source.name, verbose = source.verbose; + var {name: name, verbose: verbose} = source; if (!forced && !verbose) { return; } var nativeConsole = console.log; if (!convertMessageToString) { - nativeConsole("".concat(name, ":"), message); + nativeConsole(`${name}:`, message); return; } - nativeConsole("".concat(name, ": ").concat(message)); + nativeConsole(`${name}: ${message}`); } const updatedArgs = args ? [].concat(source).concat(args) : [ source ]; try { diff --git a/Mock/www-googlesyndication-com_adsbygoogle.js b/Mock/www-googlesyndication-com_adsbygoogle.js index 9fc5b3bc1..c33516cd7 100644 --- a/Mock/www-googlesyndication-com_adsbygoogle.js +++ b/Mock/www-googlesyndication-com_adsbygoogle.js @@ -42,13 +42,13 @@ if (!areIframesDefined) { adElems[i].setAttribute(statusAttrName, "done"); var aswiftIframe = document.createElement("iframe"); - aswiftIframe.id = "".concat(ASWIFT_IFRAME_MARKER).concat(i); + aswiftIframe.id = `${ASWIFT_IFRAME_MARKER}${i}`; aswiftIframe.style = css; adElems[i].appendChild(aswiftIframe); var innerAswiftIframe = document.createElement("iframe"); aswiftIframe.contentWindow.document.body.appendChild(innerAswiftIframe); var googleadsIframe = document.createElement("iframe"); - googleadsIframe.id = "".concat(GOOGLE_ADS_IFRAME_MARKER).concat(i); + googleadsIframe.id = `${GOOGLE_ADS_IFRAME_MARKER}${i}`; googleadsIframe.style = css; adElems[i].appendChild(googleadsIframe); var innerGoogleadsIframe = document.createElement("iframe"); @@ -67,17 +67,17 @@ } try { var trace = console.trace.bind(console); - var label = "".concat(ADGUARD_PREFIX, " "); + var label = `${ADGUARD_PREFIX} `; if (source.engine === "corelibs") { label += source.ruleText; } else { if (source.domainName) { - label += "".concat(source.domainName); + label += `${source.domainName}`; } if (source.args) { - label += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join("', '"), "')"); + label += `#%#//scriptlet('${source.name}', '${source.args.join("', '")}')`; } else { - label += "#%#//scriptlet('".concat(source.name, "')"); + label += `#%#//scriptlet('${source.name}')`; } } if (trace) { diff --git a/Mock/www-googletagservices-com_gpt.js b/Mock/www-googletagservices-com_gpt.js index 93478497e..83f25a3a8 100644 --- a/Mock/www-googletagservices-com_gpt.js +++ b/Mock/www-googletagservices-com_gpt.js @@ -51,8 +51,8 @@ }; var recreateIframeForSlot = function recreateIframeForSlot(slot) { var _document$getElementB; - var eid = "google_ads_iframe_".concat(slot.getId()); - (_document$getElementB = document.getElementById(eid)) === null || _document$getElementB === void 0 ? void 0 : _document$getElementB.remove(); + var eid = `google_ads_iframe_${slot.getId()}`; + (_document$getElementB = document.getElementById(eid)) === null || _document$getElementB === void 0 || _document$getElementB.remove(); var node = document.getElementById(slot.getSlotElementId()); if (node) { var f = document.createElement("iframe"); @@ -131,7 +131,7 @@ var defineSlot = function defineSlot(adUnitPath, creatives, optDiv) { if (slotsById.has(optDiv)) { var _document$getElementB2; - (_document$getElementB2 = document.getElementById(optDiv)) === null || _document$getElementB2 === void 0 ? void 0 : _document$getElementB2.remove(); + (_document$getElementB2 = document.getElementById(optDiv)) === null || _document$getElementB2 === void 0 || _document$getElementB2.remove(); return slotsById.get(optDiv); } var attributes = new Map; @@ -154,7 +154,7 @@ } ]; var num = (slotsPerPath.get(adUnitPath) || 0) + 1; slotsPerPath.set(adUnitPath, num); - var id = "".concat(adUnitPath, "_").concat(num); + var id = `${adUnitPath}_${num}`; var clickUrl = ""; var collapseEmptyDiv = null; var services = new Set; @@ -328,8 +328,8 @@ setVideoContent: noopThis, updateCorrelator: noopFunc }; - var _window = window, _window$googletag = _window.googletag, googletag = _window$googletag === void 0 ? {} : _window$googletag; - var _googletag$cmd = googletag.cmd, cmd = _googletag$cmd === void 0 ? [] : _googletag$cmd; + var {googletag: googletag = {}} = window; + var {cmd: cmd = []} = googletag; googletag.apiReady = true; googletag.cmd = []; googletag.cmd.push = function(a) { @@ -385,17 +385,17 @@ } try { var trace = console.trace.bind(console); - var label = "".concat(ADGUARD_PREFIX, " "); + var label = `${ADGUARD_PREFIX} `; if (source.engine === "corelibs") { label += source.ruleText; } else { if (source.domainName) { - label += "".concat(source.domainName); + label += `${source.domainName}`; } if (source.args) { - label += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join("', '"), "')"); + label += `#%#//scriptlet('${source.name}', '${source.args.join("', '")}')`; } else { - label += "#%#//scriptlet('".concat(source.name, "')"); + label += `#%#//scriptlet('${source.name}')`; } } if (trace) { diff --git a/index.html b/index.html index 5fe8a3071..f13784447 100644 --- a/index.html +++ b/index.html @@ -29,7 +29,7 @@

Made by Sukka | Source @ GitHub | Licensed under AGPL-3.0

-

Last Build: 2025-01-03T19:34:56.027Z

+

Last Build: 2025-01-03T19:39:30.012Z