From d298debfb976916741f9213be560d334231e7b5c Mon Sep 17 00:00:00 2001 From: Yuki2718 <58900598+Yuki2718@users.noreply.github.com> Date: Mon, 26 Dec 2022 14:37:47 +0900 Subject: [PATCH] partly revert https://github.com/AdguardTeam/AdguardFilters/commit/ec8029da2c872f9fddbe45283a984eff728cdc02 (still needed, couldn't reproduce yesterday for some reason) --- BaseFilter/sections/antiadblock.txt | 1 + JapaneseFilter/sections/antiadblock.txt | 1 + MobileFilter/sections/specific_web.txt | 1 + SpywareFilter/sections/allowlist.txt | 4 ++++ SpywareFilter/sections/specific.txt | 1 - 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/BaseFilter/sections/antiadblock.txt b/BaseFilter/sections/antiadblock.txt index cf5b5138296..ab8146cdda5 100644 --- a/BaseFilter/sections/antiadblock.txt +++ b/BaseFilter/sections/antiadblock.txt @@ -3792,6 +3792,7 @@ apps2app.com#@#.banner_ad adzsafe.com#%#//scriptlet("set-constant", "chk_ads_block", "noopFunc") ! https://github.com/AdguardTeam/AdguardFilters/issues/79989 ! Similar site in Japanese filter: rocketnews24.com +@@||sst.soranews24.com/gtm.js$script,~third-party soranews24.com#%#//scriptlet('prevent-fetch', 'tpc.googlesyndication.com') ||g.doubleclick.net/gampad/ads?$xmlhttprequest,removeparam=/^(co|eid|eri|ga_|idt|ifi|impl|ohw|oid|ps|ptt|vis|[abdfl-nr-u])/,domain=soranews24.com !+ PLATFORM(windows,mac,android,ext_ff) diff --git a/JapaneseFilter/sections/antiadblock.txt b/JapaneseFilter/sections/antiadblock.txt index 5504934add3..ea560c18811 100644 --- a/JapaneseFilter/sections/antiadblock.txt +++ b/JapaneseFilter/sections/antiadblock.txt @@ -40,6 +40,7 @@ rocketnews24.com,youpouch.com#%#//scriptlet('remove-attr', 'id', '#div-gpt-ad-re ||tpc.googlesyndication.com^$image,redirect=1x1-transparent.gif,domain=rocketnews24.com|youpouch.com,important @@||g.doubleclick.net/gampad/ads?$xmlhttprequest,domain=rocketnews24.com|youpouch.com ||g.doubleclick.net/gampad/ads?$xmlhttprequest,removeparam=/^(co|eid|eri|ga_|idt|ifi|impl|ohw|oid|ps|ptt|vis|[abdfl-nr-u])/,domain=rocketnews24.com|youpouch.com +@@||sst.rocketnews24.com/gtm.js$script,~third-party @@||g.doubleclick.net/tag/js/gpt.js$domain=rocketnews24.com|youpouch.com @@||g.doubleclick.net/gpt/pubads_impl_$script,domain=rocketnews24.com|youpouch.com @@||fundingchoicesmessages.google.com^$script,domain=rocketnews24.com|youpouch.com diff --git a/MobileFilter/sections/specific_web.txt b/MobileFilter/sections/specific_web.txt index c395385d9fa..03dd667a564 100644 --- a/MobileFilter/sections/specific_web.txt +++ b/MobileFilter/sections/specific_web.txt @@ -56,6 +56,7 @@ m.proporn.com,rakuraku-info.jp,sugoren.com,dailynewsonline.jp,yakuji.co.jp,asahi ||gstatic.com/shopping?q=tbn$image,domain=rocketnews24.com|youpouch.com|soranews24.com ||outbrainimg.com^$domain=rocketnews24.com|youpouch.com|soranews24.com rocketnews24.com##div[id$="R_SP_Header_320x50\/woir_0__container__"] +youpouch.com##div[id$="P_SP_Header_320x50_0__container__"] soranews24.com##div[id$="En_SP_Header_320x50_0__container__"] rocketnews24.com,youpouch.com,soranews24.com###div-gpt-ad-relatedbottom rocketnews24.com,youpouch.com,soranews24.com##.widget-area:last-child diff --git a/SpywareFilter/sections/allowlist.txt b/SpywareFilter/sections/allowlist.txt index 778b870c12d..14e7216b4e2 100644 --- a/SpywareFilter/sections/allowlist.txt +++ b/SpywareFilter/sections/allowlist.txt @@ -112,6 +112,8 @@ goodwillfinds.com#%#//scriptlet("set-constant", "_etmc", "emptyArr") ||login.eki-net.com^$badfilter ! https://github.com/uBlockOrigin/uAssets/issues/15730 @@||googletagmanager.com/gtm.js$domain=www.nicovideo.jp +! https://github.com/AdguardTeam/AdguardFilters/issues/133738 +@@||googletagmanager.com/gtm.js$domain=rocketnews24.com ! https://github.com/AdguardTeam/AdguardFilters/issues/134655 @@||uid.mavencoalition.io/v$xmlhttprequest,domain=history.com ||uid.mavencoalition.io/v$xmlhttprequest,redirect=noopjson,domain=history.com,important @@ -132,6 +134,8 @@ goodwillfinds.com#%#//scriptlet("set-constant", "_etmc", "emptyArr") ||googletagmanager.com/gtm.js$script,redirect=googletagmanager-gtm,domain=willyweather.com.au !+ PLATFORM(ios, ext_android_cb, ext_safari) @@||googletagmanager.com/gtm.js$domain=willyweather.com.au +! https://github.com/AdguardTeam/AdguardFilters/issues/132814 +@@||googletagmanager.com/gtm.js$domain=youpouch.com ! fix site loading @@||googletagmanager.com/gtm.js$domain=aeromexico.com ! fix recommendations diff --git a/SpywareFilter/sections/specific.txt b/SpywareFilter/sections/specific.txt index 15891900a97..0f441b5b150 100644 --- a/SpywareFilter/sections/specific.txt +++ b/SpywareFilter/sections/specific.txt @@ -53,7 +53,6 @@ /analytics.js$domain=freexcafe.com|rusvideos.tv|nakubani.ru|lun.com|songsara.net|newsmax.com|bolgehastanesi.com|ewtc.de|newsdig.tbs.co.jp|imore.com|city.kushiro.lg.jp|emeraldbridal.com.au|emarat-news.ae|imobie.jp ||assets.adobedtm.com^$domain=mcclatchydc.com|elnuevoherald.com|bellinghamherald.com|sacbee.com|charlotteobserver.com|newsobserver.com|miamiherald.com|ef.ru|algida.com.tr|bmw-motorrad.co.uk|cif.com.tr|clearhaircare.com|domestos.com|dove.com|elidor.com.tr|f1sport.autorevue.cz|geico.com|hellmanns.com.tr|herkessofraya.com|johnsonsbaby.com.tr|lipton.com|lnk.to|lux.com|magnumicecream.com|neutrogena.com.tr|omo.com|rexona.com|samsung.com|sap.com|schwarzkopf.com.tr|signalturkiye.com|msnbc.com|nbcnews.com|kbb.com|eurosport.ru|timgate.it|intermiles.com|oxfordmail.co.uk|spiegel.de|hp.com|deutschepost.de|thebay.com ! -/gtm.js$domain=rocketnews24.com|soranews24.com|youpouch.com ||t2bot.ru/inc/adsCount.php ||t2bot.ru/nod32key/adblock-c.php ||qoe-*.yottaa.net/*/configure.rapid.js