Change how wildcard works

hanubeki · Aug 22, 2024 · 4ffecc9 · 4ffecc9
1 parent f241da4
commit 4ffecc9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/generate/cosmetic/filter/filter.go b/generate/cosmetic/filter/filter.go
@@ -106,9 +106,6 @@ func ParseLine(line string) (f Rule, ok bool) {
 		// General rules for all domains need the empty domain to work with the script
 		domains = append(domains, "")
 	}
-	if split[0] == "*" {
-		domains = []string{""}
-	}
 
 	joinedDomains := strings.Join(domains, ",")
 

diff --git a/generate/cosmetic/filter/filter_test.go b/generate/cosmetic/filter/filter_test.go
@@ -15,7 +15,7 @@ func TestParseLine(t *testing.T) {
 		{"###cookie_alert", Rule{Domains: []string{""}, JoinedDomains: "", CSSSelector: "#cookie_alert"}, true},
 		{"##.cookie_alert", Rule{Domains: []string{""}, JoinedDomains: "", CSSSelector: ".cookie_alert"}, true},
 		// Wildcard "*" is also supported
-		{"*###cookie_alert", Rule{Domains: []string{""}, JoinedDomains: "", CSSSelector: "#cookie_alert"}, true},
+		{"*###cookie_alert", Rule{Domains: []string{"*"}, JoinedDomains: "*", CSSSelector: "#cookie_alert"}, true},
 
 		// Normal rules that block certain CSS selectors
 		{"example.com##.ad", Rule{Domains: []string{"example.com"}, JoinedDomains: "example.com", CSSSelector: ".ad"}, true},

diff --git a/generate/cosmetic/script-template.js b/generate/cosmetic/script-template.js
@@ -40,6 +40,11 @@
         let output = [];
 
         for (i in rules) {
+            if (i === "*") {
+                output.push(i);
+                continue;
+            }
+
             let ruleSplit = i.split(",");
 
             let allTilded = true;