[mv3] Improve conversion of removeparam filters to DNR rules

gorhill · gorhill · commit 9b4f41df94bc · 2026-01-28T12:10:50.000-05:00
Related issue: uBlockOrigin/uBOL-home#140
diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js
@@ -4765,12 +4765,17 @@ StaticNetFilteringEngine.prototype.dnrFromCompiled = function(op, context, ...ar
                 }
             }
             // https://github.com/uBlockOrigin/uBOL-home/discussions/575
-            if ( rule.condition.urlFilter === undefined ) {
+            const { urlFilter } = rule.condition;
+            if ( urlFilter === undefined ) {
                 if ( rule.condition.regexFilter === undefined ) {
                     if ( paramName !== '' ) {
                         rule.condition.urlFilter = `^${paramName}=`;
                     }
                 }
+            } else if ( urlFilter.startsWith('||') ) {
+                if ( urlFilter.includes(paramName) === false ) {
+                    rule.condition.urlFilter = `${rule.condition.urlFilter}*^${paramName}=`;
+                }
             }
             if ( rule.__modifierAction === ALLOW_REALM ) {
                 dnrAddRuleError(rule, `Unsupported removeparam exception: ${rule.__modifierValue}`);

Original file line number	Diff line number	Diff line change
`@@ -4765,12 +4765,17 @@ StaticNetFilteringEngine.prototype.dnrFromCompiled = function(op, context, ...ar`
`4765`	`4765`	`}`
`4766`	`4766`	`}`
`4767`	`4767`	`// https://github.com/uBlockOrigin/uBOL-home/discussions/575`
`4768`		`- if ( rule.condition.urlFilter === undefined ) {`
	`4768`	`+ const { urlFilter } = rule.condition;`
	`4769`	`+ if ( urlFilter === undefined ) {`
`4769`	`4770`	`if ( rule.condition.regexFilter === undefined ) {`
`4770`	`4771`	`if ( paramName !== '' ) {`
`4771`	`4772`	rule.condition.urlFilter = `^${paramName}=`;
`4772`	`4773`	`}`
`4773`	`4774`	`}`
	`4775`	`+ } else if ( urlFilter.startsWith('\|\|') ) {`
	`4776`	`+ if ( urlFilter.includes(paramName) === false ) {`
	`4777`	+ rule.condition.urlFilter = `${rule.condition.urlFilter}*^${paramName}=`;
	`4778`	`+ }`
`4774`	`4779`	`}`
`4775`	`4780`	`if ( rule.__modifierAction === ALLOW_REALM ) {`
`4776`	`4781`	dnrAddRuleError(rule, `Unsupported removeparam exception: ${rule.__modifierValue}`);