From 78bce6a8b3438d8c50ad48fa6cdfa292517da9f1 Mon Sep 17 00:00:00 2001
From: Conners Hua <ConnersHua@me.com>
Date: Fri, 26 Mar 2021 02:27:58 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Quantumult/Rewrite/Block/YouTubeAds.conf |  8 ++++++--
 Surge/Module/Block/YouTubeAds.sgmodule   |  8 ++++++--
 Surge/Module/General.sgmodule            | 26 ++++++++++++++++++++++--
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/Quantumult/Rewrite/Block/YouTubeAds.conf b/Quantumult/Rewrite/Block/YouTubeAds.conf
index aee1371..27c3765 100644
--- a/Quantumult/Rewrite/Block/YouTubeAds.conf
+++ b/Quantumult/Rewrite/Block/YouTubeAds.conf
@@ -1,4 +1,8 @@
-hostname = *.googlevideo.com
+hostname = *.googlevideo.com,www.youtube.com,s.youtube.com
 
 (^https?:\/\/[\w-]+\.googlevideo\.com\/.+)(ctier=L)(&.+) url 302 $1$3
-^https?:\/\/[\w-]+\.googlevideo\.com\/.+&(oad|ctier) url reject
\ No newline at end of file
+^https?:\/\/[\w-]+\.googlevideo\.com\/.+&(oad|ctier) url reject
+
+^https?:\/\/(www|s)\.youtube\.com\/api\/stats\/ads url reject
+^https?:\/\/(www|s)\.youtube\.com\/(pagead|ptracking) url reject
+^https?:\/\/\s.youtube.com/api/stats/qoe?.*adformat= url reject
\ No newline at end of file
diff --git a/Surge/Module/Block/YouTubeAds.sgmodule b/Surge/Module/Block/YouTubeAds.sgmodule
index 719092c..6081e2a 100644
--- a/Surge/Module/Block/YouTubeAds.sgmodule
+++ b/Surge/Module/Block/YouTubeAds.sgmodule
@@ -1,10 +1,14 @@
 #!name=Block YouTube Advertising
-#!desc=跳过 YouTube 视频片头广告，Premium 勿用。
+#!desc=跳过 YouTube 视频广告，Premium 勿用。
 #!system=ios
 
 [URL Rewrite]
 (^https?:\/\/[\w-]+\.googlevideo\.com\/.+)(ctier=L)(&.+) $1$3 302
 ^https?:\/\/[\w-]+\.googlevideo\.com\/.+&(oad|ctier) - reject
 
+^https?:\/\/(www|s)\.youtube\.com\/api\/stats\/ads - reject
+^https?:\/\/(www|s)\.youtube\.com\/(pagead|ptracking) - reject
+^https?:\/\/\s.youtube.com/api/stats/qoe?.*adformat= - reject
+
 [MITM]
-hostname = %APPEND% *.googlevideo.com
\ No newline at end of file
+hostname = %APPEND% *.googlevideo.com,www.youtube.com,s.youtube.com
\ No newline at end of file
diff --git a/Surge/Module/General.sgmodule b/Surge/Module/General.sgmodule
index 41e9f0b..5f9cacc 100644
--- a/Surge/Module/General.sgmodule
+++ b/Surge/Module/General.sgmodule
@@ -1,5 +1,27 @@
-#!name=URL Optimization
-#!desc=通用的 URL 优化，包含 Google 搜索及地图、微博短链接白名单、AbeamTV 区域限制等体验增强
+#!name=Advanced Settings & URL Redirect
+#!desc=高级设置及通用的 URL 重定向优化（如 Google 搜索及地图、AbeamTV 区域限制等）
+
+[General]
+# > Internet 测试 URL
+internet-test-url = http://wifi.vivo.com.cn/generate_204
+# > 代理测速 URL
+proxy-test-url = http://cp.cloudflare.com/generate_204
+# > 测试超时（秒）
+test-timeout = 5
+
+# > 自定义 GeoIP 数据库
+geoip-maxmind-url = https://raw.githubusercontent.com/JMVoid/ipip2mmdb/release/Country.mmdb
+
+# > 跳过代理
+skip-proxy = %APPEND% passenger.t3go.cn
+# > 排除简单主机名
+exclude-simple-hostnames = true
+
+# > Always Real IP Hosts
+always-real-ip = %APPEND% msftconnecttest.com, msftncsi.com, *.msftconnecttest.com, *.msftncsi.com, *.srv.nintendo.net, *.stun.playstation.net, xbox.*.microsoft.com, *.xboxlive.com
+
+# > VIF Excluded Routes
+tun-excluded-routes = %APPEND% 239.255.255.250/32
 
 [URL Rewrite]
 # Redirect Google Search Service