From 41655852f4f30028b30cfde2f3177ecd1df3eb45 Mon Sep 17 00:00:00 2001
From: SukkaW <isukkaw@gmail.com>
Date: Mon, 30 Sep 2024 07:23:47 +0800
Subject: [PATCH] Fix: reject extra & new reject extra source

---
 Build/build-reject-domainset.ts       |  2 +-
 Build/constants/reject-data-source.ts | 11 ++++++++---
 Build/lib/rules/domainset.ts          |  2 ++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Build/build-reject-domainset.ts b/Build/build-reject-domainset.ts
index f8b0220c..69421b2c 100644
--- a/Build/build-reject-domainset.ts
+++ b/Build/build-reject-domainset.ts
@@ -141,7 +141,7 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as
     }
 
     for (let i = 0, len = rejectOutput.$preprocessed.length; i < len; i++) {
-      rejectOutput.whitelistDomain(rejectOutput.$preprocessed[i]);
+      rejectExtraOutput.whitelistDomain(rejectOutput.$preprocessed[i]);
     }
   });
 
diff --git a/Build/constants/reject-data-source.ts b/Build/constants/reject-data-source.ts
index 593a37ca..2eaa4811 100644
--- a/Build/constants/reject-data-source.ts
+++ b/Build/constants/reject-data-source.ts
@@ -7,8 +7,8 @@ export const HOSTS: HostsSource[] = [
   ['https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/hosts.txt', null, true, TTL.THREE_DAYS()],
   // have not been updated for more than a year, so we set a 14 days cache ttl
   ['https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt', null, true, TTL.TWO_WEEKS()],
-  ['https://raw.githubusercontent.com/jerryn70/GoodbyeAds/master/Extension/GoodbyeAds-Xiaomi-Extension.txt', null, false, TTL.THREE_DAYS()],
-  ['https://raw.githubusercontent.com/jerryn70/GoodbyeAds/master/Extension/GoodbyeAds-Huawei-AdBlock.txt', null, false, TTL.THREE_DAYS()],
+  ['https://raw.githubusercontent.com/jerryn70/GoodbyeAds/master/Extension/GoodbyeAds-Xiaomi-Extension.txt', null, false, TTL.ONE_WEEK()],
+  ['https://raw.githubusercontent.com/jerryn70/GoodbyeAds/master/Extension/GoodbyeAds-Huawei-AdBlock.txt', null, false, TTL.ONE_WEEK()],
   ['https://raw.githubusercontent.com/durablenapkin/block/master/luminati.txt', null, true, TTL.THREE_HOURS()],
   ['https://raw.githubusercontent.com/durablenapkin/block/refs/heads/master/tvstream.txt', null, true, TTL.THREE_HOURS()]
 ];
@@ -73,7 +73,7 @@ export const DOMAIN_LISTS_EXTRA: HostsSource[] = [
   ['https://raw.githubusercontent.com/Spam404/lists/master/main-blacklist.txt', [], true, TTL.TEN_DAYS()]
 ];
 
-export const PHISHING_DOMAIN_LISTS_EXTRA: [HostsSource, HostsSource] = [
+export const PHISHING_DOMAIN_LISTS_EXTRA: HostsSource[] = [
   [
     'https://curbengh.github.io/phishing-filter/phishing-filter-domains.txt',
     [
@@ -86,6 +86,11 @@ export const PHISHING_DOMAIN_LISTS_EXTRA: [HostsSource, HostsSource] = [
     'https://phishing.army/download/phishing_army_blocklist.txt',
     [],
     true, TTL.THREE_HOURS()
+  ],
+  [
+    'https://raw.githubusercontent.com/durablenapkin/scamblocklist/refs/heads/master/hosts.txt',
+    [],
+    true, TTL.TWLVE_HOURS()
   ]
 ];
 
diff --git a/Build/lib/rules/domainset.ts b/Build/lib/rules/domainset.ts
index 1aabdc88..e43517d4 100644
--- a/Build/lib/rules/domainset.ts
+++ b/Build/lib/rules/domainset.ts
@@ -89,4 +89,6 @@ export class DomainsetOutput extends RuleOutput<Preprocessed> {
       )
       .map(([domain, count]) => `${domain}${' '.repeat(100 - domain.length)}${count}`);
   }
+
+  mitmSgmodule = undefined;
 }