Merge branch 'DivineEngine:master' into master

2025-01-22 19:39:02 +08:00 · 2022-06-21 06:19:06 +08:00 · 2022-06-21 06:19:06 +08:00 · 2b9e5f5ff8
commit 2b9e5f5ff8
parent 33ee94c723 cb0883e856
8 changed files with 5 additions and 25 deletions
--- a/Clash/RuleSet/Extra/Scholar.yaml
+++ b/Clash/RuleSet/Extra/Scholar.yaml
@ -48,6 +48,7 @@ payload:
  - DOMAIN-SUFFIX,proquest.com
  - DOMAIN-SUFFIX,rsc.org
  - DOMAIN-SUFFIX,sagepub.com
+  - DOMAIN-SUFFIX,science.org
  - DOMAIN-SUFFIX,sciencedirect.com
  - DOMAIN-SUFFIX,sciencemag.org
  - DOMAIN-SUFFIX,scitation.org
--- a/Quantumult/Filter/Extra/Scholar.list
+++ b/Quantumult/Filter/Extra/Scholar.list
@ -47,6 +47,7 @@ DOMAIN-SUFFIX,pnas.org,Scholar
 DOMAIN-SUFFIX,proquest.com,Scholar
 DOMAIN-SUFFIX,rsc.org,Scholar
 DOMAIN-SUFFIX,sagepub.com,Scholar
+DOMAIN-SUFFIX,science.org,Scholar
 DOMAIN-SUFFIX,sciencedirect.com,Scholar
 DOMAIN-SUFFIX,sciencemag.org,Scholar
 DOMAIN-SUFFIX,scitation.org,Scholar
--- a/Quantumult/Outbound.conf
+++ b/Quantumult/Outbound.conf
@ -23,12 +23,12 @@ server_check_url=http://cp.cloudflare.com/generate_204

 # DNS 排除列表
 # dns_exclusion_list 包含了禁用占位符 IP (240.*) 的域，不在 dns_exclusion_list 中的域都启用了占位符 IP，并打开了 resolve-on-remote 设置。
-dns_exclusion_list=*.cmpassport.com, *.jegotrip.com.cn, *.icitymobile.mobi, id6.me, dig.bdurl.net
+dns_exclusion_list=*.cmpassport.com, *.jegotrip.com.cn, *.icitymobile.mobi, id6.me

 # Quantumult 将不会处理到 excluded_routes 的流量。修改后最好重新启动您的设备。
 ;excluded_routes=192.168.0.0/16, 172.16.0.0/12, 100.64.0.0/10, 10.0.0.0/8
 # Hearthstone: 24.105.30.129/32, 185.60.112.157/32, 185.60.112.158/32, 182.162.132.1/32
-excluded_routes=239.255.255.250/32, 24.105.30.129/32, 185.60.112.157/32, 185.60.112.158/32, 182.162.132.1/32
+excluded_routes=239.255.255.250/32

 # 在网络环境切换时出发运行模式变更
 # filter - 规则分流，all_proxy - 全部代理，all_direct - 全部直连
--- a/Quantumult/Rewrite/Turn-Off-Google-Safesearch.conf
+++ b/Quantumult/Rewrite/Turn-Off-Google-Safesearch.conf
@ -1,8 +0,0 @@
-# Turn Off Google Safesearch(Beta)
-# 主要用于解决被 Google 识别成中国大陆(即访问不了 https://www.google.com/maps/timeline)的节点导致谷歌香港安全搜索锁死的问题。桌面端请使用 https://google.com/ncr。
-
-hostname = www.google.com,www.google.com.*
-
-(https:\/\/www\.google\.com([.a-z]+)?\/.+)(&safe=strict&)(.+) url 302 $1&safe=off
-
-https://www\.google\.com\.hk\/search\?q=([\w.]+)&.+ url 302 https://www.google.com.sg/search?q=$1&safe=off
--- a/Quantumult/Rewrite/Wikiwand.conf
+++ b/Quantumult/Rewrite/Wikiwand.conf
@ -1,4 +0,0 @@
-hostname = *.wikipedia.org,*.wikiwand.com
-
-^https://zh.(m.)?wikipedia.org/zh(-\w*)?(?=/) url 302 https://www.wikiwand.com/zh$2
-^https://(\w*).(m.)?wikipedia.org/wiki url 302 https://www.wikiwand.com/$1
--- a/Surge/Module/Turn-Off-Google-Safesearch.sgmodule
+++ b/Surge/Module/Turn-Off-Google-Safesearch.sgmodule
@ -1,10 +0,0 @@
-#!name=Turn Off Google Safesearch(Beta)
-#!desc=主要用于解决被 Google 识别成中国大陆(即访问不了 https://www.google.com/maps/timeline)的节点导致谷歌香港安全搜索锁死的问题。桌面端请使用 https://google.com/ncr。
-#!system=ios
-
-[URL Rewrite]
-(https:\/\/www\.google\.com([.a-z]+)?\/.+)(&safe=(active|strict)&)(.+) $1&safe=off 302
-https://www\.google\.com\.hk\/search\?q=([\w.]+)&(.+) https://www.google.com.sg/search?q=$1&safe=off 302
-
-[MITM]
-hostname = %APPEND% www.google.com,www.google.com.*
--- a/Surge/Ruleset/Extra/Scholar.list
+++ b/Surge/Ruleset/Extra/Scholar.list
@ -47,6 +47,7 @@ DOMAIN-SUFFIX,pnas.org
 DOMAIN-SUFFIX,proquest.com
 DOMAIN-SUFFIX,rsc.org
 DOMAIN-SUFFIX,sagepub.com
+DOMAIN-SUFFIX,science.org
 DOMAIN-SUFFIX,sciencedirect.com
 DOMAIN-SUFFIX,sciencemag.org
 DOMAIN-SUFFIX,scitation.org
--- a/Surge/Ruleset/Guard/Advertising.list
+++ b/Surge/Ruleset/Guard/Advertising.list
@ -276,7 +276,6 @@ DOMAIN,pgdt.gtimg.cn
 DOMAIN,pgdt.gtimg.com
 DOMAIN,pgdt.ugdtimg.com
 DOMAIN,splashqqlive.gtimg.com
-DOMAIN,vv.video.qq.com
 DOMAIN,wa.gtimg.com
 # DOMAIN,wxsnsdy.wxs.qq.com
 # DOMAIN,wxsnsdythumb.wxs.qq.com