Merge branch 'master' of https://github.com/FutaGuard/FutaFilter

Surge/check_futadns.js

@@ -0,0 +1,29 @@
+const { v4, v6 } = $network;
+
+const errorMessage = {
+  title: 'FutaDNS',
+  content: '無已被設定的 FutaGuard DNS 伺服器',
+  icon: 'xmark.shield.fill',
+  'icon-color': '#FE6245',
+};
+
+const successMessage = {
+  title: 'FutaDNS',
+  content: '已指定的 FutaGuard DNS 伺服器\n正在正確地運作',
+  icon: 'checkmark.shield.fill',
+  'icon-color': '#1FCFB4',
+};
+
+if (!v4.primaryAddress && !v6.primaryAddress) {
+  $done(errorMessage);
+} else {
+  $httpClient.get('https://check.futa.gg', function (error, response, data) {
+    if (error) {
+      $done(errorMessage);
+    }
+    if (data.includes('正在正確地運作')) {
+      $done(successMessage);
+    }
+    $done(errorMessage);
+  });
+}

Surge/check_futadns.sgmodule

@@ -0,0 +1,9 @@
+#!name=FutaDNS 檢查面板
+#!desc=顯示目前是否成功連上 FutaDNS。 v20211001
+#!system=ios
+
+[Panel]
+CheckFutaDNSPanel=title="",content="",style=info,script-name=check_futadns.js,update-interval=1
+
+[Script]
+check_futadns.js=script-path=https://raw.githubusercontent.com/FutaGuard/FutaFilter/master/Surge/check_futadns.js,type=generic

Surge/filters.txt

@@ -1,5 +1,5 @@
 #!name=FutaFilter
-#!desc=Make Futa Great Again! v20210321.01
+#!desc=Make Futa Great Again! v20210619.01
 #!system=ios
 
 [Rule]
@@ -54,6 +54,10 @@ URL-REGEX,^https:\/\/pttbrain\.herokuapp\.com\/api\/ptt\/metric\/user\-geo\-dist
 #! pixnet
 URL-REGEX,^https:\/\/front\.pixfs\.net\/module\/idlePop\/js\/,REJECT
 
+#! Poke Genie 團體戰
+DOMAIN-SUFFIX,cloudfunctions.net,DIRECT
+DOMAIN-SUFFIX,admob-app-id-4587251595.firebaseio.com,DIRECT
+
 #! 通用阻擋
 DOMAIN,itad.linetv.tw,REJECT
 DOMAIN,sessions.bugsnag.com,REJECT-DROP

filter.txt

@@ -1,6 +1,6 @@
 [Adblock Plus]
 ! Title: FutaFilter
-! Version: 2021.0518.03
+! Version: 2021.0618.01
 ! Expires: 1 hour
 ! Homepage: https://t.me/adguard_tw
 ! ----------------------------------------------------------------------
@@ -123,6 +123,8 @@ newtalk.tw##div[class="ad_content_mask"]
 ! 中時
 chinatimes.com##div[class="page-idle-prompt"]
 chinatimes.com##div[class="modal-backdrop fade show"]
+! shoppingdesign
+shoppingdesign.com.tw#$#.IdleBox { display: none !important; }
 ! ----------------------------------------------------------------------
 
 ! Line
@@ -220,4 +222,11 @@ cio.com.tw##div[class^="dialog-widget"]
 yzzk.com##.content div.promo
 
 ! 蝦皮
-||c-api-bit.shopeemobile.com/*/tr^
+||c-api-bit.shopeemobile.com/*/tr^
+
+! 知乎
+zhihu.com##div[class="Modal-wrapper undefined Modal-enter-done"]
+zhihu.com#$#html { overflow: scroll !important; }
+
+! 詐騙
+||brainstudy.info^

hosts.txt

@@ -68,6 +68,7 @@
 ||fghjkd.com^
 ||track-post-tw.com^
 ||track-post-gov-tw.info^
+||brainstudy.info^
 
 ! 釣魚
 ||track-post-gov-tw.info^
@@ -102,6 +103,8 @@
 
 ! 混淆垃圾農場網頁
 ||7box.vip^
+||renaultpassonxperience.co^
+||softwarebrother.com^
 ||yuutoday.com^
 
 ! 抽獎廣告

nofarm_hosts.txt

@@ -1,7 +1,7 @@
 ! FutaHosts
 ! FutaFilter nofarm
 ! URL: <https://github.com/FutaGuard/FutaFilter>
-! 2021.0309.01
+! 2021.0916.01
 ! --------------------------------------------------
 ||366service.com^
 ||7box.vip^
@@ -17,6 +17,7 @@
 ||coco01.me^
 ||coco01.net^
 ||coco01.today^
+||cocoachina.com^
 ||cocomy.net^
 ||codebug.vip^
 ||codenong.com^
@@ -43,7 +44,9 @@
 ||ptt01.cc^
 ||ptt01.tv^
 ||read01.com^
+||renaultpassonxperience.co^
 ||setn.com^
+||softwarebrother.com^
 ||stackoom.com^
 ||teepr.com^
 ||thinbug.com^
@@ -53,4 +56,4 @@
 ||twgreatdaily.life^
 ||twgreatdaily.live^
 ||uwenku.com^
-||yuutoday.com^
+||yuutoday.com^

removeparam.txt

@@ -81,6 +81,8 @@ $removeparam=/assetType/i
 $removeparam=/assetId/i
 $removeparam=/recipientId/i
 $removeparam=/campaignId/i
+! whitelist for ruten
+@@||ruten.com.tw$removeparam=/campaignId/i
 
 $removeparam=/siteId/i
 ! whitelist for CHT login issue