From 63e92c446b17e341270ab82c251b4d17b8bbab22 Mon Sep 17 00:00:00 2001 From: Alex302 Date: Thu, 21 Jul 2022 00:14:42 +0300 Subject: [PATCH] Changed sections descriptions in new files of Annoyances filter --- .../MobileApp/sections/mobile-app_general.txt | 7 +++---- .../MobileApp/sections/mobile-app_specific.txt | 4 +++- .../MobileApp/sections/mobile-app_whitelist.txt | 17 +++++------------ .../Popups/sections/popups_general.txt | 4 ++-- .../Popups/sections/popups_specific.txt | 2 +- .../Popups/sections/popups_whitelist.txt | 6 +++--- .../sections/push-notifications_general.txt | 2 +- .../sections/push-notifications_specific.txt | 2 +- .../sections/push-notifications_whitelist.txt | 7 ++++--- .../Popups/sections/subscriptions_general.txt | 4 ++-- .../Popups/sections/subscriptions_specific.txt | 2 +- .../Popups/sections/subscriptions_whitelist.txt | 4 ++-- 12 files changed, 28 insertions(+), 33 deletions(-) diff --git a/AnnoyancesFilter/MobileApp/sections/mobile-app_general.txt b/AnnoyancesFilter/MobileApp/sections/mobile-app_general.txt index b04598f51fb..d5dfe0689a8 100644 --- a/AnnoyancesFilter/MobileApp/sections/mobile-app_general.txt +++ b/AnnoyancesFilter/MobileApp/sections/mobile-app_general.txt @@ -1,9 +1,8 @@ ! -! This section contains the list of rules are against banners that promote mobile apps. -! Note, that the file consists of multiple sections for different purposes. For instance, there is a section for exceptions and some platform-specific sections. +! This section contains the list of generic rules are against banners that promote mobile apps. ! -! Good: any type of the rules will be good -! Bad: @@||example.org^$stealth (should be in AdGuard Base - whitelist_stealth.txt) +! Good: ##amp-app-banner +! Bad: example.org###amp-app-banner (should be in mobile-app_specific.txt) ! ! SECTION: Mobile apps - generic rules /wp-content/plugins/ioimedia-app-banner/* diff --git a/AnnoyancesFilter/MobileApp/sections/mobile-app_specific.txt b/AnnoyancesFilter/MobileApp/sections/mobile-app_specific.txt index 09ec988ae99..87d625caf43 100644 --- a/AnnoyancesFilter/MobileApp/sections/mobile-app_specific.txt +++ b/AnnoyancesFilter/MobileApp/sections/mobile-app_specific.txt @@ -3,11 +3,13 @@ ! Note, that the file consists of multiple sections for different purposes. For instance, there is a section for exceptions and some platform-specific sections. ! ! Good: any type of the rules will be good -! Bad: @@||example.org^$stealth (should be in AdGuard Base - whitelist_stealth.txt) +! Bad: example.org#@##smartbanner.ios (should be in AdGuard Base - mobile-app_whitelist.txt) ! ! HINTS are at the end of Specific section ! ! SECTION: Mobile apps - Specific +tinhte.vn##a[href="https://tinhte.vn/app"] +tinhte.vn##.app-install-wrapper warcrimes.gov.ua##.modal-app terabox.com#$#.introduce-top-panel .introduce-sticky-btn img { position: static !important; } mapion.co.jp##.btn-ptn2 diff --git a/AnnoyancesFilter/MobileApp/sections/mobile-app_whitelist.txt b/AnnoyancesFilter/MobileApp/sections/mobile-app_whitelist.txt index ee03351eafd..e88d2a17acf 100644 --- a/AnnoyancesFilter/MobileApp/sections/mobile-app_whitelist.txt +++ b/AnnoyancesFilter/MobileApp/sections/mobile-app_whitelist.txt @@ -1,9 +1,8 @@ ! -! This section contains the list of rules are against banners that promote mobile apps. -! Note, that the file consists of multiple sections for different purposes. For instance, there is a section for exceptions and some platform-specific sections. +! This section contains the list of rules that fix incorrect blocking of mobile app banners. Rules should be domain-specific. ! -! Good: any type of the rules will be good -! Bad: @@||example.org^$stealth (should be in AdGuard Base - whitelist_stealth.txt) +! Good: example.org#@##smartbanner.ios +! Bad: example.org###smartbanner.ios (should be in cookies_specific.txt) ! ! SECTION: Mobile apps - Whitelist ! https://github.com/AdguardTeam/AdguardFilters/issues/118200 RECOMMEND not shown @@ -25,14 +24,8 @@ ! ! Unhide for Android CB if a CSS rules required !#if (adguard_ext_android_cb) -tinhte.vn##a[href="https://tinhte.vn/app"] -tinhte.vn##.app-install-wrapper -teb.com.tr#@##smartbanner.ios -goodreads.com#@##smartbanner.android -kicker.de#@##smartbanner.ios -kicker.de#@##smartbanner.android -edeka.de#@##smartbanner.ios -edeka.de#@##smartbanner.android +teb.com.tr,kicker.de,edeka.de#@##smartbanner.ios +goodreads.com,kicker.de,edeka.de#@##smartbanner.android !#endif ! NOTE: Whitelist end ⬆️ ! !SECTION: Mobile apps - Whitelist diff --git a/AnnoyancesFilter/Popups/sections/popups_general.txt b/AnnoyancesFilter/Popups/sections/popups_general.txt index e07c9a0dc7d..d6c905f8130 100644 --- a/AnnoyancesFilter/Popups/sections/popups_general.txt +++ b/AnnoyancesFilter/Popups/sections/popups_general.txt @@ -1,9 +1,9 @@ ! -! This section contains the list of rules that block in-page popups (like banners with special offers) and floating elements. +! This section contains the list of generic rules that block in-page popups (like banners with special offers) and floating elements. ! At the bottom of this file, you can find the allowlist that fixes issues caused by the rules from this file. ! ! Good: any type of the rules will be good -! Bad: @@||example.org^$stealth (should be in AdGuard Base - whitelist_stealth.txt) +! Bad: example.org#@##credential_picker_container (should be in AdGuard Base - popups_whitelist.txt) ! ! ! SECTION: Popups - generic rules diff --git a/AnnoyancesFilter/Popups/sections/popups_specific.txt b/AnnoyancesFilter/Popups/sections/popups_specific.txt index 2ae00b386bd..6ebc26b6492 100644 --- a/AnnoyancesFilter/Popups/sections/popups_specific.txt +++ b/AnnoyancesFilter/Popups/sections/popups_specific.txt @@ -3,7 +3,7 @@ ! At the bottom of this file, you can find the allowlist that fixes issues caused by the rules from this file. ! ! Good: any type of the rules will be good -! Bad: @@||example.org^$stealth (should be in AdGuard Base - whitelist_stealth.txt) +! Bad: @@||example.org^ (should be in AdGuard Base - popups_whitelist.txt) ! ! Specific sites ! SECTION: Popups - Specific diff --git a/AnnoyancesFilter/Popups/sections/popups_whitelist.txt b/AnnoyancesFilter/Popups/sections/popups_whitelist.txt index e436e4492da..94af097e422 100644 --- a/AnnoyancesFilter/Popups/sections/popups_whitelist.txt +++ b/AnnoyancesFilter/Popups/sections/popups_whitelist.txt @@ -1,9 +1,9 @@ ! -! This section contains the list of rules that block in-page popups (like banners with special offers) and floating elements. +! This section contains the list of rules that fix the problems, caused by incorrect blocking of in-page popups. ! At the bottom of this file, you can find the allowlist that fixes issues caused by the rules from this file. ! -! Good: any type of the rules will be good -! Bad: @@||example.org^$stealth (should be in AdGuard Base - whitelist_stealth.txt) +! Good: @@||popups.org^$domain=example.org +! Bad: ||example.org^ ! !--- Whitelist ! SECTION: Popups - Whitelist diff --git a/AnnoyancesFilter/Popups/sections/push-notifications_general.txt b/AnnoyancesFilter/Popups/sections/push-notifications_general.txt index 63f8746b9d2..24591aaee6f 100644 --- a/AnnoyancesFilter/Popups/sections/push-notifications_general.txt +++ b/AnnoyancesFilter/Popups/sections/push-notifications_general.txt @@ -1,5 +1,5 @@ ! -! This section contains the list of rules that block website push notifications ("subscribe to the news" kind of notifications). +! This section contains the list of generic rules that block website push notifications ("subscribe to the news" kind of notifications). ! ! Good: any type of the rules will be good ! Bad: @@||example.org^$stealth (should be in AdGuard Base - whitelist_stealth.txt) diff --git a/AnnoyancesFilter/Popups/sections/push-notifications_specific.txt b/AnnoyancesFilter/Popups/sections/push-notifications_specific.txt index 072573efd7f..4f9243422cc 100644 --- a/AnnoyancesFilter/Popups/sections/push-notifications_specific.txt +++ b/AnnoyancesFilter/Popups/sections/push-notifications_specific.txt @@ -2,7 +2,7 @@ ! This section contains the list of rules that block website push notifications ("subscribe to the news" kind of notifications). ! ! Good: any type of the rules will be good -! Bad: @@||example.org^$stealth (should be in AdGuard Base - whitelist_stealth.txt) +! Bad: @@||push.org^$domain=example.org (should be in AdGuard Base - push-notifications_whitelist.txt) ! ! SECTION: Push notifications - Specific ! diff --git a/AnnoyancesFilter/Popups/sections/push-notifications_whitelist.txt b/AnnoyancesFilter/Popups/sections/push-notifications_whitelist.txt index 31ca66c6b10..6bdba672425 100644 --- a/AnnoyancesFilter/Popups/sections/push-notifications_whitelist.txt +++ b/AnnoyancesFilter/Popups/sections/push-notifications_whitelist.txt @@ -1,8 +1,9 @@ ! -! This section contains the list of rules that block website push notifications ("subscribe to the news" kind of notifications). +! This section contains the list of rules that fix the problems, caused by incorrect blocking of website push notifications. +! At the bottom of this file, you can find the allowlist that fixes issues caused by the rules from this file. ! -! Good: any type of the rules will be good -! Bad: @@||example.org^$stealth (should be in AdGuard Base - whitelist_stealth.txt) +! Good: @@||popups.org^$domain=example.org +! Bad: ||example.org^ ! !--- Whitelist ! SECTION: Push notifications - Whitelist diff --git a/AnnoyancesFilter/Popups/sections/subscriptions_general.txt b/AnnoyancesFilter/Popups/sections/subscriptions_general.txt index 934f0446aef..78ae8b28fbd 100644 --- a/AnnoyancesFilter/Popups/sections/subscriptions_general.txt +++ b/AnnoyancesFilter/Popups/sections/subscriptions_general.txt @@ -1,9 +1,9 @@ ! -! This section contains the list of rules that block the promotion of subscriptions, newsletters. +! This section contains the list of generic rules that block the promotion of subscriptions, newsletters. ! Examples: "subscribe to our blog", "subscribe to our newsletter" blocks in all kinds of blocks. ! ! Good: any type of the rules will be good -! Bad: @@||example.org^$stealth (should be in AdGuard Base - whitelist_stealth.txt) +! Bad: @@||signup.e2ma.net^$domain=example.org (should be in AdGuard Base - subscriptions_whitelist.txt) ! ! ! diff --git a/AnnoyancesFilter/Popups/sections/subscriptions_specific.txt b/AnnoyancesFilter/Popups/sections/subscriptions_specific.txt index d148c91501a..fd6efebb2c6 100644 --- a/AnnoyancesFilter/Popups/sections/subscriptions_specific.txt +++ b/AnnoyancesFilter/Popups/sections/subscriptions_specific.txt @@ -3,7 +3,7 @@ ! Examples: "subscribe to our blog", "subscribe to our newsletter" blocks in all kinds of blocks. ! ! Good: any type of the rules will be good -! Bad: @@||example.org^$stealth (should be in AdGuard Base - whitelist_stealth.txt) +! Bad: @@||signup.e2ma.net^$domain=example.org (should be in AdGuard Base - subscriptions_whitelist.txt) ! ! SECTION: Subscriptions - Specific ! common names diff --git a/AnnoyancesFilter/Popups/sections/subscriptions_whitelist.txt b/AnnoyancesFilter/Popups/sections/subscriptions_whitelist.txt index df098e35481..0966b738df7 100644 --- a/AnnoyancesFilter/Popups/sections/subscriptions_whitelist.txt +++ b/AnnoyancesFilter/Popups/sections/subscriptions_whitelist.txt @@ -2,8 +2,8 @@ ! This section contains the list of rules that block the promotion of subscriptions, newsletters. ! Examples: "subscribe to our blog", "subscribe to our newsletter" blocks in all kinds of blocks. ! -! Good: any type of the rules will be good -! Bad: @@||example.org^$stealth (should be in AdGuard Base - whitelist_stealth.txt) +! Good: @@||signup.e2ma.net^$domain=example.org +! Bad: ||example.org^ (should be in AdGuard Base - subscriptions_specific.txt) ! !--- Whitelist ! SECTION: Subscriptions - Whitelist