From d22b4e9f71285f1ea6f2a8ace8ecbae1d27a02c4 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Sun, 16 Oct 2022 13:20:49 -0400
Subject: [PATCH] [mv3] Revert attempt at fixing rules with entity-based syntax

This will need more careful analysis to properly address this.
---
 src/js/static-net-filtering.js | 30 ++----------------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js
index ad7970c18..0f1798eaa 100644
--- a/src/js/static-net-filtering.js
+++ b/src/js/static-net-filtering.js
@@ -1743,6 +1743,7 @@ const FilterOriginEntityHit = class extends FilterOriginHit {
 
     static dnrFromCompiled(args, rule) {
         dnrAddRuleError(rule, `FilterOriginEntityHit: Entity ${args[1]} not supported`);
+        super.dnrFromCompiled(args, rule);
     }
 };
 
@@ -1761,6 +1762,7 @@ const FilterOriginEntityMiss = class extends FilterOriginMiss {
 
     static dnrFromCompiled(args, rule) {
         dnrAddRuleError(rule, `FilterOriginEntityMiss: Entity ${args[1]} not supported`);
+        super.dnrFromCompiled(args, rule);
     }
 };
 
@@ -4060,34 +4062,6 @@ FilterContainer.prototype.dnrFromCompiled = function(op, context, ...args) {
         }
     }
 
-    // Try to recover from errors for when the rule is still useful despite not
-    // being complete.
-    for ( const rule of ruleset ) {
-        if ( rule._error === undefined ) { continue; }
-        let i = rule._error.length;
-        while ( i-- ) {
-            const error = rule._error[i];
-            if ( error.startsWith('FilterOriginEntityHit:') ) {
-                if (
-                    Array.isArray(rule.condition.initiatorDomains) &&
-                    rule.condition.initiatorDomains.length > 0
-                ) {
-                    rule._error.splice(i, 1);
-                }
-            } else if ( error.startsWith('FilterOriginEntityMiss:') ) {
-                if (
-                    Array.isArray(rule.condition.excludedInitiatorDomains) &&
-                    rule.condition.excludedInitiatorDomains.length > 0
-                ) {
-                    rule._error.splice(i, 1);
-                }
-            }
-        }
-        if ( rule._error.length === 0 ) {
-            delete rule._error;
-        }
-    }
-
     // Patch modifier filters
     for ( const rule of ruleset ) {
         if ( rule.__modifierType === undefined ) { continue; }