From 5d0ee209ea496b910e8a0c5252c419c4b2c98dd0 Mon Sep 17 00:00:00 2001
From: Conners Hua <ConnersHua@me.com>
Date: Mon, 11 Oct 2021 18:02:06 +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/Advertising.conf | 2 +-
 Quantumult/Rewrite/Block/YouTubeAds.conf  | 5 +++--
 Surge/Module/Block/Advertising.sgmodule   | 2 +-
 Surge/Module/Block/YouTubeAds.sgmodule    | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Quantumult/Rewrite/Block/Advertising.conf b/Quantumult/Rewrite/Block/Advertising.conf
index 7ffd7ad..6e30255 100644
--- a/Quantumult/Rewrite/Block/Advertising.conf
+++ b/Quantumult/Rewrite/Block/Advertising.conf
@@ -23,7 +23,7 @@ hostname = -lark-frontier-hl.snssdk.com,api.21jingji.com,service.4gtv.tv,app.58.
 # A
 # --- (Alibaba) ---
 # > Taobao - gw.alicdn.com,heic.alicdn.com
-^https?:\/\/gw\.alicdn\.com\/imgextra\/\w{2}\/[\w!]+-\d-tps-\d{3,4}-\d{4}\.(jpg|png)_\d{4}x\d{4}q90 url reject
+^https?:\/\/(gw|heic)\.alicdn\.com\/imgextra\/\w{2}\/[\w!]+-\d-tps-\d{3,4}-\d{4}\.jpg_(1\d{3}|9\d{2})x(1\d{3}|9\d{2})q90\.jpg_\.(heic|webp)$ url reject
 # > Fliggy - gw.alicdn.com
 ^https?:\/\/gw\.alicdn\.com\/imgextra\/\w{2}\/[\w!]+-\d-tps-\d{3}-\d{4}\.(jpg|png)$ url reject
 # > eTao - acs.m.taobao.com
diff --git a/Quantumult/Rewrite/Block/YouTubeAds.conf b/Quantumult/Rewrite/Block/YouTubeAds.conf
index 314036e..9e6688d 100644
--- a/Quantumult/Rewrite/Block/YouTubeAds.conf
+++ b/Quantumult/Rewrite/Block/YouTubeAds.conf
@@ -1,7 +1,8 @@
 hostname = -redirector*.googlevideo.com,*.googlevideo.com,www.youtube.com,s.youtube.com
 
-(^https?:\/\/[\w-]+\.googlevideo\.com\/(?!dclk_video_ads).+)&ctier=L(&.+) url 302 $1$2
+(^https?:\/\/[\w-]+\.googlevideo\.com\/(?!dclk_video_ads).+)&ctier=L(&.+) url 302 $1&ctier=A$2
 ^https?:\/\/[\w-]+\.googlevideo\.com\/(?!(dclk_video_ads|videoplayback\?)).+&oad url reject
 
 ^https?:\/\/(www|s)\.youtube\.com\/api\/stats\/ads url reject
-^https?:\/\/(www|s)\.youtube\.com\/(pagead|ptracking) url reject
\ No newline at end of file
+^https?:\/\/(www|s)\.youtube\.com\/(pagead|ptracking) url reject
+^https?:\/\/s\.youtube\.com\/api\/stats\/qoe\?adcontext url reject
\ No newline at end of file
diff --git a/Surge/Module/Block/Advertising.sgmodule b/Surge/Module/Block/Advertising.sgmodule
index 910bc0f..ad31a80 100644
--- a/Surge/Module/Block/Advertising.sgmodule
+++ b/Surge/Module/Block/Advertising.sgmodule
@@ -24,7 +24,7 @@ URL-REGEX,^https?:\/\/api\.m\.jd.com\/client\.action\?functionId=start,REJECT-TI
 # A
 # --- (Alibaba) ---
 # > Taobao - gw.alicdn.com,heic.alicdn.com
-^https?:\/\/gw\.alicdn\.com\/imgextra\/\w{2}\/[\w!]+-\d-tps-\d{3,4}-\d{4}\.(jpg|png)_\d{4}x\d{4}q90 - reject
+^https?:\/\/(gw|heic)\.alicdn\.com\/imgextra\/\w{2}\/[\w!]+-\d-tps-\d{3,4}-\d{4}\.jpg_(1\d{3}|9\d{2})x(1\d{3}|9\d{2})q90\.jpg_\.(heic|webp)$ - reject
 # > Fliggy - gw.alicdn.com
 ^https?:\/\/gw\.alicdn\.com\/imgextra\/\w{2}\/[\w!]+-\d-tps-\d{3}-\d{4}\.(jpg|png)$ - reject
 # > eTao - acs.m.taobao.com
diff --git a/Surge/Module/Block/YouTubeAds.sgmodule b/Surge/Module/Block/YouTubeAds.sgmodule
index 40c91b6..5518548 100644
--- a/Surge/Module/Block/YouTubeAds.sgmodule
+++ b/Surge/Module/Block/YouTubeAds.sgmodule
@@ -3,11 +3,12 @@
 #!system=ios
 
 [URL Rewrite]
-(^https?:\/\/[\w-]+\.googlevideo\.com\/(?!dclk_video_ads).+)&ctier=L(&.+) $1$2 header
+(^https?:\/\/[\w-]+\.googlevideo\.com\/(?!dclk_video_ads).+)&ctier=L(&.+) $1&ctier=A$2 header
 ^https?:\/\/[\w-]+\.googlevideo\.com\/(?!(dclk_video_ads|videoplayback\?)).+&oad - 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\?adcontext - reject
 
 [MITM]
 hostname = %APPEND% -redirector*.googlevideo.com,*.googlevideo.com,www.youtube.com,s.youtube.com
\ No newline at end of file