Merge pull request #376 from quoid/fix/f78f784

ACTCD · web-flow · commit d4fea280e66c · 2022-11-08T00:57:15.000+08:00
Fix/f78f784
diff --git a/src/page/Components/Settings.svelte b/src/page/Components/Settings.svelte
@@ -23,14 +23,14 @@
 
         // check if val matches `match patterns`, if not, return a warning
         const re = /^(http:|https:|\*:)\/\/((?:\*\.)?(?:[a-z0-9-]+\.)+(?:[a-z0-9]+)|\*\.[a-z]+|\*|[a-z0-9]+)(\/[^\s]*)$/;
+        blacklistError = false;
         for (const v of val) {
             if (re.exec(v) === null) {
                 blacklistError = true;
                 log.add(`Invalid match pattern: ${v}`, "error", true);
             }
         }
         if (blacklistError) return console.warn("Global exclude includes invalid match patterns");
-        blacklistError = false;
 
         // compare blacklist input to saved blacklist
         if ([...val].sort().toString() !== [...$settings.blacklist].sort().toString()) {

Original file line number	Diff line number	Diff line change
`@@ -23,14 +23,14 @@`
`23`	`23`
`24`	`24`	// check if val matches `match patterns`, if not, return a warning
`25`	`25`	`const re = /^(http:\|https:\|\:)\/\/((?:\\.)?(?:[a-z0-9-]+\.)+(?:[a-z0-9]+)\|\\.[a-z]+\|\\|[a-z0-9]+)(\/[^\s]*)$/;`
	`26`	`+ blacklistError = false;`
`26`	`27`	`for (const v of val) {`
`27`	`28`	`if (re.exec(v) === null) {`
`28`	`29`	`blacklistError = true;`
`29`	`30`	log.add(`Invalid match pattern: ${v}`, "error", true);
`30`	`31`	`}`
`31`	`32`	`}`
`32`	`33`	`if (blacklistError) return console.warn("Global exclude includes invalid match patterns");`
`33`		`- blacklistError = false;`
`34`	`34`
`35`	`35`	`// compare blacklist input to saved blacklist`
`36`	`36`	`if ([...val].sort().toString() !== [...$settings.blacklist].sort().toString()) {`