From fe4611d8dd88ceda6eef9263caad066762ab4ebc Mon Sep 17 00:00:00 2001
From: Alex-302 <alex302@adguard.com>
Date: Mon, 6 Mar 2023 15:12:19 +0200
Subject: [PATCH] Sorted UA rules

---
 .../RussianFilter/sections/adservers_firstparty.txt         | 1 -
 .../UkrainianFilter/sections/adservers_firstparty.txt       | 2 +-
 CyrillicFilters/UkrainianFilter/sections/allowlist.txt      | 6 ------
 CyrillicFilters/UkrainianFilter/sections/antiadblock.txt    | 4 ++--
 CyrillicFilters/common-sections/adservers_firstparty.txt    | 2 +-
 CyrillicFilters/common-sections/allowlist.txt               | 2 +-
 6 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/CyrillicFilters/RussianFilter/sections/adservers_firstparty.txt b/CyrillicFilters/RussianFilter/sections/adservers_firstparty.txt
index 4a34fa7e40b..746b9160b16 100644
--- a/CyrillicFilters/RussianFilter/sections/adservers_firstparty.txt
+++ b/CyrillicFilters/RussianFilter/sections/adservers_firstparty.txt
@@ -9,7 +9,6 @@
 !
 ||api.rnet.plus^$third-party
 ||ex.newsland.com^$third-party
-||exchange.informer.ua^$third-party
 ||news.mirtesen.ru^$third-party
 ||jsn.24smi.net^$third-party
 ||data.24smi.net^$third-party
diff --git a/CyrillicFilters/UkrainianFilter/sections/adservers_firstparty.txt b/CyrillicFilters/UkrainianFilter/sections/adservers_firstparty.txt
index c83ac341782..56b12998379 100644
--- a/CyrillicFilters/UkrainianFilter/sections/adservers_firstparty.txt
+++ b/CyrillicFilters/UkrainianFilter/sections/adservers_firstparty.txt
@@ -7,4 +7,4 @@
 ! Bad: ||legitwebsite.com^$third-party (should be in adservers.txt)
 !
 !
-! test_rule_17
+||exchange.informer.ua^$third-party
diff --git a/CyrillicFilters/UkrainianFilter/sections/allowlist.txt b/CyrillicFilters/UkrainianFilter/sections/allowlist.txt
index 5bd07b70142..814076ef041 100644
--- a/CyrillicFilters/UkrainianFilter/sections/allowlist.txt
+++ b/CyrillicFilters/UkrainianFilter/sections/allowlist.txt
@@ -5,10 +5,6 @@
 ! Bad:  @@||example.org^$stealth (should be in AdGuard Base - allowlist_stealth.txt)
 !
 !
-! unian.ua antiadblock
-@@||imasdk.googleapis.com/js/sdkloader/ima3.js$domain=unian.ua
-@@||gaua.hit.gemius.pl/gemiuslib.js$domain=unian.ua
-@@||gaua.hit.gemius.pl/gplayer.js$domain=unian.ua
 ! https://github.com/AdguardTeam/AdguardFilters/issues/102256
 @@||praimed.ua/img/bn/banner-*.png
 ! https://github.com/AdguardTeam/AdguardFilters/issues/74348
@@ -43,8 +39,6 @@ eplus.kiev.ua#@#.banner-square
 join.ua#@##adriver_banner
 ! https://github.com/AdguardTeam/ExperimentalFilter/issues/2188
 @@||stimul.dp.ua/media/files/banners_
-! https://github.com/AdguardTeam/ExperimentalFilter/issues/2188
-@@||stimul.dp.ua/media/files/banners_
 ! http://forum.adguard.com/showthread.php?9838
 @@||fidobank.ua/banners/
 ! abo.ua filter is broken by Adguard injections
diff --git a/CyrillicFilters/UkrainianFilter/sections/antiadblock.txt b/CyrillicFilters/UkrainianFilter/sections/antiadblock.txt
index 84fa8ad2726..9e0a55783d6 100644
--- a/CyrillicFilters/UkrainianFilter/sections/antiadblock.txt
+++ b/CyrillicFilters/UkrainianFilter/sections/antiadblock.txt
@@ -43,10 +43,10 @@ ps4.in.ua#$#.adsbygoogle { height: 1px!important; }
 ||gaua.hit.gemius.pl/gemiuslib.js$script,xmlhttprequest,redirect=noopjs,domain=1plus1.video|1plus1.ua,important
 ! https://github.com/AdguardTeam/AdguardFilters/issues/89348
 @@||unian.net/static/pubads.ad
-@@||imasdk.googleapis.com/js/sdkloader/ima3.js$domain=unian.net
+@@||imasdk.googleapis.com/js/sdkloader/ima3.js$domain=unian.net|unian.ua
 !#safari_cb_affinity(general,privacy)
 @@||gaua.hit.gemius.pl/gplayer.js$domain=1plus1.video|1plus1.ua|unian.net
-@@||gaua.hit.gemius.pl/gemiuslib.js$domain=unian.net
+@@||gaua.hit.gemius.pl/gemiuslib.js$domain=unian.net|unian.ua
 !#safari_cb_affinity
 !
 ! prozoro.net.ua - ads reinjection
diff --git a/CyrillicFilters/common-sections/adservers_firstparty.txt b/CyrillicFilters/common-sections/adservers_firstparty.txt
index 868b4ef9c8e..8f96496781e 100644
--- a/CyrillicFilters/common-sections/adservers_firstparty.txt
+++ b/CyrillicFilters/common-sections/adservers_firstparty.txt
@@ -6,4 +6,4 @@
 ! Bad: /banner.jpg (should be in general_url.txt)
 ! Bad: ||legitwebsite.com^$third-party (should be in adservers.txt)
 !
-! test_rule_1/28
\ No newline at end of file
+! test_common_adservers_firstparty.txt
\ No newline at end of file
diff --git a/CyrillicFilters/common-sections/allowlist.txt b/CyrillicFilters/common-sections/allowlist.txt
index 3849919394d..203764af1a8 100644
--- a/CyrillicFilters/common-sections/allowlist.txt
+++ b/CyrillicFilters/common-sections/allowlist.txt
@@ -4,4 +4,4 @@
 ! Good: example.org#@#.ad
 ! Bad:  @@||example.org^$stealth (should be in AdGuard Base - allowlist_stealth.txt)
 !
-! test_rule_3
+! test_common_allowlist.txt