From d4db1c8de9c187afa7ed111d7bf509705faf3142 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Tue, 20 Feb 2018 07:59:36 -0600 Subject: [PATCH] updates to AdGuard filters ref #103 --- data/FilterList.json | 102 +++++++++++++++++++-------------- data/FilterListLanguage.json | 24 ++++++++ data/FilterListMaintainer.json | 4 ++ data/Fork.json | 12 ++++ 4 files changed, 100 insertions(+), 42 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 640a769fb..38fda931e 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -253,7 +253,7 @@ }, { "id": 15, - "description": "A filter list that fixes filtration errors in an alternative way due to limitations of adblockers other than Adguard or those using Webkit content blocker API.", + "description": "A filter list that fixes filtration errors in an alternative way due to limitations of adblockers other than AdGuard or those using Webkit content blocker API.", "descriptionSourceUrl": "https://raw.githubusercontent.com/SlowMemory/List-KR/master/unbreak.txt", "discontinuedDate": null, "donateUrl": null, @@ -2782,7 +2782,7 @@ "homeUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#filter-for-useful-ads", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", "licenseId": 12, - "name": "Adguard Useful Ads Filter", + "name": "AdGuard Useful Ads Filter", "policyUrl": null, "publishedDate": null, "submissionUrl": null, @@ -2792,20 +2792,20 @@ { "id": 156, "description": "Filter that enables removing of the ads from websites with Turkish content.", - "descriptionSourceUrl": "https://adguard.com/en/filters.html", + "descriptionSourceUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#turkish-filter", "discontinuedDate": null, "donateUrl": null, "emailAddress": null, "forumUrl": "https://forum.adguard.com/index.php?categories/filter-rules.66/", - "homeUrl": "https://adguard.com/en/filters.html", + "homeUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#turkish-filter", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", "licenseId": 12, - "name": "Adguard Turkish Filter", + "name": "AdGuard Turkish Filter", "policyUrl": null, "publishedDate": null, "submissionUrl": null, "syntaxId": 6, - "viewUrl": "https://adguard.com/en/filter-rules.html?id=13" + "viewUrl": "https://filters.adtidy.org/extension/chromium/filters/13.txt" }, { "id": 157, @@ -2818,7 +2818,7 @@ "homeUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#spyware-filter", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", "licenseId": 12, - "name": "Adguard Spyware Filter", + "name": "AdGuard Spyware Filter", "policyUrl": null, "publishedDate": null, "submissionUrl": null, @@ -2828,20 +2828,20 @@ { "id": 158, "description": "Filter that enables removing of the ads from websites in Spanish.", - "descriptionSourceUrl": "https://adguard.com/en/filters.html", + "descriptionSourceUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#spanish-portuguese-filter", "discontinuedDate": null, "donateUrl": null, "emailAddress": null, "forumUrl": "https://forum.adguard.com/index.php?categories/filter-rules.66/", - "homeUrl": "https://adguard.com/en/filters.html", + "homeUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#spanish-portuguese-filter", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", "licenseId": 12, - "name": "Adguard Spanish/Portuguese Filter", + "name": "AdGuard Spanish/Portuguese Filter", "policyUrl": null, "publishedDate": null, "submissionUrl": null, "syntaxId": 6, - "viewUrl": "https://adguard.com/en/filter-rules.html?id=9" + "viewUrl": "https://filters.adtidy.org/extension/chromium/filters/9.txt" }, { "id": 159, @@ -2854,30 +2854,30 @@ "homeUrl": "https://adguard.com/en/filters.html", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", "licenseId": 12, - "name": "Adguard Social Media Filter", + "name": "AdGuard Social Media Filter", "policyUrl": null, "publishedDate": null, "submissionUrl": null, "syntaxId": 6, - "viewUrl": "https://adguard.com/en/filter-rules.html?id=4" + "viewUrl": "https://filters.adtidy.org/extension/chromium/filters/4.txt" }, { "id": 160, "description": "Filter that blocks ads on iOS mobile devices in Safari browser. Contains all known mobile ad networks.", - "descriptionSourceUrl": "https://adguard.com/en/filters.html", + "descriptionSourceUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#safari-filter", "discontinuedDate": null, "donateUrl": null, "emailAddress": null, "forumUrl": "https://forum.adguard.com/index.php?categories/filter-rules.66/", - "homeUrl": "https://adguard.com/en/filters.html", + "homeUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#safari-filter", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", "licenseId": 12, - "name": "Adguard Safari Filter", + "name": "AdGuard Safari Filter", "policyUrl": null, "publishedDate": null, "submissionUrl": null, "syntaxId": 6, - "viewUrl": "https://adguard.com/en/filter-rules.html?id=12" + "viewUrl": "https://filters.adtidy.org/extension/chromium/filters/12.txt" }, { "id": 161, @@ -2890,7 +2890,7 @@ "homeUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#russian-filter", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", "licenseId": 12, - "name": "Adguard Russian Filter", + "name": "AdGuard Russian Filter", "policyUrl": null, "publishedDate": null, "submissionUrl": null, @@ -2900,38 +2900,38 @@ { "id": 162, "description": "Filter that blocks ads on mobile devices. Contains all known mobile ad networks.", - "descriptionSourceUrl": "https://adguard.com/en/filters.html", + "descriptionSourceUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#mobile-ads-filter", "discontinuedDate": null, "donateUrl": null, "emailAddress": null, "forumUrl": "https://forum.adguard.com/index.php?categories/filter-rules.66/", - "homeUrl": "https://adguard.com/en/filters.html", + "homeUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#mobile-ads-filter", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", "licenseId": 12, - "name": "Adguard Mobile Ads Filter", + "name": "AdGuard Mobile Ads Filter", "policyUrl": null, "publishedDate": null, "submissionUrl": null, "syntaxId": 6, - "viewUrl": "https://adguard.com/en/filter-rules.html?id=11" + "viewUrl": "https://filters.adtidy.org/extension/chromium/filters/11.txt" }, { "id": 163, "description": "Filter that enables removing of the ads from websites in Japanese.", - "descriptionSourceUrl": "https://adguard.com/en/filters.html", + "descriptionSourceUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#japanese-filter", "discontinuedDate": null, "donateUrl": null, "emailAddress": null, "forumUrl": "https://forum.adguard.com/index.php?categories/filter-rules.66/", - "homeUrl": "https://adguard.com/en/filters.html", + "homeUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#japanese-filter", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", "licenseId": 12, - "name": "Adguard Japanese Filter", + "name": "AdGuard Japanese Filter", "policyUrl": null, "publishedDate": null, "submissionUrl": null, "syntaxId": 6, - "viewUrl": "https://adguard.com/en/filter-rules.html?id=7" + "viewUrl": "https://filters.adtidy.org/extension/chromium/filters/7.txt" }, { "id": 164, @@ -2944,7 +2944,7 @@ "homeUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#german-filter", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", "licenseId": 12, - "name": "Adguard German Filter", + "name": "AdGuard German Filter", "policyUrl": null, "publishedDate": null, "submissionUrl": null, @@ -2954,20 +2954,20 @@ { "id": 165, "description": "Filter designed to test certain hazardous filtering rules before they are added to the basic filters.", - "descriptionSourceUrl": "https://adguard.com/en/filters.html", + "descriptionSourceUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#experimental-filter", "discontinuedDate": null, "donateUrl": null, "emailAddress": null, "forumUrl": "https://forum.adguard.com/index.php?categories/filter-rules.66/", - "homeUrl": "https://adguard.com/en/filters.html", + "homeUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#experimental-filter", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", "licenseId": 12, - "name": "Adguard Experimental Filter", + "name": "AdGuard Experimental Filter", "policyUrl": null, "publishedDate": null, "submissionUrl": null, "syntaxId": 6, - "viewUrl": "https://adguard.com/en/filter-rules.html?id=5" + "viewUrl": "https://filters.adtidy.org/extension/chromium/filters/5.txt" }, { "id": 166, @@ -2980,7 +2980,7 @@ "homeUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#english-filter", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", "licenseId": 12, - "name": "Adguard English Filter", + "name": "AdGuard English Filter", "policyUrl": null, "publishedDate": null, "submissionUrl": null, @@ -2990,33 +2990,33 @@ { "id": 167, "description": "Filter that enables removing of the ads from websites with Dutch content.", - "descriptionSourceUrl": "https://adguard.com/en/filters.html", + "descriptionSourceUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#dutch-filter", "discontinuedDate": null, "donateUrl": null, "emailAddress": null, "forumUrl": "https://forum.adguard.com/index.php?categories/filter-rules.66/", - "homeUrl": "https://adguard.com/en/filters.html", + "homeUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#dutch-filter", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", "licenseId": 12, - "name": "Adguard Dutch Filter", + "name": "AdGuard Dutch Filter", "policyUrl": null, "publishedDate": null, "submissionUrl": null, "syntaxId": 6, - "viewUrl": "https://adguard.com/en/filter-rules.html?id=8" + "viewUrl": "https://filters.adtidy.org/extension/chromium/filters/8.txt" }, { "id": 168, "description": "A filter composed from several other filters (English filter, Social media filter, Spyware filter, Mobile ads filter, EasyList and EasyPrivacy) and simplified specifically to be better compatible with DNS-level ad blocking. This filter is used by AdGuard DNS servers to block ads.", - "descriptionSourceUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#domains", + "descriptionSourceUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#simplified-domain-names-filter", "discontinuedDate": null, "donateUrl": null, "emailAddress": null, "forumUrl": null, "homeUrl": "https://github.com/AdguardTeam/AdguardDNS", - "issuesUrl": null, + "issuesUrl": "https://github.com/AdguardTeam/AdguardDNS/issues", "licenseId": 12, - "name": "Adguard Simplified Domain Names Filter", + "name": "AdGuard Simplified Domain Names Filter", "policyUrl": null, "publishedDate": null, "submissionUrl": null, @@ -3034,7 +3034,7 @@ "homeUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#annoyances-filter", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", "licenseId": 12, - "name": "Adguard Annoyances Filter", + "name": "AdGuard Annoyances Filter", "policyUrl": null, "publishedDate": null, "submissionUrl": null, @@ -5887,7 +5887,7 @@ }, { "id": 328, - "description": "This list includes uBO-specific versions of filters, and are meant to be accessed by uBlock Origin, Nano Adblocker and Adguard whenever they load the main Norwegian list.", + "description": "This list includes uBO-specific versions of filters, and are meant to be accessed by uBlock Origin, Nano Adblocker and AdGuard whenever they load the main Norwegian list.", "descriptionSourceUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExtensionsForUBO%26Nano.txt", "discontinuedDate": null, "donateUrl": "https://www.paypal.me/DandeeSprout", @@ -6292,11 +6292,29 @@ "homeUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#french-filter", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", "licenseId": 12, - "name": "Adguard French Filter", + "name": "AdGuard French Filter", "policyUrl": null, "publishedDate": null, "submissionUrl": null, "syntaxId": 6, "viewUrl": "https://filters.adtidy.org/extension/chromium/filters/16.txt" + }, + { + "id": 351, + "description": "This is an AdGuard-specific supplement for the Adblock polskie reguĊ‚y filter. It specifically removes adverts on Polish language websites.", + "descriptionSourceUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#polish-ads-filter", + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": "https://forum.adguard.com/index.php?categories/filter-rules.66/", + "homeUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#polish-ads-filter", + "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", + "licenseId": 12, + "name": "AdGuard Polish Filter", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 6, + "viewUrl": "https://filters.adtidy.org/extension/chromium/filters/238.txt" } ] \ No newline at end of file diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index 36b41e64a..5dd50dd52 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -43,10 +43,26 @@ "filterListId": 84, "languageId": 11 }, + { + "filterListId": 156, + "languageId": 48 + }, + { + "filterListId": 158, + "languageId": 13 + }, + { + "filterListId": 158, + "languageId": 79 + }, { "filterListId": 161, "languageId": 18 }, + { + "filterListId": 163, + "languageId": 141 + }, { "filterListId": 164, "languageId": 167 @@ -55,6 +71,10 @@ "filterListId": 166, "languageId": 110 }, + { + "filterListId": 167, + "languageId": 108 + }, { "filterListId": 216, "languageId": 11 @@ -174,5 +194,9 @@ { "filterListId": 350, "languageId": 163 + }, + { + "filterListId": 351, + "languageId": 11 } ] \ No newline at end of file diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 187ec4cdd..f990af71f 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -438,5 +438,9 @@ { "filterListId": 350, "maintainerId": 46 + }, + { + "filterListId": 351, + "maintainerId": 46 } ] \ No newline at end of file diff --git a/data/Fork.json b/data/Fork.json index da55d5421..9f1426d11 100644 --- a/data/Fork.json +++ b/data/Fork.json @@ -19,6 +19,14 @@ "forkFilterListId": 16, "upstreamFilterListId": 278 }, + { + "forkFilterListId": 158, + "upstreamFilterListId": 258 + }, + { + "forkFilterListId": 163, + "upstreamFilterListId": 262 + }, { "forkFilterListId": 164, "upstreamFilterListId": 293 @@ -27,6 +35,10 @@ "forkFilterListId": 166, "upstreamFilterListId": 301 }, + { + "forkFilterListId": 167, + "upstreamFilterListId": 295 + }, { "forkFilterListId": 312, "upstreamFilterListId": 311