From 06ff6c33c3be1028142ddb2c080c5d68d5bf0ef4 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Tue, 20 Feb 2018 07:28:00 -0600 Subject: [PATCH] updates to adguard lists ref #103 --- data/FilterList.json | 80 +++++++++++++++++++++------------- data/FilterListLanguage.json | 12 +++++ data/FilterListMaintainer.json | 4 ++ data/Fork.json | 8 ++++ 4 files changed, 73 insertions(+), 31 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 4891609db..640a769fb 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -2773,21 +2773,21 @@ }, { "id": 155, - "description": "Filter that unblocks ads that may be useful to users. Advertising that falls under this filter shall comply with a set of rules.", - "descriptionSourceUrl": "https://adguard.com/en/filters.html", + "description": "Filter that unblocks ads that may be useful to users.", + "descriptionSourceUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#filter-for-useful-ads", "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#filter-for-useful-ads", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", - "licenseId": 5, + "licenseId": 12, "name": "Adguard Useful Ads Filter", "policyUrl": null, "publishedDate": null, "submissionUrl": null, "syntaxId": 6, - "viewUrl": "https://adguard.com/en/filter-rules.html?id=10" + "viewUrl": "https://filters.adtidy.org/extension/chromium/filters/10.txt" }, { "id": 156, @@ -2799,7 +2799,7 @@ "forumUrl": "https://forum.adguard.com/index.php?categories/filter-rules.66/", "homeUrl": "https://adguard.com/en/filters.html", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", - "licenseId": 5, + "licenseId": 12, "name": "Adguard Turkish Filter", "policyUrl": null, "publishedDate": null, @@ -2810,20 +2810,20 @@ { "id": 157, "description": "The most comprehensive list of various online counters and web analytics tools. If you do not want your actions on the Internet be tracked, use this filter.", - "descriptionSourceUrl": "https://adguard.com/en/filters.html", + "descriptionSourceUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#spyware-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#spyware-filter", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", - "licenseId": 5, + "licenseId": 12, "name": "Adguard Spyware Filter", "policyUrl": null, "publishedDate": null, "submissionUrl": null, "syntaxId": 6, - "viewUrl": "https://adguard.com/en/filter-rules.html?id=3" + "viewUrl": "https://filters.adtidy.org/extension/chromium/filters/3.txt" }, { "id": 158, @@ -2835,7 +2835,7 @@ "forumUrl": "https://forum.adguard.com/index.php?categories/filter-rules.66/", "homeUrl": "https://adguard.com/en/filters.html", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", - "licenseId": 5, + "licenseId": 12, "name": "Adguard Spanish/Portuguese Filter", "policyUrl": null, "publishedDate": null, @@ -2853,7 +2853,7 @@ "forumUrl": "https://forum.adguard.com/index.php?categories/filter-rules.66/", "homeUrl": "https://adguard.com/en/filters.html", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", - "licenseId": 5, + "licenseId": 12, "name": "Adguard Social Media Filter", "policyUrl": null, "publishedDate": null, @@ -2871,7 +2871,7 @@ "forumUrl": "https://forum.adguard.com/index.php?categories/filter-rules.66/", "homeUrl": "https://adguard.com/en/filters.html", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", - "licenseId": 5, + "licenseId": 12, "name": "Adguard Safari Filter", "policyUrl": null, "publishedDate": null, @@ -2881,21 +2881,21 @@ }, { "id": 161, - "description": "Filter that enables removing of the ads from websites in Russian.", - "descriptionSourceUrl": "https://adguard.com/en/filters.html", + "description": "Filter that enables removing of the ads from websites in Russian. The filter was created 5 years ago. Initially, the work on creation of this filter was based on RU AdList filter and a set of rules developed by us. Subsequently, the filter was developed completely independently, so at this point there are very little intersections with RU AdList left.", + "descriptionSourceUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#russian-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#russian-filter", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", - "licenseId": 5, + "licenseId": 12, "name": "Adguard Russian Filter", "policyUrl": null, "publishedDate": null, "submissionUrl": null, "syntaxId": 6, - "viewUrl": "https://adguard.com/en/filter-rules.html?id=1" + "viewUrl": "https://filters.adtidy.org/extension/chromium/filters/1.txt" }, { "id": 162, @@ -2907,7 +2907,7 @@ "forumUrl": "https://forum.adguard.com/index.php?categories/filter-rules.66/", "homeUrl": "https://adguard.com/en/filters.html", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", - "licenseId": 5, + "licenseId": 12, "name": "Adguard Mobile Ads Filter", "policyUrl": null, "publishedDate": null, @@ -2925,7 +2925,7 @@ "forumUrl": "https://forum.adguard.com/index.php?categories/filter-rules.66/", "homeUrl": "https://adguard.com/en/filters.html", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", - "licenseId": 5, + "licenseId": 12, "name": "Adguard Japanese Filter", "policyUrl": null, "publishedDate": null, @@ -2936,20 +2936,20 @@ { "id": 164, "description": "Filter that enables removing of the ads from websites with German content.", - "descriptionSourceUrl": "https://adguard.com/en/filters.html", + "descriptionSourceUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#german-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#german-filter", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", - "licenseId": 5, + "licenseId": 12, "name": "Adguard German Filter", "policyUrl": null, "publishedDate": null, "submissionUrl": null, "syntaxId": 6, - "viewUrl": "https://adguard.com/en/filter-rules.html?id=6" + "viewUrl": "https://filters.adtidy.org/extension/chromium/filters/6.txt" }, { "id": 165, @@ -2961,7 +2961,7 @@ "forumUrl": "https://forum.adguard.com/index.php?categories/filter-rules.66/", "homeUrl": "https://adguard.com/en/filters.html", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", - "licenseId": 5, + "licenseId": 12, "name": "Adguard Experimental Filter", "policyUrl": null, "publishedDate": null, @@ -2985,7 +2985,7 @@ "publishedDate": null, "submissionUrl": null, "syntaxId": 6, - "viewUrl": "https://adguard.com/en/filter-rules.html?id=2" + "viewUrl": "https://filters.adtidy.org/extension/chromium/filters/2.txt" }, { "id": 167, @@ -2997,7 +2997,7 @@ "forumUrl": "https://forum.adguard.com/index.php?categories/filter-rules.66/", "homeUrl": "https://adguard.com/en/filters.html", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", - "licenseId": 5, + "licenseId": 12, "name": "Adguard Dutch Filter", "policyUrl": null, "publishedDate": null, @@ -3026,20 +3026,20 @@ { "id": 169, "description": "Blocks irritating elements on webpages, including cookie notices, third-party widgets and in-page popups (Doesn’t include social media widgets and buttons, to block them you can still use Social media filter separately). It was inspired by Fanboy Annoyances List, but doesn’t duplicate it, so you can use them both together.", - "descriptionSourceUrl": "https://adguard.com/en/filters.html", + "descriptionSourceUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#annoyances-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#annoyances-filter", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", - "licenseId": 5, + "licenseId": 12, "name": "Adguard Annoyances Filter", "policyUrl": null, "publishedDate": null, "submissionUrl": null, "syntaxId": 6, - "viewUrl": "https://adguard.com/en/filter-rules.html?id=14" + "viewUrl": "https://filters.adtidy.org/extension/chromium/filters/14.txt" }, { "id": 170, @@ -6280,5 +6280,23 @@ "submissionUrl": null, "syntaxId": 7, "viewUrl": "https://raw.githubusercontent.com/PolishFiltersTeam/PolishAnnoyanceFilters/master/PPB_uBlock_AdGuard.txt" + }, + { + "id": 350, + "description": "Filter that enables removing of the ads from websites with French content.", + "descriptionSourceUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#french-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#french-filter", + "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", + "licenseId": 12, + "name": "Adguard French Filter", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 6, + "viewUrl": "https://filters.adtidy.org/extension/chromium/filters/16.txt" } ] \ No newline at end of file diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index d383ce59a..36b41e64a 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -43,6 +43,14 @@ "filterListId": 84, "languageId": 11 }, + { + "filterListId": 161, + "languageId": 18 + }, + { + "filterListId": 164, + "languageId": 167 + }, { "filterListId": 166, "languageId": 110 @@ -162,5 +170,9 @@ { "filterListId": 340, "languageId": 99 + }, + { + "filterListId": 350, + "languageId": 163 } ] \ No newline at end of file diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 8c628aa07..187ec4cdd 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -434,5 +434,9 @@ { "filterListId": 169, "maintainerId": 46 + }, + { + "filterListId": 350, + "maintainerId": 46 } ] \ No newline at end of file diff --git a/data/Fork.json b/data/Fork.json index 4613d8311..da55d5421 100644 --- a/data/Fork.json +++ b/data/Fork.json @@ -19,6 +19,10 @@ "forkFilterListId": 16, "upstreamFilterListId": 278 }, + { + "forkFilterListId": 164, + "upstreamFilterListId": 293 + }, { "forkFilterListId": 166, "upstreamFilterListId": 301 @@ -30,5 +34,9 @@ { "forkFilterListId": 313, "upstreamFilterListId": 311 + }, + { + "forkFilterListId": 350, + "upstreamFilterListId": 12 } ] \ No newline at end of file