This commit is contained in:
SukkaW
2025-01-03 19:39:49 +00:00
parent 4b812e8d6c
commit 791a61240b
7 changed files with 34 additions and 34 deletions

View File

@@ -1,5 +1,5 @@
! Title: Sukka's Ruleset - Blocklist for AdGuardHome ! 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 ! Expires: 6 hours
! License: https://github.com/SukkaW/Surge/blob/master/LICENSE ! License: https://github.com/SukkaW/Surge/blob/master/LICENSE
! Homepage: https://github.com/SukkaW/Surge ! Homepage: https://github.com/SukkaW/Surge

View File

@@ -27,17 +27,17 @@
} }
try { try {
var trace = console.trace.bind(console); var trace = console.trace.bind(console);
var label = "".concat(ADGUARD_PREFIX, " "); var label = `${ADGUARD_PREFIX} `;
if (source.engine === "corelibs") { if (source.engine === "corelibs") {
label += source.ruleText; label += source.ruleText;
} else { } else {
if (source.domainName) { if (source.domainName) {
label += "".concat(source.domainName); label += `${source.domainName}`;
} }
if (source.args) { if (source.args) {
label += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join("', '"), "')"); label += `#%#//scriptlet('${source.name}', '${source.args.join("', '")}')`;
} else { } else {
label += "#%#//scriptlet('".concat(source.name, "')"); label += `#%#//scriptlet('${source.name}')`;
} }
} }
if (trace) { if (trace) {

View File

@@ -52,7 +52,7 @@
queue.push = push; queue.push = push;
queue.forEach(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) { if (dataLayer instanceof Object === false) {
return; return;
} }
@@ -98,17 +98,17 @@
} }
try { try {
var trace = console.trace.bind(console); var trace = console.trace.bind(console);
var label = "".concat(ADGUARD_PREFIX, " "); var label = `${ADGUARD_PREFIX} `;
if (source.engine === "corelibs") { if (source.engine === "corelibs") {
label += source.ruleText; label += source.ruleText;
} else { } else {
if (source.domainName) { if (source.domainName) {
label += "".concat(source.domainName); label += `${source.domainName}`;
} }
if (source.args) { if (source.args) {
label += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join("', '"), "')"); label += `#%#//scriptlet('${source.name}', '${source.args.join("', '")}')`;
} else { } else {
label += "#%#//scriptlet('".concat(source.name, "')"); label += `#%#//scriptlet('${source.name}')`;
} }
} }
if (trace) { if (trace) {

View File

@@ -87,17 +87,17 @@
} }
try { try {
var trace = console.trace.bind(console); var trace = console.trace.bind(console);
var label = "".concat(ADGUARD_PREFIX, " "); var label = `${ADGUARD_PREFIX} `;
if (source.engine === "corelibs") { if (source.engine === "corelibs") {
label += source.ruleText; label += source.ruleText;
} else { } else {
if (source.domainName) { if (source.domainName) {
label += "".concat(source.domainName); label += `${source.domainName}`;
} }
if (source.args) { if (source.args) {
label += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join("', '"), "')"); label += `#%#//scriptlet('${source.name}', '${source.args.join("', '")}')`;
} else { } else {
label += "#%#//scriptlet('".concat(source.name, "')"); label += `#%#//scriptlet('${source.name}')`;
} }
} }
if (trace) { if (trace) {
@@ -112,16 +112,16 @@
function logMessage(source, message) { function logMessage(source, message) {
var forced = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false; var forced = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
var convertMessageToString = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true; 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) { if (!forced && !verbose) {
return; return;
} }
var nativeConsole = console.log; var nativeConsole = console.log;
if (!convertMessageToString) { if (!convertMessageToString) {
nativeConsole("".concat(name, ":"), message); nativeConsole(`${name}:`, message);
return; return;
} }
nativeConsole("".concat(name, ": ").concat(message)); nativeConsole(`${name}: ${message}`);
} }
const updatedArgs = args ? [].concat(source).concat(args) : [ source ]; const updatedArgs = args ? [].concat(source).concat(args) : [ source ];
try { try {

View File

@@ -42,13 +42,13 @@
if (!areIframesDefined) { if (!areIframesDefined) {
adElems[i].setAttribute(statusAttrName, "done"); adElems[i].setAttribute(statusAttrName, "done");
var aswiftIframe = document.createElement("iframe"); var aswiftIframe = document.createElement("iframe");
aswiftIframe.id = "".concat(ASWIFT_IFRAME_MARKER).concat(i); aswiftIframe.id = `${ASWIFT_IFRAME_MARKER}${i}`;
aswiftIframe.style = css; aswiftIframe.style = css;
adElems[i].appendChild(aswiftIframe); adElems[i].appendChild(aswiftIframe);
var innerAswiftIframe = document.createElement("iframe"); var innerAswiftIframe = document.createElement("iframe");
aswiftIframe.contentWindow.document.body.appendChild(innerAswiftIframe); aswiftIframe.contentWindow.document.body.appendChild(innerAswiftIframe);
var googleadsIframe = document.createElement("iframe"); var googleadsIframe = document.createElement("iframe");
googleadsIframe.id = "".concat(GOOGLE_ADS_IFRAME_MARKER).concat(i); googleadsIframe.id = `${GOOGLE_ADS_IFRAME_MARKER}${i}`;
googleadsIframe.style = css; googleadsIframe.style = css;
adElems[i].appendChild(googleadsIframe); adElems[i].appendChild(googleadsIframe);
var innerGoogleadsIframe = document.createElement("iframe"); var innerGoogleadsIframe = document.createElement("iframe");
@@ -67,17 +67,17 @@
} }
try { try {
var trace = console.trace.bind(console); var trace = console.trace.bind(console);
var label = "".concat(ADGUARD_PREFIX, " "); var label = `${ADGUARD_PREFIX} `;
if (source.engine === "corelibs") { if (source.engine === "corelibs") {
label += source.ruleText; label += source.ruleText;
} else { } else {
if (source.domainName) { if (source.domainName) {
label += "".concat(source.domainName); label += `${source.domainName}`;
} }
if (source.args) { if (source.args) {
label += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join("', '"), "')"); label += `#%#//scriptlet('${source.name}', '${source.args.join("', '")}')`;
} else { } else {
label += "#%#//scriptlet('".concat(source.name, "')"); label += `#%#//scriptlet('${source.name}')`;
} }
} }
if (trace) { if (trace) {

View File

@@ -51,8 +51,8 @@
}; };
var recreateIframeForSlot = function recreateIframeForSlot(slot) { var recreateIframeForSlot = function recreateIframeForSlot(slot) {
var _document$getElementB; var _document$getElementB;
var eid = "google_ads_iframe_".concat(slot.getId()); var eid = `google_ads_iframe_${slot.getId()}`;
(_document$getElementB = document.getElementById(eid)) === null || _document$getElementB === void 0 ? void 0 : _document$getElementB.remove(); (_document$getElementB = document.getElementById(eid)) === null || _document$getElementB === void 0 || _document$getElementB.remove();
var node = document.getElementById(slot.getSlotElementId()); var node = document.getElementById(slot.getSlotElementId());
if (node) { if (node) {
var f = document.createElement("iframe"); var f = document.createElement("iframe");
@@ -131,7 +131,7 @@
var defineSlot = function defineSlot(adUnitPath, creatives, optDiv) { var defineSlot = function defineSlot(adUnitPath, creatives, optDiv) {
if (slotsById.has(optDiv)) { if (slotsById.has(optDiv)) {
var _document$getElementB2; 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); return slotsById.get(optDiv);
} }
var attributes = new Map; var attributes = new Map;
@@ -154,7 +154,7 @@
} ]; } ];
var num = (slotsPerPath.get(adUnitPath) || 0) + 1; var num = (slotsPerPath.get(adUnitPath) || 0) + 1;
slotsPerPath.set(adUnitPath, num); slotsPerPath.set(adUnitPath, num);
var id = "".concat(adUnitPath, "_").concat(num); var id = `${adUnitPath}_${num}`;
var clickUrl = ""; var clickUrl = "";
var collapseEmptyDiv = null; var collapseEmptyDiv = null;
var services = new Set; var services = new Set;
@@ -328,8 +328,8 @@
setVideoContent: noopThis, setVideoContent: noopThis,
updateCorrelator: noopFunc updateCorrelator: noopFunc
}; };
var _window = window, _window$googletag = _window.googletag, googletag = _window$googletag === void 0 ? {} : _window$googletag; var {googletag: googletag = {}} = window;
var _googletag$cmd = googletag.cmd, cmd = _googletag$cmd === void 0 ? [] : _googletag$cmd; var {cmd: cmd = []} = googletag;
googletag.apiReady = true; googletag.apiReady = true;
googletag.cmd = []; googletag.cmd = [];
googletag.cmd.push = function(a) { googletag.cmd.push = function(a) {
@@ -385,17 +385,17 @@
} }
try { try {
var trace = console.trace.bind(console); var trace = console.trace.bind(console);
var label = "".concat(ADGUARD_PREFIX, " "); var label = `${ADGUARD_PREFIX} `;
if (source.engine === "corelibs") { if (source.engine === "corelibs") {
label += source.ruleText; label += source.ruleText;
} else { } else {
if (source.domainName) { if (source.domainName) {
label += "".concat(source.domainName); label += `${source.domainName}`;
} }
if (source.args) { if (source.args) {
label += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join("', '"), "')"); label += `#%#//scriptlet('${source.name}', '${source.args.join("', '")}')`;
} else { } else {
label += "#%#//scriptlet('".concat(source.name, "')"); label += `#%#//scriptlet('${source.name}')`;
} }
} }
if (trace) { if (trace) {

View File

@@ -29,7 +29,7 @@
<p> <p>
Made by <a href="https://skk.moe">Sukka</a> | <a href="https://github.com/SukkaW/Surge/">Source @ GitHub</a> | Licensed under <a href="/LICENSE" target="_blank">AGPL-3.0</a> Made by <a href="https://skk.moe">Sukka</a> | <a href="https://github.com/SukkaW/Surge/">Source @ GitHub</a> | Licensed under <a href="/LICENSE" target="_blank">AGPL-3.0</a>
</p> </p>
<p>Last Build: 2025-01-03T19:34:56.027Z</p> <p>Last Build: 2025-01-03T19:39:30.012Z</p>
<br> <br>
<ul class="directory-list"> <ul class="directory-list">