Changed sections descriptions in new files of Annoyances filter

2026-08-31 12:23:36 +00:00 · 2022-07-21 00:14:42 +03:00
parent 08056270b0
commit 63e92c446b
12 changed files with 28 additions and 33 deletions
--- 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/*
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
 !
--- 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
--- 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)
 !
 !
 !
--- 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
--- 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