Remove domain prefix for several Russian categories, small clean ups (#3481)

* sber: removed domain prefix

* ozon: replaced domain prefix with full

* wildberries: replaced domain prefix with full, cosmetic changes

* yandex: removed domain prefix, cleaned up a few domains, small cosmetic changes

* x5: replaced domain prefix with full, added missing domain

* mindbox: removed domain prefix

* carrotquest: replaced domain prefix with full

* 2gis: removed ua domain

data/2gis

@@ -11,5 +11,4 @@
 2gis.kz
 2gis.ru
 2gis.tj
-2gis.ua
 2gis.uz

data/carrotquest

@@ -12,14 +12,14 @@ mail-carrotquest.io
 pushgrow.io
 
 # Tracking
-domain:api-eu.carrotquest.app @ads
-domain:api-eu.carrotquest.io @ads
-domain:api-ru.carrotquest.app @ads
-domain:api-ru.carrotquest.io @ads
-domain:api-secure.carrotquest.app @ads
-domain:api-secure.carrottrack.app @ads
-domain:api.carrotquest.app @ads
-domain:api.carrotquest.io @ads
-domain:api.carrottrack.app @ads
-domain:api.dashly.app @ads
-domain:api.dashlytrack.app @ads
+full:api-eu.carrotquest.app @ads
+full:api-eu.carrotquest.io @ads
+full:api-ru.carrotquest.app @ads
+full:api-ru.carrotquest.io @ads
+full:api-secure.carrotquest.app @ads
+full:api-secure.carrottrack.app @ads
+full:api.carrotquest.app @ads
+full:api.carrotquest.io @ads
+full:api.carrottrack.app @ads
+full:api.dashly.app @ads
+full:api.dashlytrack.app @ads

data/category-bank-ru

@@ -1,6 +1,3 @@
-include:sber
-include:tbank-ru
-
 # Alfa Bank
 alfabank.ru
 alfabank.st
@@ -17,6 +14,7 @@ broker.ru
 gazprombank.com
 gazprombank.investments
 gazprombank.ru
+gid.ru
 gpb.ru
 
 # MKB
@@ -38,6 +36,12 @@ abr.ru
 # Russian Agricultural Bank
 rshb.ru
 
+# SberBank
+include:sber
+
+# T-Bank (Tinkoff) and RosBank
+include:tbank-ru
+
 # Tochka bank
 tochka-tech.com
 tochka.com

data/category-gov-ru

@@ -43,7 +43,6 @@ mos.ru          # Moscow
 mosreg.ru       # Moscow Region
 spb.ru          # St. Petersburg
 sevastopol.ru   # Sevastopol
-sev.ru          # Sevastopol
 
 # Republics
 adygeya.ru      # Republic of Adygea

data/category-travel-ru

@@ -10,6 +10,11 @@ avtovokzaly.ru
 # Ostrovok
 ostrovok.ru
 
+# Othello / Otello from 2GIS and Sber
+2gis.ru
+otello.ru
+sber.ru
+
 # Public transport and ticketing
 include:mosmetro
 full:bilet.nspk.ru
@@ -32,3 +37,4 @@ full:arenda.yandex.ru
 
 # Yandex Taxi
 full:taxi.yandex.ru
+fasten.ru

data/mailru-group

@@ -94,6 +94,7 @@ full:xray.mail.ru @ads
 
 # CDNs
 appsmail.ru
+attachmail.ru
 attachmy.com
 bizmrg.com
 cdnmail.ru
@@ -115,6 +116,7 @@ bk.ru
 inbox.ru
 internet.ru
 list.ru
+xmail.ru
 
 ## All Cups
 cups.online
@@ -207,11 +209,11 @@ oneme.ru
 sferum-dev.ru
 sferum.ru
 
-## my.com
+## My.com, myMail
 dev-my.com
 my.com
 
-## my.games (formally left Russian market)
+## My.Games (formally left Russian market)
 dev-my.games
 it-territory.com
 knightspeak.com

data/mindbox

@@ -12,13 +12,13 @@ popmechanic.ru
 summitceo.ru
 
 # Tracking
-domain:api-js.mindbox.ru @ads
-domain:api-ru.mindbox.cloud @ads
-domain:api-staging.mindbox.ru @ads
-domain:api.mindbox.cloud @ads
-domain:api.mindbox.ru @ads
-domain:e.mindbox.ru @ads
-domain:g.mindbox.ru @ads
-domain:s.mindbox.ru @ads
-domain:sentry.mindbox.ru @ads
-domain:sentry.popmechanic.ru @ads
+e.mindbox.ru @ads
+g.mindbox.ru @ads
+s.mindbox.ru @ads
+full:api-js.mindbox.ru @ads
+full:api-ru.mindbox.cloud @ads
+full:api-staging.mindbox.ru @ads
+full:api.mindbox.cloud @ads
+full:api.mindbox.ru @ads
+full:sentry.mindbox.ru @ads
+full:sentry.popmechanic.ru @ads

data/ozon

@@ -44,21 +44,21 @@ xn--80aafgovrgbc7am.xn--p1ai # озондоставка.рф
 xn--e1adjldbbpv.xn--90ais # озонрокет.бел
 
 # Advertising and tracking
-domain:ad.ozone.ru @ads
-domain:adv.ozon.ru @ads
-domain:agency-adv.ozon.ru @ads
-domain:analytics-adv.ozon.ru @ads
-domain:beginners-adv.ozon.ru @ads
-domain:google-analytics-suite.ozon.ru @ads
-domain:loyalnost-adv.ozon.ru @ads
-domain:new-adv.ozon.ru @ads
-domain:prodvizhenie-adv.ozon.ru @ads
-domain:questions-adv.ozon.ru @ads
-domain:sentry.ozon.ru @ads
-domain:xapi.ozon.by @ads
-domain:xapi.ozon.com @ads
-domain:xapi.ozon.com.by @ads
-domain:xapi.ozon.com.kz @ads
-domain:xapi.ozon.kz @ads
-domain:xapi.ozon.ru @ads
-domain:xapi.ozonru.me @ads
+full:ad.ozone.ru @ads
+full:adv.ozon.ru @ads
+full:agency-adv.ozon.ru @ads
+full:analytics-adv.ozon.ru @ads
+full:beginners-adv.ozon.ru @ads
+full:google-analytics-suite.ozon.ru @ads
+full:loyalnost-adv.ozon.ru @ads
+full:new-adv.ozon.ru @ads
+full:prodvizhenie-adv.ozon.ru @ads
+full:questions-adv.ozon.ru @ads
+full:sentry.ozon.ru @ads
+full:xapi.ozon.by @ads
+full:xapi.ozon.com @ads
+full:xapi.ozon.com.by @ads
+full:xapi.ozon.com.kz @ads
+full:xapi.ozon.kz @ads
+full:xapi.ozon.ru @ads
+full:xapi.ozonru.me @ads

data/sber

@@ -9,15 +9,15 @@ sberbank.ru
 sbrf.ru
 
 # Ads/tracking
+ads.sber.ru @ads
+clickstream.sberbank.ru @ads
 neon.click @ads
 sbermarketing.ru @ads
-domain:ads.sber.ru @ads
-domain:clickstream.sberbank.ru @ads
-domain:error-tracking.megamarket.tech @ads
-domain:metrics.21-school.ru @ads
-domain:sentry.sberauto.com @ads
-domain:tracing-http.megamarket.tech @ads
-domain:visor.sberbank.ru @ads
+full:error-tracking.megamarket.tech @ads
+full:metrics.21-school.ru @ads
+full:sentry.sberauto.com @ads
+full:tracing-http.megamarket.tech @ads
+full:visor.sberbank.ru @ads
 
 # Business ecosystem
 id.ru

data/wildberries

@@ -52,7 +52,7 @@ wildberries.ru
 wildberries.tj
 wildberries.tm
 wildberries.uz
-xn--90ab.com
+xn--90ab.com # вб.com
 
 # Typesquatting domains
 velberis.ru
@@ -99,21 +99,21 @@ wolfberries.ru
 
 # IDN ccTLDs
 xn--80acbjgmges7ca.xn--p1ai # вайлдберриз.рф
-xn--80acbjgsdq2cl.xn--p1ai # вайлдберис.рф
+xn--80acbjgsdq2cl.xn--p1ai  # вайлдберис.рф
 
 # Advertising and tracking
-domain:ads-gate.wildberries.ru @ads
-domain:ads-media.wildberries.ru @ads
-domain:ads.wildberries.ru @ads
-domain:advert-api.wb.ru @ads
-domain:advert-api-sandbox.wb.ru @ads
-domain:advert-media-api.wb.ru @ads
-domain:advert-api.wildberries.ru @ads
-domain:advert-api-sandbox.wildberries.ru @ads
-domain:advert-media-api.wildberries.ru @ads
-domain:analytics-stage.wildberries.ru @ads
-domain:analytics.wildberries.ru @ads
-domain:marketing-info.wildberries.ru @ads
-domain:marketplace-sentry.wb.ru @ads
-domain:sentry.wb.ru @ads
-domain:web-analytics.wildberries.ru @ads
+full:ads-gate.wildberries.ru @ads
+full:ads-media.wildberries.ru @ads
+full:ads.wildberries.ru @ads
+full:advert-api.wb.ru @ads
+full:advert-api-sandbox.wb.ru @ads
+full:advert-media-api.wb.ru @ads
+full:advert-api.wildberries.ru @ads
+full:advert-api-sandbox.wildberries.ru @ads
+full:advert-media-api.wildberries.ru @ads
+full:analytics-stage.wildberries.ru @ads
+full:analytics.wildberries.ru @ads
+full:marketing-info.wildberries.ru @ads
+full:marketplace-sentry.wb.ru @ads
+full:sentry.wb.ru @ads
+full:web-analytics.wildberries.ru @ads

data/x5

@@ -31,6 +31,7 @@ x5q.ru
 x5static.net
 x5w.ru
 
-# Ads/tracking
-domain:ads.x5media.ru @ads
-domain:sentry.x5.ru @ads
+# Ads and tracking
+full:ads.x5.ru @ads
+full:ads.x5media.ru @ads
+full:sentry.x5.ru @ads

data/yandex

@@ -1,3 +1,5 @@
+include:kinopoisk
+
 # All .yandex domains
 yandex
 
@@ -89,49 +91,45 @@ yastatic-net.ru
 yastatic.net
 yccdn.ru
 
-# Watching movies, included in the Yandex subscription
-include:kinopoisk
-
-# Ads/tracking
+# Ads and tracking
 adfox.ru @ads
+adfox.yandex.ru @ads
 admetrica.ru @ads
 ads.yandex @ads
+ads.yandex.ru @ads
+adv.yandex.com @ads
+adv.yandex.ru @ads
+an.yandex.ru @ads
+appmetrica.yandex.com @ads
+appmetrica.yandex.net @ads
+appmetrica.yandex.ru @ads
+appmetrica.yango.com @ads
+bs.yandex.ru @ads
+clck.yandex.ru @ads
+counter.yandex.ru @ads
+mc.yandex.ru @ads
+metrika.yandex.com @ads
+metrika.yandex.net @ads
+metrika.yandex.ru @ads
 webvisor.com @ads
 webvisor.org @ads
+yabs.yandex.ru @ads
 yads.tech @ads
 yandex-metrica.ru @ads
 yandexmetrica.com @ads
 yango-ads.com @ads
-domain:adfox.yandex.ru @ads
-domain:adfstat.yandex.ru @ads
-domain:ads.yandex.com @ads
-domain:ads.yandex.ru @ads
-domain:ads.yango.com @ads
-domain:adsdk.yandex.ru @ads
-domain:adv.yandex.com @ads
-domain:adv.yandex.ru @ads
-domain:amc.yandex.ru @ads
-domain:an.yandex.ru @ads
-domain:analytics.mobile.yandex.net @ads
-domain:appmetrica.yandex.com @ads
-domain:appmetrica.yandex.net @ads
-domain:appmetrica.yandex.ru @ads
-domain:appmetrica.yango.com @ads
-domain:browser-updater.yandex.net @ads
-domain:bs.yandex.ru @ads
-domain:clck.yandex.com @ads
-domain:clck.yandex.net @ads
-domain:clck.yandex.ru @ads
-domain:clck.yango.com @ads
-domain:counter.yandex.net @ads
-domain:counter.yandex.ru @ads
-domain:informer.yandex.ru @ads
-domain:mc.yandex.com @ads
-domain:mc.yandex.net @ads
-domain:mc.yandex.ru @ads
-domain:mc.yango.com @ads
-domain:metrika.yandex.ru @ads
-domain:pix.yandex.ru @ads
-domain:pixel.yandex.net @ads
-domain:report.ap.yandex-net.ru @ads
-domain:yabs.yandex.ru @ads
+full:adfstat.yandex.ru @ads
+full:ads.yandex.com @ads
+full:ads.yango.com @ads
+full:adsdk.yandex.ru @ads
+full:amc.yandex.ru @ads
+full:analytics.mobile.yandex.net @ads
+full:clck.yandex.com @ads
+full:clck.yandex.net @ads
+full:clck.yango.com @ads
+full:informer.yandex.ru @ads
+full:mc.yandex.com @ads
+full:mc.yandex.net @ads
+full:mc.yango.com @ads
+full:pixel.yandex.com @ads
+full:report.ap.yandex-net.ru @ads