feat: removeparam without option value

ghostery · seia-soto · Dec 13, 2024 · Dec 13, 2024 · Dec 13, 2024 · Dec 13, 2024
commit fd43ad1e1012375d0da9355f3b851205fd261b35
@@ -1479,9 +1479,18 @@ export default class FilterEngine extends EventEmitter<EngineEventHandlers> {
           const searchParams = new URLSearchParams(request.url.slice(searchParamsIndex + 1));
           let parametersRemoved = 0;
           for (const redirect of requestRedirects) {
-            if (searchParams.has(redirect.optionValue!)) {
-              parametersRemoved++;
-              searchParams.delete(redirect.optionValue!);
+            // When removeparam used without any option value, remove all parameter.
+            if (redirect.optionValue === undefined) {
+              redirectUrl = request.url.slice(0, searchParamsIndex);
+              result.filter = requestRedirects[0];
+              // Prevent next branch after the loop to be executed.
+              parametersRemoved = 0;
+              break;
+            } else {
+              if (searchParams.has(redirect.optionValue)) {
+                parametersRemoved++;
+                searchParams.delete(redirect.optionValue);
+              }
             }
           }
           if (parametersRemoved !== 0) {

@@ -890,10 +890,6 @@ export default class NetworkFilter implements IFilter {
 
             break;
           case 'removeparam':
-            if (value.length === 0) {
-              return null;
-            }
-
             mask = setBit(mask, NETWORK_FILTER_MASK.isRemoveParam);
             optionValue = value;
 
@@ -1546,7 +1542,11 @@ export default class NetworkFilter implements IFilter {
     }
 
     if (this.isRemoveParam()) {
-      options.push(`removeparam=${this.optionValue!}`);
+      if (this.optionValue !== undefined) {
+        options.push(`removeparam=${this.optionValue}`);
+      } else {
+        options.push('removeparam');
+      }
     }
 
     if (options.length > 0) {