Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make `queryprune` an exact alias of `removeparam` 

As per agreed upon discussion, `queryprune` now follows
exactly the syntax of AdGuard's `removeparam`.

Related discussion:
- https://github.com/uBlockOrigin/uBlock-issues/issues/1356

Related issue:
- https://github.com/uBlockOrigin/uBlock-issues/issues/760

For the short term, `queryprune` will still interpret a
leading `|` to mean "anchor to start of name", until no
such filters are present in uBO's own filter lists.
This commit is contained in:
Raymond Hill 2020-11-30 12:52:37 -05:00
parent 391a5c99c7
commit e08f8cb001
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/js/static-filtering-parser.js
View File

@ -1164,7 +1164,7 @@ const Parser = class {
static parseQueryPruneValue(arg) { static parseQueryPruneValue(arg) {
let s = arg.trim(); let s = arg.trim();
if ( s === '*' ) { return { all: true }; } if ( s === '' ) { return { all: true }; }
const out = { }; const out = { };
out.not = s.charCodeAt(0) === 0x7E /* '~' */; out.not = s.charCodeAt(0) === 0x7E /* '~' */;
if ( out.not ) { if ( out.not ) {
@ -2017,7 +2017,8 @@ const OPTBlockOnly = 1 << 9;
const OPTAllowOnly = 1 << 10; const OPTAllowOnly = 1 << 10;
const OPTMustAssign = 1 << 11; const OPTMustAssign = 1 << 11;
const OPTAllowMayAssign = 1 << 12; const OPTAllowMayAssign = 1 << 12;
const OPTDomainList = 1 << 13; const OPTMayAssign = 1 << 13;
const OPTDomainList = 1 << 14;
//const OPTGlobalMask = 0x0fff0000; //const OPTGlobalMask = 0x0fff0000;
const OPTNetworkType = 1 << 16; const OPTNetworkType = 1 << 16;
@ -2166,8 +2167,8 @@ const netOptionTokenDescriptors = new Map([
[ 'beacon', OPTTokenPing | OPTCanNegate | OPTNetworkType | OPTModifiableType | OPTNonCspableType | OPTNonRedirectableType ], [ 'beacon', OPTTokenPing | OPTCanNegate | OPTNetworkType | OPTModifiableType | OPTNonCspableType | OPTNonRedirectableType ],
[ 'popunder', OPTTokenPopunder | OPTNonNetworkType | OPTNonCspableType | OPTNonRedirectableType ], [ 'popunder', OPTTokenPopunder | OPTNonNetworkType | OPTNonCspableType | OPTNonRedirectableType ],
[ 'popup', OPTTokenPopup | OPTNonNetworkType | OPTCanNegate | OPTNonCspableType | OPTNonRedirectableType ], [ 'popup', OPTTokenPopup | OPTNonNetworkType | OPTCanNegate | OPTNonCspableType | OPTNonRedirectableType ],
[ 'queryprune', OPTTokenQueryprune | OPTMustAssign | OPTAllowMayAssign | OPTModifierType | OPTNonCspableType | OPTNonRedirectableType ], [ 'queryprune', OPTTokenQueryprune | OPTMayAssign | OPTModifierType | OPTNonCspableType | OPTNonRedirectableType ],
[ 'removeparam', OPTTokenQueryprune | OPTMustAssign | OPTAllowMayAssign | OPTModifierType | OPTNonCspableType | OPTNonRedirectableType ], [ 'removeparam', OPTTokenQueryprune | OPTMayAssign | OPTModifierType | OPTNonCspableType | OPTNonRedirectableType ],
[ 'redirect', OPTTokenRedirect | OPTMustAssign | OPTAllowMayAssign | OPTModifierType ], [ 'redirect', OPTTokenRedirect | OPTMustAssign | OPTAllowMayAssign | OPTModifierType ],
[ 'redirect-rule', OPTTokenRedirectRule | OPTMustAssign | OPTAllowMayAssign | OPTModifierType | OPTNonCspableType ], [ 'redirect-rule', OPTTokenRedirectRule | OPTMustAssign | OPTAllowMayAssign | OPTModifierType | OPTNonCspableType ],
[ 'script', OPTTokenScript | OPTCanNegate | OPTNetworkType | OPTModifiableType | OPTRedirectableType | OPTNonCspableType ], [ 'script', OPTTokenScript | OPTCanNegate | OPTNetworkType | OPTModifiableType | OPTRedirectableType | OPTNonCspableType ],
@ -2387,7 +2388,7 @@ const NetOptionsIterator = class {
this.exception === false && this.exception === false &&
hasBits(descriptor, OPTAllowOnly) || hasBits(descriptor, OPTAllowOnly) ||
assigned && assigned &&
hasNoBits(descriptor, OPTMustAssign) || hasNoBits(descriptor, OPTMayAssign | OPTMustAssign) ||
assigned === false && assigned === false &&
hasBits(descriptor, OPTMustAssign) && ( hasBits(descriptor, OPTMustAssign) && (
this.exception === false || this.exception === false ||

2
src/js/static-net-filtering.js
View File

@ -1638,7 +1638,7 @@ const FilterModifier = class {
FilterModifier.fid, FilterModifier.fid,
details.action, details.action,
details.modifyType, details.modifyType,
details.modifyValue details.modifyValue || '',
]; ];
} }