Skip to content

Commit

Permalink
Merge pull request #2613 from mneunomne/master
Browse files Browse the repository at this point in the history
fix typo
  • Loading branch information
mneunomne authored Jan 21, 2025
2 parents 8339485 + 80f0a3a commit 83b7300
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion filters/adnauseam.txt
Original file line number Diff line number Diff line change
Expand Up @@ -908,4 +908,4 @@ bunkr.site##center:has(script[src^="//endowmentoverhangutmost"])
bunkr.site##center:has(script[src^="//bullionglidingscuttle"])

||bullionglidingscuttle.com^$script,important
||blurbreimbursetrombone.com^$script,important
||blurbreimbursetrombone.com^$script,important
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "3.24.3.1",
"version": "3.24.3.3",
"key": "ilkggpgmkemaniponkfgnkonpajankkm",
"author": "Daniel C. Howe",
"background": {
Expand Down
4 changes: 2 additions & 2 deletions src/js/resources/attribute.js
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ export function removeAttr(
.map(a => `${rawSelector}[${CSS.escape(a)}]`)
.join(',');
if ( safe.logLevel > 1 ) {
safe.adnLog(logPrefix, `Target selector:\n\t${selector}`);
safe.adnlog(logPrefix, `Target selector:\n\t${selector}`);
}
const asap = /\basap\b/.test(behavior);
let timerId;
Expand All @@ -256,7 +256,7 @@ export function removeAttr(
for ( const attr of tokens ) {
if ( node.hasAttribute(attr) === false ) { continue; }
node.removeAttribute(attr);
safe.adnLog(logPrefix, `Removed attribute '${attr}'`);
safe.adnlog(logPrefix, `Removed attribute '${attr}'`);
}
}
} catch(ex) {
Expand Down
4 changes: 2 additions & 2 deletions src/js/resources/cookie.js
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ export function setCookie(
);

if ( done ) {
safe.adnLog(logPrefix, 'Done');
safe.adnlog(logPrefix, 'Done');
}
}
registerScriptlet(setCookie, {
Expand Down Expand Up @@ -300,7 +300,7 @@ export function trustedSetCookie(
);

if ( done ) {
safe.adnLog(logPrefix, 'Done');
safe.adnlog(logPrefix, 'Done');
}
}
registerScriptlet(trustedSetCookie, {
Expand Down
2 changes: 1 addition & 1 deletion src/js/resources/href-sanitizer.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ function hrefSanitizer(
if ( hrefAfter === href ) { continue; }
elem.setAttribute('href', hrefAfter);
const count = sanitizeCopycats(href, hrefAfter);
safe.adnLog(logPrefix, `Sanitized ${count+1} links to\n${hrefAfter}`);
safe.adnlog(logPrefix, `Sanitized ${count+1} links to\n${hrefAfter}`);
}
return true;
};
Expand Down
8 changes: 4 additions & 4 deletions src/js/resources/localstorage.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,10 @@ export function removeCacheStorageItem(
if ( requestPattern === '' ) {
cacheStorage.delete(cacheName).then(result => {
if ( safe.logLevel > 1 ) {
safe.adnLog(logPrefix, `Deleting ${cacheName}`);
safe.adnlog(logPrefix, `Deleting ${cacheName}`);
}
if ( result !== true ) { return; }
safe.adnLog(logPrefix, `Deleted ${cacheName}: ${result}`);
safe.adnlog(logPrefix, `Deleted ${cacheName}: ${result}`);
});
continue;
}
Expand All @@ -144,11 +144,11 @@ export function removeCacheStorageItem(
for ( const request of requests ) {
if ( reRequest.test(request.url) === false ) { continue; }
if ( safe.logLevel > 1 ) {
safe.adnLog(logPrefix, `Deleting ${cacheName}/${request.url}`);
safe.adnlog(logPrefix, `Deleting ${cacheName}/${request.url}`);
}
cache.delete(request).then(result => {
if ( result !== true ) { return; }
safe.adnLog(logPrefix, `Deleted ${cacheName}/${request.url}: ${result}`);
safe.adnlog(logPrefix, `Deleted ${cacheName}/${request.url}: ${result}`);
});
}
});
Expand Down
12 changes: 6 additions & 6 deletions src/js/resources/prevent-settimeout.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,12 @@ export function preventSetTimeout(
: String(callArgs[0]);
const b = callArgs[1];
if ( needleRaw === '' && range.unbound() ) {
safe.adnLog(logPrefix, `Called:\n${a}\n${b}`);
safe.adnlog(logPrefix, `Called:\n${a}\n${b}`);
return context.reflect();
}
if ( reNeedle.test(a) !== needleNot && range.test(b) ) {
callArgs[0] = function(){};
safe.adnLog(logPrefix, `Prevented:\n${a}\n${b}`);
safe.adnlog(logPrefix, `Prevented:\n${a}\n${b}`);
}
return context.reflect();
});
Expand Down Expand Up @@ -163,12 +163,12 @@ export function preventSetInterval(
: String(callArgs[0]);
const b = callArgs[1];
if ( needleRaw === '' && range.unbound() ) {
safe.adnLog(logPrefix, `Called:\n${a}\n${b}`);
safe.adnlog(logPrefix, `Called:\n${a}\n${b}`);
return context.reflect();
}
if ( reNeedle.test(a) !== needleNot && range.test(b) ) {
callArgs[0] = function(){};
safe.adnLog(logPrefix, `Prevented:\n${a}\n${b}`);
safe.adnlog(logPrefix, `Prevented:\n${a}\n${b}`);
}
return context.reflect();
});
Expand Down Expand Up @@ -215,10 +215,10 @@ export function preventRequestAnimationFrame(
? String(safe.Function_toString(callArgs[0]))
: String(callArgs[0]);
if ( needleRaw === '' ) {
safe.adnLog(logPrefix, `Called:\n${a}`);
safe.adnlog(logPrefix, `Called:\n${a}`);
} else if ( reNeedle.test(a) !== needleNot ) {
callArgs[0] = function(){};
safe.adnLog(logPrefix, `Prevented:\n${a}`);
safe.adnlog(logPrefix, `Prevented:\n${a}`);
}
return context.reflect();
});
Expand Down
4 changes: 2 additions & 2 deletions src/js/resources/replace-argument.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export function trustedReplaceArgument(
};
proxyApplyFn(propChain, function(context) {
if ( argposRaw === '' ) {
safe.adnLog(logPrefix, `Arguments:\n${context.callArgs.join('\n')}`);
safe.adnlog(logPrefix, `Arguments:\n${context.callArgs.join('\n')}`);
return context.reflect();
}
const argBefore = getArg(context);
Expand All @@ -103,7 +103,7 @@ export function trustedReplaceArgument(
: value;
if ( argAfter !== argBefore ) {
setArg(context, argAfter);
safe.adnLog(logPrefix, `Replaced argument:\nBefore: ${JSON.stringify(argBefore)}\nAfter: ${argAfter}`);
safe.adnlog(logPrefix, `Replaced argument:\nBefore: ${JSON.stringify(argBefore)}\nAfter: ${argAfter}`);
}
return context.reflect();
});
Expand Down
2 changes: 1 addition & 1 deletion src/js/resources/scriptlets.js
Original file line number Diff line number Diff line change
Expand Up @@ -3361,7 +3361,7 @@ function trustedSuppressNativeMethod(
debugger; // eslint-disable-line no-debugger
return context.reflect();
}
safe.adnLog(logPrefix, `Suppressed:\n${callArgs.join('\n')}`);
safe.adnlog(logPrefix, `Suppressed:\n${callArgs.join('\n')}`);
if ( how === 'abort' ) {
throw new ReferenceError();
}
Expand Down
6 changes: 3 additions & 3 deletions src/js/resources/set-constant.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ export function setConstantFn(
(normalValue !== undefined && normalValue !== null) &&
(typeof v !== typeof normalValue);
if ( aborted ) {
safe.adnLog(logPrefix, `Aborted because value set to ${v}`);
safe.adnlog(logPrefix, `Aborted because value set to ${v}`);
}
return aborted;
};
Expand Down Expand Up @@ -176,7 +176,7 @@ export function setConstantFn(
handler.setter(a);
}
});
safe.adnLog(logPrefix, 'Trap installed');
safe.adnlog(logPrefix, 'Trap installed');
} catch(ex) {
safe.uboErr(logPrefix, ex);
}
Expand All @@ -195,7 +195,7 @@ export function setConstantFn(
if ( document.currentScript === thisScript ) {
return this.v;
}
safe.adnLog(logPrefix, 'Property read');
safe.adnlog(logPrefix, 'Property read');
return normalValue;
},
setter: function(a) {
Expand Down
2 changes: 1 addition & 1 deletion src/js/resources/spoof-css.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export function spoofCSS(
const shouldSpoof = propToValueMap.has(normalProp);
const value = shouldSpoof ? propToValueMap.get(normalProp) : real;
if ( shouldSpoof ) {
safe.adnLog(logPrefix, `Spoofing ${prop} to ${value}`);
safe.adnlog(logPrefix, `Spoofing ${prop} to ${value}`);
}
return value;
};
Expand Down

0 comments on commit 83b7300

Please sign in to comment.