diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 52e319d2d..796f379fa 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -8,6 +8,11 @@ Check out the FilterLists Hub, a place To submit a new list or update data about an existing list, please submit a pull request to [data](https://github.com/collinbarrett/FilterLists/tree/master/data) in conjunction with the data model described [here](https://github.com/collinbarrett/FilterLists/wiki/Data-Model_sidebar). Alternatively, you can [open a new issue](https://github.com/collinbarrett/FilterLists/issues/new) providing information for all of the fields described in the [data model](https://github.com/collinbarrett/FilterLists/wiki/Data-Model_sidebar). +While we are generally very open and welcoming of any new or changed lists, a few conditions apply (although loosely): + +* Adding the smaller text files that make up one complete list, e.g. *[EasyList General Block Popup](https://raw.githubusercontent.com/easylist/easylist/master/easylist/easylist_general_block_popup.txt)*, is not usually done. We do however do it for the language files of *[ABP Anti-Circumvention Filter List](https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt)*; but due to its often-changing entries, those files should have ≥5 entries that cover ≥3 sites at the time of addition. +* Since `CHEF-KOCH` has a registered history of behaving aggressively and unfairly towards other filterlist makers and the FilterLists.com community, a case to add any of his lists would have had to be very strong, and mass additions are out of the question. + ## Adding or Updating Rules FilterLists does not maintain any of these lists. It serves only as a discovery tool to direct users to lists that they may want to use. If you want to request addition, modification, or removal of a rule from a list, you will need to contact the maintainers of that list directly. FilterLists provides a variety of ways you can get in contact with the maintainers to do so. @@ -84,4 +89,4 @@ The Agent takes the following command line arguments: ### Debugging 1. Execute `docker container ls -a` to find the `CONTAINER ID` of the container in question. -2. Execute `docker logs [CONTAINER ID]` replacing `[CONTAINER ID]` with the hash from step 1 to view the logs from that container. \ No newline at end of file +2. Execute `docker logs [CONTAINER ID]` replacing `[CONTAINER ID]` with the hash from step 1 to view the logs from that container. diff --git a/.github/README.md b/.github/README.md index 590d35a0f..0729a5070 100644 --- a/.github/README.md +++ b/.github/README.md @@ -12,20 +12,20 @@ Azure DevOps builds Azure DevOps tests Azure DevOps releases -Docker Pulls +Docker Pulls
An ASP.NET Core API CRUD-ing with a MariaDB instance via EF Core.

Website: Website Azure DevOps builds Azure DevOps releases -Docker Pulls +Docker Pulls
A React & TypeScript UI primarily featuring a react-table instance.

Agent: Azure DevOps builds Azure DevOps tests Azure DevOps releases -Docker Pulls +Docker Pulls
A .NET Core console application performing crawling, archiving, and URL validation.

# Background @@ -128,10 +128,10 @@ The Agent takes the following command line arguments: # Acknowledgements - - Imre Kristoffer Eilertsen [@DandelionSprout](https://github.com/DandelionSprout) : major contributor - - Raymond Hill [@gorhill](https://github.com/gorhill) : uBlock Origin owner, advised on some technical aspects of FilterLists - - Andrey Meshkov [@ameshkov](https://github.com/ameshkov) : AdGuard CTO, advised on some technical aspects of FilterLists - - [More contributors](https://github.com/collinbarrett/FilterLists/graphs/contributors) +- Imre Kristoffer Eilertsen [@DandelionSprout](https://github.com/DandelionSprout) : major contributor +- Raymond Hill [@gorhill](https://github.com/gorhill) : uBlock Origin owner, advised on some technical aspects of FilterLists +- Andrey Meshkov [@ameshkov](https://github.com/ameshkov) : AdGuard CTO, advised on some technical aspects of FilterLists +- [More contributors](https://github.com/collinbarrett/FilterLists/graphs/contributors) # Miscellany @@ -152,4 +152,4 @@ We respect your privacy. That is the whole point of this project. The only minor ## Internet Explorer -FilterLists does not support Internet Explorer. To view a smaller, TPL-only archive with subscribable links, right-click on [this link](https://raw.githubusercontent.com/collinbarrett/FilterLists/master/data/TPLSubscriptionAssistant.html), choose to save it as an HTML file, and open it in Internet Explorer ≥9. \ No newline at end of file +FilterLists does not support Internet Explorer. To view a smaller, TPL-only archive with subscribable links, right-click on [this link](https://raw.githubusercontent.com/collinbarrett/FilterLists/master/data/TPLSubscriptionAssistant.html), choose to save it as an HTML file, and open it in Internet Explorer ≥9. diff --git a/data/Dependent.json b/data/Dependent.json index a9ddcc698..ce3203bbf 100644 --- a/data/Dependent.json +++ b/data/Dependent.json @@ -1,8 +1,4 @@ [ - { - "dependentFilterListId": 344, - "dependencyFilterListId": 30 - }, { "dependentFilterListId": 344, "dependencyFilterListId": 301 @@ -22,5 +18,13 @@ { "dependentFilterListId": 853, "dependencyFilterListId": 97 + }, + { + "dependentFilterListId": 1816, + "dependencyFilterListId": 60 + }, + { + "dependentFilterListId": 1817, + "dependencyFilterListId": 347 } ] \ No newline at end of file diff --git a/data/FilterList.json b/data/FilterList.json index f8c92ddf3..24c1ca095 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -328,7 +328,7 @@ "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", - "licenseId": 5, + "licenseId": 40, "name": "Peter Lowe's List", "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 28, @@ -662,7 +662,7 @@ "homeUrl": "https://kadantiscam.netlify.com/", "issuesUrl": "https://github.com/PolishFiltersTeam/KADhosts/issues", "licenseId": 8, - "name": "KAD Hosts File", + "name": "KADhosts", "publishedDate": "2016-11-20T11:41:02", "submissionUrl": "https://kadantiscam.netlify.com/#contact", "syntaxId": 1, @@ -4035,18 +4035,17 @@ }, { "id": 349, - "chatUrl": "https://discord.me/polskiefiltry", - "description": "Supplement list for Polish Annoyance Filters, only for uBlock & AdGuard.", - "descriptionSourceUrl": "https://github.com/PolishFiltersTeam/PolishAnnoyanceFilters", - "homeUrl": "https://polishannoyancefilters.netlify.com", - "issuesUrl": "https://github.com/PolishFiltersTeam/PolishAnnoyanceFilters/issues", - "licenseId": 9, - "name": "Polish Annoyance Filters - Supplement for uBlock & AdGuard", - "publishedDate": "2017-10-23T00:00:00", - "submissionUrl": "https://polishannoyancefilters.netlify.com/issues", - "syntaxId": 4, - "updatedDate": "2019-04-12T18:00:23", - "viewUrl": "https://raw.githubusercontent.com/PolishFiltersTeam/PolishAnnoyanceFilters/master/PPB_uBlock_AdGuard.txt" + "description": "Polish hosts file for blocking scams (without controversial pages => https://github.com/PolishFiltersTeam/KAD/issues/649).", + "emailAddress": "polishjarvis@gmail.com", + "homeUrl": "https://kadantiscam.netlify.com/", + "issuesUrl": "https://github.com/PolishFiltersTeam/KADhosts/issues", + "licenseId": 8, + "name": "KADHosts (without controversies)", + "submissionUrl": "https://kadantiscam.netlify.com/#contact", + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/PolishFiltersTeam/KADhosts/master/KADhosts_without_controversies.txt", + "viewUrlMirror1": "https://gitcdn.xyz/repo/PolishFiltersTeam/KADhosts/master/KADhosts_without_controversies.txt", + "viewUrlMirror2": "https://rawcdn.githack.com/PolishFiltersTeam/KADhosts/master/KADhosts_without_controversies.txt" }, { "id": 350, @@ -5096,7 +5095,7 @@ "donateUrl": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=HU4EDJZP2S9QA", "homeUrl": "https://firebog.net/", "licenseId": 2, - "name": "EasyList Hosts", + "name": "EasyList (Hosts)", "syntaxId": 2, "updatedDate": "2019-04-15T08:22:11", "viewUrl": "https://v.firebog.net/hosts/Easylist.txt" @@ -5644,15 +5643,15 @@ }, { "id": 508, - "description": "Whitelist of section with promotion of fake science/news. More at: https://github.com/azet12/KAD/issues/649.", + "description": "Whitelist of section with promotion of fake science/news. More at: https://github.com/PolishFiltersTeam/KAD/issues/649.", "descriptionSourceUrl": "https://github.com/PolishFiltersTeam/KAD", - "emailAddress": "kadrep@outlook.com", + "emailAddress": "polishjarvis@gmail.com", "homeUrl": "https://kadantiscam.netlify.com/", "issuesUrl": "https://github.com/PolishFiltersTeam/KAD/issues", "licenseId": 8, "name": "KAD - The Whitelist of the Controversial Pages", "syntaxId": 28, - "viewUrl": "https://raw.githubusercontent.com/azet12/KAD/gh-pages/assets/other/kadfakewhitelist.txt", + "viewUrl": "https://raw.githubusercontent.com/PolishFiltersTeam/KAD/gh-pages/assets/other/kadfakewhitelist.txt", "viewUrlMirror1": "https://raw.githubusercontent.com/PolishFiltersTeam/KAD/gh-pages/assets/other/kadfakewhitelist.txt" }, { @@ -5920,7 +5919,7 @@ "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Chinese", + "name": "ABP Anti-Circumvention Filter List - Chinese Only", "publishedDate": "2018-05-15T09:50:43", "syntaxId": 3, "updatedDate": "2019-02-21T09:32:36", @@ -5934,40 +5933,12 @@ "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Czech", + "name": "ABP Anti-Circumvention Filter List - Czech Only", "publishedDate": "2018-05-15T09:50:43", "syntaxId": 3, "updatedDate": "2019-03-25T21:10:14", "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/czech.txt" }, - { - "id": 571, - "description": "Filter list designed to fight circumvention ads in Adblock Plus", - "descriptionSourceUrl": "https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt", - "emailAddress": "filters+cv@adblockplus.org", - "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", - "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", - "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Danish", - "publishedDate": "2018-08-02T13:05:29", - "syntaxId": 3, - "updatedDate": "2019-02-19T15:57:07", - "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/danish.txt" - }, - { - "id": 572, - "description": "Filter list designed to fight circumvention ads in Adblock Plus", - "descriptionSourceUrl": "https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt", - "emailAddress": "filters+cv@adblockplus.org", - "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", - "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", - "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Dutch", - "publishedDate": "2018-05-15T09:50:43", - "syntaxId": 3, - "updatedDate": "2019-02-19T15:57:07", - "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/dutch.txt" - }, { "id": 573, "description": "Filter list designed to fight circumvention ads in Adblock Plus", @@ -5976,7 +5947,7 @@ "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - English", + "name": "ABP Anti-Circumvention Filter List - English Only", "publishedDate": "2018-05-15T09:50:43", "syntaxId": 3, "updatedDate": "2019-04-12T17:30:59", @@ -5990,7 +5961,7 @@ "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - French", + "name": "ABP Anti-Circumvention Filter List - French Only", "publishedDate": "2018-05-15T09:50:43", "syntaxId": 3, "updatedDate": "2019-03-19T07:42:20", @@ -6004,54 +5975,12 @@ "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - German", + "name": "ABP Anti-Circumvention Filter List - German Only", "publishedDate": "2018-05-15T09:50:43", "syntaxId": 3, "updatedDate": "2019-04-12T17:24:27", "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/german.txt" }, - { - "id": 577, - "description": "Filter list designed to fight circumvention ads in Adblock Plus", - "descriptionSourceUrl": "https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt", - "emailAddress": "filters+cv@adblockplus.org", - "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", - "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", - "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Hungarian", - "publishedDate": "2018-08-02T13:07:26", - "syntaxId": 3, - "updatedDate": "2019-02-19T15:57:07", - "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/hungarian.txt" - }, - { - "id": 579, - "description": "Filter list designed to fight circumvention ads in Adblock Plus", - "descriptionSourceUrl": "https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt", - "emailAddress": "filters+cv@adblockplus.org", - "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", - "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", - "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Italian", - "publishedDate": "2018-05-15T09:50:43", - "syntaxId": 3, - "updatedDate": "2019-02-19T15:57:07", - "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/italian.txt" - }, - { - "id": 582, - "description": "Filter list designed to fight circumvention ads in Adblock Plus", - "descriptionSourceUrl": "https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt", - "emailAddress": "filters+cv@adblockplus.org", - "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", - "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", - "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Polish", - "publishedDate": "2018-05-15T09:50:43", - "syntaxId": 3, - "updatedDate": "2019-02-19T15:57:07", - "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/polish.txt" - }, { "id": 583, "description": "Filter list designed to fight circumvention ads in Adblock Plus", @@ -6060,7 +5989,7 @@ "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Portuguese", + "name": "ABP Anti-Circumvention Filter List - Portuguese Only", "publishedDate": "2018-08-02T13:07:41", "syntaxId": 3, "updatedDate": "2019-03-25T11:53:01", @@ -6074,7 +6003,7 @@ "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Russian", + "name": "ABP Anti-Circumvention Filter List - Russian Only", "publishedDate": "2018-05-15T09:50:43", "syntaxId": 3, "updatedDate": "2019-04-12T13:42:21", @@ -6088,40 +6017,12 @@ "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Spanish", + "name": "ABP Anti-Circumvention Filter List - Spanish Only", "publishedDate": "2018-05-15T09:50:43", "syntaxId": 3, "updatedDate": "2019-03-27T10:11:17", "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/spanish.txt" }, - { - "id": 587, - "description": "Filter list designed to fight circumvention ads in Adblock Plus", - "descriptionSourceUrl": "https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt", - "emailAddress": "filters+cv@adblockplus.org", - "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", - "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", - "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Swedish", - "publishedDate": "2018-08-02T13:07:55", - "syntaxId": 3, - "updatedDate": "2019-02-19T15:57:07", - "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/swedish.txt" - }, - { - "id": 588, - "description": "Filter list designed to fight circumvention ads in Adblock Plus", - "descriptionSourceUrl": "https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt", - "emailAddress": "filters+cv@adblockplus.org", - "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", - "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", - "licenseId": 4, - "name": "ABP Anti-Circumvention Filter List - Turkish", - "publishedDate": "2018-08-02T13:08:09", - "syntaxId": 3, - "updatedDate": "2019-02-19T15:57:07", - "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/turkish.txt" - }, { "id": 589, "description": "A occasionally updated collection gambling domains in hosts file format.", @@ -6445,12 +6346,12 @@ { "id": 616, "chatUrl": "https://discord.me/polskiefiltry", - "description": "Filters that hide and block various other widgets.", + "description": "Filters that hide and block various other elements.", "descriptionSourceUrl": "https://raw.githubusercontent.com/PolishFiltersTeam/PolishAnnoyanceFilters/master/PAF_other_widgets.txt", "homeUrl": "https://github.com/PolishFiltersTeam/PolishAnnoyanceFilters", "issuesUrl": "https://github.com/PolishFiltersTeam/PolishAnnoyanceFilters/issues", "licenseId": 9, - "name": "Polish Annoyance Filters - Other Widgets", + "name": "Polish Annoyance Filters - Other Elements", "publishedDate": "2018-06-30T16:19:08", "syntaxId": 3, "updatedDate": "2019-04-13T22:00:20", @@ -6462,7 +6363,7 @@ "descriptionSourceUrl": "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext", "donateUrl": "https://www.patreon.com/blocklist", "homeUrl": " https://pgl.yoyo.org/adservers/", - "licenseId": 5, + "licenseId": 40, "name": "Peter Lowe's List (Hosts)", "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 1, @@ -6900,7 +6801,7 @@ "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", - "licenseId": 5, + "licenseId": 40, "name": "Peter Lowe's List (Little Snitch)", "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 18, @@ -6912,7 +6813,7 @@ "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", - "licenseId": 5, + "licenseId": 40, "name": "Peter Lowe's List (Internet Explorer)", "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 10, @@ -6924,7 +6825,7 @@ "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", - "licenseId": 5, + "licenseId": 40, "name": "Peter Lowe's List (Domains)", "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 2, @@ -6936,7 +6837,7 @@ "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", - "licenseId": 5, + "licenseId": 40, "name": "Peter Lowe's List (IPs)", "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 9, @@ -6950,7 +6851,7 @@ "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", - "licenseId": 5, + "licenseId": 40, "name": "Peter Lowe's List (Privoxy)", "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 19, @@ -6962,7 +6863,7 @@ "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", - "licenseId": 5, + "licenseId": 40, "name": "Peter Lowe's List (Domains with wildcards)", "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 16, @@ -8402,7 +8303,7 @@ }, { "id": 819, - "description": "This list is mostly meant to be used on top of \"YouTube: Pure Video Experience\", and it removes even more (number-wise) distracting or uncomfortable things on YouTube.", + "description": "This list removes even more (number-wise) distracting or uncomfortable things on YouTube.", "descriptionSourceUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/YouTubeEvenMorePureVideoExperience.txt", "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", "emailAddress": "imreeil42@gmail.com", @@ -8696,7 +8597,7 @@ "id": 842, "donateUrl": "https://www.patreon.com/blocklist", "homeUrl": " https://pgl.yoyo.org/adservers/", - "licenseId": 5, + "licenseId": 40, "name": "Peter Lowe's List (dnsmasq)", "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 20, @@ -12212,7 +12113,7 @@ "homeUrl": "https://github.com/deathbybandaid/piholeparser", "issuesUrl": "https://github.com/deathbybandaid/piholeparser/issues", "licenseId": 14, - "name": "LatvianList (Domains)", + "name": "Latvian List (Domains)", "publishedDate": "2017-09-05T08:14:36", "syntaxId": 2, "updatedDate": "2018-05-28T14:02:55", @@ -15890,7 +15791,7 @@ "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", - "licenseId": 5, + "licenseId": 40, "name": "Peter Lowe's List (Unbound)", "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 24, @@ -15903,7 +15804,7 @@ "donateUrl": "https://www.patreon.com/blocklist", "emailAddress": "pgl@yoyo.org", "homeUrl": "https://pgl.yoyo.org/adservers/", - "licenseId": 5, + "licenseId": 40, "name": "Peter Lowe's List (BIND)", "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 26, @@ -15917,7 +15818,7 @@ "forumUrl": "https://forum.adguard.com/index.php?categories/filter-rules.66/", "homeUrl": "https://github.com/AdguardTeam/AdguardFilters", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", - "licenseId": 12, + "licenseId": 40, "name": "AdGuard Base Filter without EasyList", "policyUrl": "https://kb.adguard.com/en/general/adguard-filter-policy", "syntaxId": 6, @@ -17611,7 +17512,7 @@ "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/tcptomato/ROad-Block/master/road-kill-filters.txt" }, -{ + { "id": 1673, "description": "Completely block Google and its services .", "descriptionSourceUrl": "https://github.com/nickspaargaren/pihole-google", @@ -17981,39 +17882,39 @@ "syntaxId": 1, "homeUrl": "https://asc.hk/", "viewUrl": "https://asc.hk/adplus.txt" -}, -{ + }, + { "id": 1702, "name": "NPC 0AM Hosts", "syntaxId": 1, "homeUrl": "https://npc.0am.jp/", "licenseId": 7, "viewUrl": "https://npc.0am.jp/hosts.php?dl=1" -}, -{ + }, + { "id": 1703, "name": "Synology's pwn", "syntaxId": 28, "homeUrl": "https://in0de.synology.me", "description": "Domain name filters.", "viewUrl": "https://in0de.synology.me/pwn.txt" -}, -{ + }, + { "id": 1704, "name": "Synology's own", "syntaxId": 2, "homeUrl": "https://in0de.synology.me", "description": "Domain name hosts for Pi-hole.", "viewUrl": "https://in0de.synology.me/own.txt" -}, -{ + }, + { "id": 1705, "name": "ChinaList 2.0", "syntaxId": 3, "homeUrl": "https://www.yiclear.com/", "viewUrl": "http://tools.yiclear.com/ChinaList2.0.txt" -}, -{ + }, + { "id": 1706, "name": "GameIndustryDE Hosts", "syntaxId": 1, @@ -18021,254 +17922,254 @@ "description": "Hosts file for blocking spyware, ads, analytics and tracking on German websites and domains.", "licenseId": 9, "viewUrl": "https://gameindustry.de/files/staedte/hosts" -}, -{ + }, + { "id": 1707, "name": "hosts-jp Ads", "syntaxId": 1, "homeUrl": "https://github.com/tiuxo/hosts/", -"issuesUrl": "https://github.com/tiuxo/hosts//issues", + "issuesUrl": "https://github.com/tiuxo/hosts//issues", "description": "Categorized hosts files for DNS based content blocking. This is meant to be used as a regional component of a more comprehensive hosts list, such as Steven Black's hosts.", "licenseId": 24, "viewUrl": "https://raw.githubusercontent.com/tiuxo/hosts/master/ads" -}, -{ + }, + { "id": 1708, "name": "hosts-jp Porn", "syntaxId": 1, "homeUrl": "https://github.com/tiuxo/hosts/", -"issuesUrl": "https://github.com/tiuxo/hosts//issues", + "issuesUrl": "https://github.com/tiuxo/hosts//issues", "description": "Categorized hosts files for DNS based content blocking. This is meant to be used as a regional component of a more comprehensive hosts list, such as Steven Black's hosts.", "licenseId": 24, "viewUrl": "https://raw.githubusercontent.com/tiuxo/hosts/master/porn" -}, -{ + }, + { "id": 1709, "name": "hosts-jp Social", "syntaxId": 1, "homeUrl": "https://github.com/tiuxo/hosts/", -"issuesUrl": "https://github.com/tiuxo/hosts//issues", + "issuesUrl": "https://github.com/tiuxo/hosts//issues", "description": "Categorized hosts files for DNS based content blocking. This is meant to be used as a regional component of a more comprehensive hosts list, such as Steven Black's hosts.", "licenseId": 24, "viewUrl": "https://raw.githubusercontent.com/tiuxo/hosts/master/social" -}, -{ + }, + { "id": 1710, "name": "Botvrij IOC List", "syntaxId": 2, "homeUrl": "https://www.botvrij.eu/", "viewUrl": "https://www.botvrij.eu/data/ioclist.hostname.raw" -}, -{ + }, + { "id": 1711, "name": "Zonefiles Compromised Domains Live", "syntaxId": 2, "homeUrl": "https://zonefiles.io/", "viewUrl": "https://zonefiles.io/f/compromised/domains/live/" -}, -{ + }, + { "id": 1712, "name": "abc45628 Hosts", "syntaxId": 1, "homeUrl": "https://github.com/abc45628/hosts/", -"issuesUrl": "https://github.com/abc45628/hosts//issues", + "issuesUrl": "https://github.com/abc45628/hosts//issues", "viewUrl": "https://raw.githubusercontent.com/abc45628/hosts/master/hosts" -}, -{ + }, + { "id": 1713, "name": "Ad Wars Hosts", "syntaxId": 1, "homeUrl": "https://github.com/jdlingyu/ad-wars/", -"issuesUrl": "https://github.com/jdlingyu/ad-wars//issues", + "issuesUrl": "https://github.com/jdlingyu/ad-wars//issues", "viewUrl": "https://raw.githubusercontent.com/jdlingyu/ad-wars/master/hosts" -}, -{ + }, + { "id": 1714, "name": "PiHole Lists - Quad9", "syntaxId": 2, "homeUrl": "https://github.com/XionKzn/PiHole-Lists/", -"issuesUrl": "https://github.com/XionKzn/PiHole-Lists//issues", + "issuesUrl": "https://github.com/XionKzn/PiHole-Lists//issues", "viewUrl": "https://raw.githubusercontent.com/XionKzn/PiHole-Lists/master/Quad9.txt" -}, -{ + }, + { "id": 1715, "name": "PiHole Lists - Yahoo Ad Servers", "syntaxId": 2, "homeUrl": "https://github.com/XionKzn/PiHole-Lists/", -"issuesUrl": "https://github.com/XionKzn/PiHole-Lists//issues", + "issuesUrl": "https://github.com/XionKzn/PiHole-Lists//issues", "viewUrl": "https://raw.githubusercontent.com/XionKzn/PiHole-Lists/master/Yahoo_Ad_Servers.txt" -}, -{ + }, + { "id": 1716, "name": "PiHole Lists - Spyware", "syntaxId": 2, "homeUrl": "https://github.com/XionKzn/PiHole-Lists/", -"issuesUrl": "https://github.com/XionKzn/PiHole-Lists//issues", + "issuesUrl": "https://github.com/XionKzn/PiHole-Lists//issues", "viewUrl": "https://raw.githubusercontent.com/XionKzn/PiHole-Lists/master/PiHole_HOSTS_Spyware.txt" -}, -{ + }, + { "id": 1717, "name": "PiHole Lists - Cerber Ransomware", "syntaxId": 2, "homeUrl": "https://github.com/XionKzn/PiHole-Lists/", -"issuesUrl": "https://github.com/XionKzn/PiHole-Lists//issues", + "issuesUrl": "https://github.com/XionKzn/PiHole-Lists//issues", "viewUrl": "https://raw.githubusercontent.com/XionKzn/PiHole-Lists/master/Cerber_Ransomware.txt" -}, -{ + }, + { "id": 1718, "name": "PiHole Lists - Blocklist", "syntaxId": 2, "homeUrl": "https://github.com/XionKzn/PiHole-Lists/", -"issuesUrl": "https://github.com/XionKzn/PiHole-Lists//issues", + "issuesUrl": "https://github.com/XionKzn/PiHole-Lists//issues", "viewUrl": "https://raw.githubusercontent.com/XionKzn/PiHole-Lists/master/Blocklist.txt" -}, -{ + }, + { "id": 1719, "name": "kurzBlock", "syntaxId": 2, "homeUrl": "https://github.com/KurzGedanke/kurzBlock/", -"issuesUrl": "https://github.com/KurzGedanke/kurzBlock//issues", + "issuesUrl": "https://github.com/KurzGedanke/kurzBlock//issues", "description": "A personal blocklist curated by KurzGedanke.", "licenseId": 2, "viewUrl": "https://raw.githubusercontent.com/KurzGedanke/kurzBlock/master/kurzBlock.txt", "donateUrl": "https://blog.kurzgedanke.me/donate/" -}, -{ + }, + { "id": 1720, "name": "Grayware Filterlist", "syntaxId": 4, "homeUrl": "https://github.com/VernonStow/Filterlist/", -"issuesUrl": "https://github.com/VernonStow/Filterlist//issues", + "issuesUrl": "https://github.com/VernonStow/Filterlist//issues", "description": "Blocklist for suspicious websites involved with possible tracking, spam, or malware; meant to supplement mainstream blocklists.", "viewUrl": "https://raw.githubusercontent.com/VernonStow/Filterlist/master/Filterlist.txt" -}, -{ + }, + { "id": 1721, "name": "iOS Tracker Blocklist", "syntaxId": 2, "homeUrl": "https://github.com/jakejarvis/ios-trackers/", -"issuesUrl": "https://github.com/jakejarvis/ios-trackers//issues", + "issuesUrl": "https://github.com/jakejarvis/ios-trackers//issues", "description": "My personal blocklist of iOS tracking, telemetry, and advertising domains.", "licenseId": 2, "viewUrl": "https://raw.githubusercontent.com/jakejarvis/ios-trackers/master/blocklist.txt" -}, -{ + }, + { "id": 1722, "name": "Evil Domains", "syntaxId": 2, "homeUrl": "https://github.com/hell-sh/Evil-Domains", -"issuesUrl": "https://github.com/hell-sh/Evil-Domains/issues", + "issuesUrl": "https://github.com/hell-sh/Evil-Domains/issues", "description": "Evil domains for our Collective Hosts File Project that are not present in any other lists.", "licenseId": 11, "viewUrl": "https://raw.githubusercontent.com/hell-sh/Evil-Domains/master/evil-domains.txt" -}, -{ + }, + { "id": 1723, "name": "I Hate Tracker", "syntaxId": 2, "homeUrl": "https://github.com/pirat28/IHateTracker/", -"issuesUrl": "https://github.com/pirat28/IHateTracker//issues", + "issuesUrl": "https://github.com/pirat28/IHateTracker//issues", "description": "Ads and Tracker which other lists may not found", "licenseId": 2, "viewUrl": "https://raw.githubusercontent.com/pirat28/IHateTracker/master/iHateTracker.txt" -}, -{ + }, + { "id": 1724, "name": "Nolovia Supplemental Bad Host Index blacklist file", "syntaxId": 2, "homeUrl": "https://github.com/parseword/nolovia/", -"issuesUrl": "https://github.com/parseword/nolovia//issues", + "issuesUrl": "https://github.com/parseword/nolovia//issues", "viewUrl": "https://raw.githubusercontent.com/parseword/nolovia/master/skel/hosts-nolovia.txt" -}, -{ + }, + { "id": 1725, "name": "Nolovia state-sponsored malware blacklist file", "syntaxId": 2, "homeUrl": "https://github.com/parseword/nolovia/", -"issuesUrl": "https://github.com/parseword/nolovia//issues", + "issuesUrl": "https://github.com/parseword/nolovia//issues", "description": "The following servers have been identified as part of various state-sponsored malware campaigns.", "viewUrl": "https://raw.githubusercontent.com/parseword/nolovia/master/skel/hosts-government-malware.txt" -}, -{ + }, + { "id": 1726, "name": "DodgySiteBlocker", "syntaxId": 3, "homeUrl": "https://github.com/callmenemo491/DodgySiteBlocker/", -"issuesUrl": "https://github.com/callmenemo491/DodgySiteBlocker//issues", + "issuesUrl": "https://github.com/callmenemo491/DodgySiteBlocker//issues", "description": "This filter disables 'dodgy' sites My Way!", "licenseId": 2, "viewUrl": "https://raw.githubusercontent.com/callmenemo491/DodgySiteBlocker/master/DodgySiteBlocker.txt" -}, -{ + }, + { "id": 1727, "name": "Magento Malware Skanner - Burner Domains", "syntaxId": 2, "homeUrl": "https://github.com/gwillem/magento-malware-scanner/", -"issuesUrl": "https://github.com/gwillem/magento-malware-scanner//issues", + "issuesUrl": "https://github.com/gwillem/magento-malware-scanner//issues", "description": "Burner domains are short-lived domains, registered by criminals (under a phony name). Don't put legitimate domains here, even if they contain malware.", "licenseId": 4, "viewUrl": "https://raw.githubusercontent.com/gwillem/magento-malware-scanner/master/rules/burner-domains.txt" -}, -{ + }, + { "id": 1728, "name": "Soteria nou's domain list - Ads", "syntaxId": 2, "homeUrl": "https://github.com/soteria-nou/domain-list", -"issuesUrl": "https://github.com/soteria-nou/domain-list/issues", + "issuesUrl": "https://github.com/soteria-nou/domain-list/issues", "description": "This repository contains lists of domains that very likely serve ads, analytics scripts, tracking pixels, widgets (webpage plugins), content enrichment (begging for mail subscription, sharing abilities), and represent affiliate or fake webpages. Usually lists get at least a monthly update.", "licenseId": 32, "viewUrl": "https://raw.githubusercontent.com/soteria-nou/domain-list/master/ads.txt" -}, -{ + }, + { "id": 1729, "name": "Soteria nou's domain list - Affiliates", "syntaxId": 2, "homeUrl": "https://github.com/soteria-nou/domain-list", -"issuesUrl": "https://github.com/soteria-nou/domain-list/issues", + "issuesUrl": "https://github.com/soteria-nou/domain-list/issues", "description": "This repository contains lists of domains that very likely serve ads, analytics scripts, tracking pixels, widgets (webpage plugins), content enrichment (begging for mail subscription, sharing abilities), and represent affiliate or fake webpages. Usually lists get at least a monthly update.", "licenseId": 32, "viewUrl": "https://raw.githubusercontent.com/soteria-nou/domain-list/master/affiliate.txt" -}, -{ + }, + { "id": 1730, "name": "Soteria nou's domain list - Analytics", "syntaxId": 2, "homeUrl": "https://github.com/soteria-nou/domain-list", -"issuesUrl": "https://github.com/soteria-nou/domain-list/issues", + "issuesUrl": "https://github.com/soteria-nou/domain-list/issues", "description": "This repository contains lists of domains that very likely serve ads, analytics scripts, tracking pixels, widgets (webpage plugins), content enrichment (begging for mail subscription, sharing abilities), and represent affiliate or fake webpages. Usually lists get at least a monthly update.", "licenseId": 32, "viewUrl": "https://raw.githubusercontent.com/soteria-nou/domain-list/master/analytics.txt" -}, -{ + }, + { "id": 1731, "name": "Soteria nou's domain list - Enrichments", "syntaxId": 2, "homeUrl": "https://github.com/soteria-nou/domain-list", -"issuesUrl": "https://github.com/soteria-nou/domain-list/issues", + "issuesUrl": "https://github.com/soteria-nou/domain-list/issues", "description": "This repository contains lists of domains that very likely serve ads, analytics scripts, tracking pixels, widgets (webpage plugins), content enrichment (begging for mail subscription, sharing abilities), and represent affiliate or fake webpages. Usually lists get at least a monthly update.", "licenseId": 32, "viewUrl": "https://raw.githubusercontent.com/soteria-nou/domain-list/master/enrichments.txt" -}, -{ + }, + { "id": 1732, "name": "Soteria nou's domain list - Fake sites", "syntaxId": 2, "homeUrl": "https://github.com/soteria-nou/domain-list", -"issuesUrl": "https://github.com/soteria-nou/domain-list/issues", + "issuesUrl": "https://github.com/soteria-nou/domain-list/issues", "description": "This repository contains lists of domains that very likely serve ads, analytics scripts, tracking pixels, widgets (webpage plugins), content enrichment (begging for mail subscription, sharing abilities), and represent affiliate or fake webpages. Usually lists get at least a monthly update.", "licenseId": 32, "viewUrl": "https://raw.githubusercontent.com/soteria-nou/domain-list/master/fake.txt" -}, -{ + }, + { "id": 1733, "name": "Soteria nou's domain list - Widgets", "syntaxId": 2, "homeUrl": "https://github.com/soteria-nou/domain-list", -"issuesUrl": "https://github.com/soteria-nou/domain-list/issues", + "issuesUrl": "https://github.com/soteria-nou/domain-list/issues", "description": "This repository contains lists of domains that very likely serve ads, analytics scripts, tracking pixels, widgets (webpage plugins), content enrichment (begging for mail subscription, sharing abilities), and represent affiliate or fake webpages. Usually lists get at least a monthly update.", "licenseId": 32, "viewUrl": "https://raw.githubusercontent.com/soteria-nou/domain-list/master/widgets.txt" -}, + }, { "id": 1734, "description": "A merged hosts file from a variety of other lists.", @@ -19298,5 +19199,306 @@ "submissionUrl": "https://app.energized.pro", "syntaxId": 9, "viewUrl": "https://raw.githubusercontent.com/EnergizedProtection/block/master/extensions/ips/formats/list.txt" + }, + { + "id": 1799, + "description": "Filter list designed to fight circumvention ads in Adblock Plus", + "descriptionSourceUrl": "https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt", + "emailAddress": "filters+cv@adblockplus.org", + "homeUrl": "https://github.com/abp-filters/abp-filters-anti-cv", + "issuesUrl": "https://github.com/abp-filters/abp-filters-anti-cv/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "licenseId": 4, + "name": "ABP Anti-Circumvention Filter List - Arabic Only", + "publishedDate": "2018-05-15T09:50:43", + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/arabic.txt" + }, + { + "id": 1800, + "name": "Rixcloud Rules", + "syntaxId": 29, + "viewUrl": "https://cdn.rixcloud.io/Quantumult/Rules/Default.conf" + }, + { + "id": 1801, + "name": "Lhie1's Auto Rules", + "homeUrl": "https://github.com/lhie1/Rules/", + "issuesUrl": "https://github.com/lhie1/Rules/issues", + "syntaxId": 29, + "licenseId": 19, + "viewUrl": "https://raw.githubusercontent.com/lhie1/Rules/master/Auto/REJECT.conf" + }, + { + "id": 1802, + "name": "SSEncrypt Adblock", + "homeUrl": "https://github.com/HParis/SSEncrypt/", + "issuesUrl": "https://github.com/HParis/SSEncrypt/issues", + "syntaxId": 29, + "viewUrl": "https://raw.githubusercontent.com/HParis/SSEncrypt/master/adblock-reject.list" + }, + { + "id": 1803, + "name": "Scomper Surge List Reject", + "homeUrl": "https://github.com/scomper/surge-list/", + "issuesUrl": "https://github.com/scomper/surge-list/issues", + "syntaxId": 29, + "viewUrl": "https://raw.githubusercontent.com/scomper/surge-list/master/reject.list" + }, + { + "id": 1804, + "name": "ConnersHua Advertising Ruleset", + "homeUrl": "https://github.com/ConnersHua/Profiles/tree/master", + "issuesUrl": "https://github.com/ConnersHua/Profiles/tree/master/issues", + "syntaxId": 29, + "viewUrl": "https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Advertising.list" + }, + { + "id": 1805, + "name": "ConnersHua Pro Ruleset", + "homeUrl": "https://github.com/ConnersHua/Profiles/tree/master", + "issuesUrl": "https://github.com/ConnersHua/Profiles/tree/master/issues", + "syntaxId": 29, + "viewUrl": "https://raw.githubusercontent.com/ConnersHua/Profiles/master/Shadow/Pro.conf" + }, + { + "id": 1806, + "name": "BlocklistDE All", + "description": "The mission is to report any and all attacks to the respective abuse departments of the infected PCs/servers, to ensure that the responsible provider can inform their customer about the infection and disable the attacker. ", + "homeUrl": "https://www.blocklist.de/en/index.html", + "syntaxId": 9, + "viewUrl": "https://lists.blocklist.de/lists/all.txt", + "donateUrl": "https://flattr.com/@blocklist.de" + }, + { + "id": 1807, + "name": "DangerRulezSK Brute Force Blocker", + "description": "Its main purpose is to block SSH bruteforce attacks via firewall.", + "homeUrl": "http://danger.rulez.sk/index.php/bruteforceblocker/", + "syntaxId": 9, + "viewUrl": "http://danger.rulez.sk/projects/bruteforceblocker/blist.php" + }, + { + "id": 1808, + "name": "EmergingThreats Compromised IPs", + "homeUrl": "https://rules.emergingthreats.net/", + "syntaxId": 9, + "viewUrl": "https://rules.emergingthreats.net/blockrules/compromised-ips.txt" + }, + { + "id": 1809, + "name": "EmergingThreats Block IPs", + "homeUrl": "https://rules.emergingthreats.net/", + "syntaxId": 9, + "viewUrl": "https://rules.emergingthreats.net/fwrules/emerging-Block-IPs.txt" + }, + { + "id": 1810, + "name": "Greensnow Blocklist", + "description": "GreenSnow is a team consisting of the best specialists in computer security, we harvest a large number of IPs from different computers located around the world.", + "homeUrl": "https://greensnow.co/", + "syntaxId": 9, + "viewUrl": "https://blocklist.greensnow.co/greensnow.txt" + }, + { + "id": 1811, + "name": "Binary Defense Systems Artillery Threat Intelligence Feed and Banlist Feed", + "homeUrl": "https://www.binarydefense.com/", + "syntaxId": 9, + "licenseId": 32, + "viewUrl": "https://www.binarydefense.com/banlist.txt" + }, + { + "id": 1812, + "name": "NoThink SSH Blacklist", + "homeUrl": "https://www.nothink.org/", + "syntaxId": 9, + "viewUrl": "https://www.nothink.org/blacklist/blacklist_ssh_all.txt" + }, + { + "id": 1813, + "name": "CINS Army Bad Guys", + "description": "CINS Army is a way for our company to give back to the community by sharing valuable threat intelligence harvested from our CINS system. The CINS Army list is a subset of the CINS Active Threat Intelligence ruleset, and consists of IP addresses that meet one of two basic criteria: 1) The IP's recent Rogue Packet score factor is very poor, or 2) The IP has tripped a designated number of 'trusted' alerts across a given number of our Sentinels deployed around the world.", + "homeUrl": "https://cinsscore.com/", + "syntaxId": 9, + "viewUrl": "https://cinsscore.com/list/ci-badguys.txt" + }, + { + "id": 1814, + "description": "This list target huge international websites that clutter search engine results with misinformation, unfounded articles, and/or contempt for humanity. While designed for use with «Google Hit Hider by Domain» to remove search results, it can also be used with other domains-list tools if you want more thorough blocking of them.", + "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", + "emailAddress": "imreeil42@gmail.com", + "homeUrl": "https://github.com/DandelionSprout/adfilt", + "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", + "licenseId": 35, + "name": "Remover for Mainstream Tabloid and Alt-Right Sites", + "syntaxId": 2, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/TabloidRemover.txt", + "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/TabloidRemover.txt", + "viewUrlMirror2": "https://gitlab.com/DandelionSprout/adfilt/raw/master/TabloidRemover.txt" + }, + { + "id": 1815, + "description": "Have you ever been searching for rare PC parts, but a lot the sites you visit refuse to tell you the murderous prices they charge unless you sign up as a member with them? Now you won't feel infuriated by it anymore! While this list is designed for «Google Hit Hider by Domain» to remove search results, it can also be used with other domains-list tools if you want more thorough blocking of them.", + "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", + "emailAddress": "imreeil42@gmail.com", + "homeUrl": "https://github.com/DandelionSprout/adfilt", + "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", + "licenseId": 35, + "name": "Anti-'PC component price hiders' List", + "syntaxId": 2, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AntiPCPriceHiderList.txt", + "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/AntiPCPriceHiderList.txt", + "viewUrlMirror2": "https://gitlab.com/DandelionSprout/adfilt/raw/master/AntiPCPriceHiderList.txt" + }, + { + "id": 1816, + "description": "Additional regex list blocking scam and phising Polish sites for Pi-hole. To install it, you can manually add entries to regex.list file or use Regex Lists Installer for Pi-hole (more at https://github.com/PolishFiltersTeam/ScriptsPlayground/blob/master/Readme_RLI_for_Pi-hole.md).", + "emailAddress": "polishjarvis@gmail.com", + "homeUrl": "https://kadantiscam.netlify.com/", + "issuesUrl": "https://github.com/PolishFiltersTeam/KADhosts/issues", + "licenseId": 8, + "name": "KADhole", + "submissionUrl": "https://kadantiscam.netlify.com/#contact", + "syntaxId": 30, + "viewUrl": "https://raw.githubusercontent.com/PolishFiltersTeam/KADhosts/master/KADhole.txt" + }, + { + "id": 1817, + "chatUrl": "https://discord.me/polskiefiltry", + "description": "Polish regex list blocking ads and tracking sites for Pi-hole. To install it, you can manually add entries to regex.list file or use Regex Lists Installer for Pi-hole (more at https://github.com/PolishFiltersTeam/ScriptsPlayground/blob/master/Readme_RLI_for_Pi-hole.md).", + "donateUrl": "https://patronite.pl/polskiefiltry", + "emailAddress": "errors@certyficate.it", + "homeUrl": "https://www.certyficate.it/", + "issuesUrl": "https://github.com/MajkiIT/polish-ads-filter/issues", + "licenseId": 9, + "name": "Polish Regex Filters for Pi-hole", + "syntaxId": 30, + "viewUrl": "https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/hostfile_regex.txt" + }, + { + "id": 1818, + "description": "Mmotti's regex list blocking ads and tracking sites for Pi-hole. To install it, you can manually add entries to regex.list file or use Regex Lists Installer for Pi-hole (more at https://github.com/PolishFiltersTeam/ScriptsPlayground/blob/master/Readme_RLI_for_Pi-hole.md).", + "homeUrl": "https://github.com/mmotti/pihole-regex", + "issuesUrl": "https://github.com/mmotti/pihole-regex/issues", + "name": "Mmoti's Regex Filters for Pi-hole", + "syntaxId": 30, + "viewUrl": "https://raw.githubusercontent.com/mmotti/pihole-regex/master/regex.list" + }, + { + "id": 1819, + "description": "A programmatically expanded block list for Facebook, Messenger, Instagram, and WhatsApp", + "descriptionSourceUrl": "https://www.github.developerdan.com/hosts/lists/facebook-extended.txt", + "homeUrl": "https://www.github.developerdan.com/hosts/", + "issuesUrl": "https://github.com/lightswitch05/hosts/issues", + "licenseId": 18, + "name": "Facebook Hosts", + "publishedDate": "2019-08-26T19:49:00", + "syntaxId": 1, + "updatedDate": "2019-08-26T19:49:00", + "viewUrl": "https://www.github.developerdan.com/hosts/lists/facebook-extended.txt" + }, + { + "id": 1820, + "name": "Bulgarian Host File (Adblock Plus)", + "homeUrl": "https://github.com/stilyanmihalev/BulgarianHostFile", + "issuesUrl": "https://github.com/stilyanmihalev/BulgarianHostFile/issues", + "licenseId": 2, + "syntaxId": 28, + "viewUrl": "https://raw.githubusercontent.com/stilyanmihalev/BulgarianHostFile/master/file.txt" +}, +{ + "id": 1821, + "name": "Bulgarian Host File (Hosts)", + "homeUrl": "https://github.com/stilyanmihalev/BulgarianHostFile", + "issuesUrl": "https://github.com/stilyanmihalev/BulgarianHostFile/issues", + "licenseId": 2, + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/stilyanmihalev/BulgarianHostFile/master/hosts.txt" +}, +{ + "id": 1822, + "name": "Cruzit Server Blocklist", + "description": "The following list is individual IP Addresses that have attempted to attack our servers. These IP addresses are currently recommended as a DENY, REJECT or BLOCK on your firewalls.", + "homeUrl": "https://www.cruzit.com/wbl.php", + "syntaxId": 9, + "viewUrl": "https://www.cruzit.com/xxwbl2txt.php", + "donateUrl": "https://www.cruzit.com/hth.php" +}, +{ + "id": 1823, + "name": "Unsubscore Blacklist", + "syntaxId": 9, + "viewUrl": "http://www.unsubscore.com/blacklist.txt" +}, +{ + "id": 1824, + "name": "MyIP Blacklist", + "homeUrl": "https://myip.ms/", + "syntaxId": 9, + "viewUrl": "https://myip.ms/files/blacklist/general/latest_blacklist.txt", + "donateUrl": "bitcoin:1FzxJBxy3fJDv5PLGqbdN9TrQ79LE9UEtB" +}, +{ + "id": 1825, + "name": "hpHosts PHA (IPs)", + "description": "Sites engaged in illegal pharmacy activities.", + "syntaxId": 9, + "viewUrl": "https://iplists.firehol.org/files/hphosts_pha.ipset" +}, +{ + "id": 1826, + "name": "hpHosts HJK (IPs)", + "description": "Sites engaged in browser hijacking or other forms of hijacking (OS services, bandwidth, DNS, etc.).", + "syntaxId": 9, + "viewUrl": "https://iplists.firehol.org/files/hphosts_HJK.ipset" +}, +{ + "id": 1827, + "name": "hpHosts FSA (IPs)", + "description": "Sites engaged in the selling or distribution of bogus or fraudulent applications and/or provision of fraudulent services.", + "syntaxId": 9, + "viewUrl": "https://iplists.firehol.org/files/hphosts_fsa.ipset" +}, +{ + "id": 1828, + "name": "hpHosts GRM (IPs)", + "description": "Sites engaged in astroturfing (otherwise known as grass roots marketing) or spamming.", + "syntaxId": 9, + "viewUrl": "https://iplists.firehol.org/files/hphosts_grm.ipset" +}, +{ + "id": 1829, + "name": "hpHosts EXP (IPs)", + "description": "Sites engaged in the housing, development or distribution of exploits, including but not limited to exploitation of browser, software (inclusive of website software such as CMS), operating system exploits as well as those engaged in exploits via social engineering.", + "syntaxId": 9, + "viewUrl": "https://iplists.firehol.org/files/hphosts_exp.ipset" +}, +{ + "id": 1830, + "name": "hpHosts EMD (IPs)", + "description": "Sites engaged in malware distribution.", + "syntaxId": 9, + "viewUrl": "https://iplists.firehol.org/files/hphosts_emd.ipset" +}, +{ + "id": 1831, + "name": "hpHosts ATS (IPs)", + "description": "This classification is assigned for domains being used for advert or tracking purposes.", + "syntaxId": 9, + "viewUrl": "https://iplists.firehol.org/files/hphosts_exp.ipset" +}, + { + "id": 1832, + "description": "Pepe the Frog, while beloved by many internet memers, has also become the go-to symbol of many horrendous alt-right movements, culminating in Frenworld and Clown World. If you're worried that people who use him do not have the best intentions, this is how to avoid both him and them.", + "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", + "emailAddress": "imreeil42@gmail.com", + "homeUrl": "https://github.com/DandelionSprout/adfilt", + "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", + "licenseId": 35, + "name": "Anti-Pepe List", + "syntaxId": 2, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AntiPepeList.txt", + "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/AntiPepeList.txt", + "viewUrlMirror2": "https://gitlab.com/DandelionSprout/adfilt/raw/master/AntiPepeList.txt" } ] diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index 93744a761..6d1013f97 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -703,14 +703,6 @@ "filterListId": 570, "languageId": 105 }, - { - "filterListId": 571, - "languageId": 106 - }, - { - "filterListId": 572, - "languageId": 108 - }, { "filterListId": 573, "languageId": 110 @@ -723,18 +715,6 @@ "filterListId": 575, "languageId": 167 }, - { - "filterListId": 577, - "languageId": 177 - }, - { - "filterListId": 579, - "languageId": 159 - }, - { - "filterListId": 582, - "languageId": 11 - }, { "filterListId": 583, "languageId": 13 @@ -747,14 +727,6 @@ "filterListId": 586, "languageId": 79 }, - { - "filterListId": 587, - "languageId": 83 - }, - { - "filterListId": 588, - "languageId": 48 - }, { "filterListId": 593, "languageId": 110 @@ -2362,5 +2334,49 @@ { "filterListId": 1739, "languageId": 141 + }, + { + "filterListId": 1108, + "languageId": 179 + }, + { + "filterListId": 1144, + "languageId": 108 + }, + { + "filterListId": 1153, + "languageId": 79 + }, + { + "filterListId": 1154, + "languageId": 139 + }, + { + "filterListId": 1165, + "languageId": 27 + }, + { + "filterListId": 1167, + "languageId": 122 + }, + { + "filterListId": 1799, + "languageId": 122 + }, + { + "filterListId": 1816, + "languageId": 11 + }, + { + "filterListId": 1817, + "languageId": 11 + }, + { + "filterListId": 1820, + "languageId": 113 + }, + { + "filterListId": 1821, + "languageId": 113 } ] diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 7ada4586a..3f7cacc4f 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -483,14 +483,6 @@ "filterListId": 570, "maintainerId": 15 }, - { - "filterListId": 571, - "maintainerId": 15 - }, - { - "filterListId": 572, - "maintainerId": 15 - }, { "filterListId": 573, "maintainerId": 15 @@ -503,18 +495,6 @@ "filterListId": 575, "maintainerId": 15 }, - { - "filterListId": 577, - "maintainerId": 15 - }, - { - "filterListId": 579, - "maintainerId": 15 - }, - { - "filterListId": 582, - "maintainerId": 15 - }, { "filterListId": 583, "maintainerId": 15 @@ -528,11 +508,7 @@ "maintainerId": 15 }, { - "filterListId": 587, - "maintainerId": 15 - }, - { - "filterListId": 588, + "filterListId": 1799, "maintainerId": 15 }, { @@ -875,6 +851,18 @@ "filterListId": 1738, "maintainerId": 22 }, + { + "filterListId": 1814, + "maintainerId": 22 + }, + { + "filterListId": 1815, + "maintainerId": 22 + }, + { + "filterListId": 1832, + "maintainerId": 22 + }, { "filterListId": 21, "maintainerId": 23 @@ -4547,6 +4535,10 @@ "filterListId": 1639, "maintainerId": 139 }, + { + "filterListId": 1819, + "maintainerId": 139 + }, { "filterListid": 1470, "maintainerid": 84 @@ -4786,5 +4778,21 @@ { "filterListid": 1798, "maintainerid": 84 +}, +{ + "filterListid": 508, + "maintainerid": 34 +}, +{ + "filterListid": 1816, + "maintainerid": 34 +}, +{ + "filterListid": 1817, + "maintainerid": 32 +}, +{ + "filterListid": 1818, + "maintainerid": 140 } ] diff --git a/data/FilterListTag.json b/data/FilterListTag.json index 550256362..96c5b5f9c 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -1829,7 +1829,7 @@ }, { "filterListId": 349, - "tagId": 9 + "tagId": 7 }, { "filterListId": 350, @@ -2639,14 +2639,6 @@ "filterListId": 570, "tagId": 5 }, - { - "filterListId": 571, - "tagId": 5 - }, - { - "filterListId": 572, - "tagId": 5 - }, { "filterListId": 573, "tagId": 5 @@ -2659,18 +2651,6 @@ "filterListId": 575, "tagId": 5 }, - { - "filterListId": 577, - "tagId": 5 - }, - { - "filterListId": 579, - "tagId": 5 - }, - { - "filterListId": 582, - "tagId": 5 - }, { "filterListId": 583, "tagId": 5 @@ -2683,14 +2663,6 @@ "filterListId": 586, "tagId": 5 }, - { - "filterListId": 587, - "tagId": 5 - }, - { - "filterListId": 588, - "tagId": 5 - }, { "filterListId": 589, "tagId": 17 @@ -7691,7 +7663,7 @@ "filterListId": 1668, "tagId": 15 }, - { + { "filterListId": 1669, "tagId": 3 }, @@ -7699,7 +7671,7 @@ "filterListId": 1670, "tagId": 2 }, - { + { "filterListId": 1670, "tagId": 3 }, @@ -7707,7 +7679,7 @@ "filterListId": 1671, "tagId": 2 }, - { + { "filterListId": 1672, "tagId": 2 }, @@ -7723,95 +7695,95 @@ "filterListId": 1673, "tagId": 19 }, - { + { "filterListId": 1674, "tagId": 19 }, - { + { "filterListId": 1675, "tagId": 19 }, - { + { "filterListId": 1676, "tagId": 19 }, - { + { "filterListId": 1677, "tagId": 19 }, - { + { "filterListId": 1678, "tagId": 19 }, - { + { "filterListId": 1679, "tagId": 19 }, - { + { "filterListId": 1680, "tagId": 19 }, - { + { "filterListId": 1681, "tagId": 19 }, - { + { "filterListId": 1682, "tagId": 19 }, - { + { "filterListId": 1683, "tagId": 19 }, - { + { "filterListId": 1684, "tagId": 19 }, - { + { "filterListId": 1685, "tagId": 19 }, - { + { "filterListId": 1686, "tagId": 19 }, - { + { "filterListId": 1687, "tagId": 19 }, - { + { "filterListId": 1688, "tagId": 19 }, - { + { "filterListId": 1689, "tagId": 19 }, - { + { "filterListId": 1690, "tagId": 19 }, - { + { "filterListId": 1691, "tagId": 19 }, - { + { "filterListId": 1692, "tagId": 19 }, - { + { "filterListId": 1693, "tagId": 19 }, - { + { "filterListId": 1694, "tagId": 19 }, - { + { "filterListId": 1695, "tagId": 19 }, - { + { "filterListId": 1696, "tagId": 19 }, @@ -7819,182 +7791,182 @@ "filterListId": 1697, "tagId": 19 }, - { + { "filterListId": 1698, "tagId": 19 }, - { + { "filterListId": 1699, "tagId": 19 }, - { + { "filterListId": 1700, "tagId": 19 }, { "filterListid": 1711, "tagid": 6 -}, -{ + }, + { "filterListid": 1712, "tagid": 12 -}, -{ + }, + { "filterListid": 1712, "tagid": 3 -}, -{ + }, + { "filterListid": 1713, "tagid": 2 -}, -{ + }, + { "filterListid": 1714, "tagid": 6 -}, -{ + }, + { "filterListid": 1715, "tagid": 2 -}, -{ + }, + { "filterListid": 1716, "tagid": 6 -}, -{ + }, + { "filterListid": 1717, "tagid": 6 -}, -{ + }, + { "filterListid": 1718, "tagid": 6 -}, -{ + }, + { "filterListid": 1719, "tagid": 6 -}, -{ + }, + { "filterListid": 1720, "tagid": 3 -}, -{ + }, + { "filterListid": 1720, "tagid": 6 -}, -{ + }, + { "filterListid": 1721, "tagid": 3 -}, -{ + }, + { "filterListid": 1722, "tagid": 6 -}, -{ + }, + { "filterListid": 1723, "tagid": 3 -}, -{ + }, + { "filterListid": 1724, "tagid": 6 -}, -{ + }, + { "filterListid": 1724, "tagid": 7 -}, -{ + }, + { "filterListid": 1725, "tagid": 3 -}, -{ + }, + { "filterListid": 1725, "tagid": 6 -}, -{ + }, + { "filterListid": 1726, "tagid": 6 -}, -{ + }, + { "filterListid": 1727, "tagid": 6 -}, -{ + }, + { "filterListid": 1728, "tagid": 2 -}, -{ + }, + { "filterListid": 1729, "tagid": 2 -}, -{ + }, + { "filterListid": 1730, "tagid": 3 -}, -{ + }, + { "filterListid": 1731, "tagid": 9 -}, -{ + }, + { "filterListid": 1732, "tagid": 6 -}, -{ + }, + { "filterListid": 1733, "tagid": 3 -}, -{ + }, + { "filterListid": 1736, "tagid": 2 -}, -{ + }, + { "filterListid": 1737, "tagid": 15 -}, -{ + }, + { "filterListid": 1738, "tagid": 6 -}, -{ + }, + { "filterListid": 1701, "tagid": 2 -}, -{ + }, + { "filterListid": 1702, "tagid": 2 -}, -{ + }, + { "filterListid": 1703, "tagid": 2 -}, -{ + }, + { "filterListid": 1704, "tagid": 2 -}, -{ + }, + { "filterListid": 1705, "tagid": 2 -}, -{ + }, + { "filterListid": 1706, "tagid": 2 -}, -{ + }, + { "filterListid": 1706, "tagid": 3 -}, -{ + }, + { "filterListid": 1706, "tagid": 6 -}, -{ + }, + { "filterListid": 1707, "tagid": 2 -}, -{ + }, + { "filterListid": 1708, "tagid": 11 -}, -{ + }, + { "filterListid": 1709, "tagid": 4 -}, + }, { "filterListId": 1734, "tagId": 1 @@ -8164,723 +8136,927 @@ "tagId": 6 }, { -"filterListId": 1743, -"tagId": 2 -}, -{ -"filterListId": 1754, -"tagId": 2 -}, -{ -"filterListId": 1765, -"tagId": 2 -}, -{ -"filterListId": 1776, -"tagId": 2 -}, -{ -"filterListId": 1787, -"tagId": 2 -}, -{ -"filterListId": 1743, -"tagId": 3 -}, -{ -"filterListId": 1754, -"tagId": 3 -}, -{ -"filterListId": 1765, -"tagId": 3 -}, -{ -"filterListId": 1776, -"tagId": 3 -}, -{ -"filterListId": 1787, -"tagId": 3 -}, -{ -"filterListId": 1743, -"tagId": 6 -}, -{ -"filterListId": 1754, -"tagId": 6 -}, -{ -"filterListId": 1765, -"tagId": 6 -}, -{ -"filterListId": 1776, -"tagId": 6 -}, -{ -"filterListId": 1787, -"tagId": 6 -}, -{ -"filterListId": 1744, -"tagId": 1 -}, -{ -"filterListId": 1755, -"tagId": 1 -}, -{ -"filterListId": 1766, -"tagId": 1 -}, -{ -"filterListId": 1777, -"tagId": 1 -}, -{ -"filterListId": 1788, -"tagId": 1 -}, -{ -"filterListId": 1744, -"tagId": 2 -}, -{ -"filterListId": 1755, -"tagId": 2 -}, -{ -"filterListId": 1766, -"tagId": 2 -}, -{ -"filterListId": 1777, -"tagId": 2 -}, -{ -"filterListId": 1788, -"tagId": 2 -}, -{ -"filterListId": 1744, -"tagId": 3 -}, -{ -"filterListId": 1755, -"tagId": 3 -}, -{ -"filterListId": 1766, -"tagId": 3 -}, -{ -"filterListId": 1777, -"tagId": 3 -}, -{ -"filterListId": 1788, -"tagId": 3 -}, -{ -"filterListId": 1744, -"tagId": 6 -}, -{ -"filterListId": 1755, -"tagId": 6 -}, -{ -"filterListId": 1766, -"tagId": 6 -}, -{ -"filterListId": 1777, -"tagId": 6 -}, -{ -"filterListId": 1788, -"tagId": 6 -}, -{ -"filterListId": 1745, -"tagId": 1 -}, -{ -"filterListId": 1756, -"tagId": 1 -}, -{ -"filterListId": 1767, -"tagId": 1 -}, -{ -"filterListId": 1778, -"tagId": 1 -}, -{ -"filterListId": 1789, -"tagId": 1 -}, -{ -"filterListId": 1745, -"tagId": 2 -}, -{ -"filterListId": 1756, -"tagId": 2 -}, -{ -"filterListId": 1767, -"tagId": 2 -}, -{ -"filterListId": 1778, -"tagId": 2 -}, -{ -"filterListId": 1789, -"tagId": 2 -}, -{ -"filterListId": 1745, -"tagId": 3 -}, -{ -"filterListId": 1756, -"tagId": 3 -}, -{ -"filterListId": 1767, -"tagId": 3 -}, -{ -"filterListId": 1778, -"tagId": 3 -}, -{ -"filterListId": 1789, -"tagId": 3 -}, -{ -"filterListId": 1745, -"tagId": 6 -}, -{ -"filterListId": 1756, -"tagId": 6 -}, -{ -"filterListId": 1767, -"tagId": 6 -}, -{ -"filterListId": 1778, -"tagId": 6 -}, -{ -"filterListId": 1789, -"tagId": 6 -}, -{ -"filterListId": 1745, -"tagId": 7 -}, -{ -"filterListId": 1756, -"tagId": 7 -}, -{ -"filterListId": 1767, -"tagId": 7 -}, -{ -"filterListId": 1778, -"tagId": 7 -}, -{ -"filterListId": 1789, -"tagId": 7 -}, -{ -"filterListId": 1746, -"tagId": 1 -}, -{ -"filterListId": 1757, -"tagId": 1 -}, -{ -"filterListId": 1768, -"tagId": 1 -}, -{ -"filterListId": 1779, -"tagId": 1 -}, -{ -"filterListId": 1790, -"tagId": 1 -}, -{ -"filterListId": 1746, -"tagId": 2 -}, -{ -"filterListId": 1757, -"tagId": 2 -}, -{ -"filterListId": 1768, -"tagId": 2 -}, -{ -"filterListId": 1779, -"tagId": 2 -}, -{ -"filterListId": 1790, -"tagId": 2 -}, -{ -"filterListId": 1746, -"tagId": 3 -}, -{ -"filterListId": 1757, -"tagId": 3 -}, -{ -"filterListId": 1768, -"tagId": 3 -}, -{ -"filterListId": 1779, -"tagId": 3 -}, -{ -"filterListId": 1790, -"tagId": 3 -}, -{ -"filterListId": 1746, -"tagId": 6 -}, -{ -"filterListId": 1757, -"tagId": 6 -}, -{ -"filterListId": 1768, -"tagId": 6 -}, -{ -"filterListId": 1779, -"tagId": 6 -}, -{ -"filterListId": 1790, -"tagId": 6 -}, -{ -"filterListId": 1746, -"tagId": 7 -}, -{ -"filterListId": 1757, -"tagId": 7 -}, -{ -"filterListId": 1768, -"tagId": 7 -}, -{ -"filterListId": 1779, -"tagId": 7 -}, -{ -"filterListId": 1790, -"tagId": 7 -}, -{ -"filterListId": 1747, -"tagId": 11 -}, -{ -"filterListId": 1758, -"tagId": 11 -}, -{ -"filterListId": 1769, -"tagId": 11 -}, -{ -"filterListId": 1780, -"tagId": 11 -}, -{ -"filterListId": 1791, -"tagId": 11 -}, -{ -"filterListId": 1748, -"tagId": 1 -}, -{ -"filterListId": 1758, -"tagId": 1 -}, -{ -"filterListId": 1770, -"tagId": 1 -}, -{ -"filterListId": 1781, -"tagId": 1 -}, -{ -"filterListId": 1792, -"tagId": 1 -}, -{ -"filterListId": 1748, -"tagId": 2 -}, -{ -"filterListId": 1758, -"tagId": 2 -}, -{ -"filterListId": 1770, -"tagId": 2 -}, -{ -"filterListId": 1781, -"tagId": 2 -}, -{ -"filterListId": 1792, -"tagId": 2 -}, -{ -"filterListId": 1748, -"tagId": 3 -}, -{ -"filterListId": 1758, -"tagId": 3 -}, -{ -"filterListId": 1770, -"tagId": 3 -}, -{ -"filterListId": 1781, -"tagId": 3 -}, -{ -"filterListId": 1792, -"tagId": 3 -}, -{ -"filterListId": 1748, -"tagId": 6 -}, -{ -"filterListId": 1758, -"tagId": 6 -}, -{ -"filterListId": 1770, -"tagId": 6 -}, -{ -"filterListId": 1781, -"tagId": 6 -}, -{ -"filterListId": 1792, -"tagId": 6 -}, -{ -"filterListId": 1748, -"tagId": 7 -}, -{ -"filterListId": 1758, -"tagId": 7 -}, -{ -"filterListId": 1770, -"tagId": 7 -}, -{ -"filterListId": 1781, -"tagId": 7 -}, -{ -"filterListId": 1792, -"tagId": 7 -}, -{ -"filterListId": 1748, -"tagId": 9 -}, -{ -"filterListId": 1758, -"tagId": 9 -}, -{ -"filterListId": 1770, -"tagId": 9 -}, -{ -"filterListId": 1781, -"tagId": 9 -}, -{ -"filterListId": 1792, -"tagId": 9 -}, -{ -"filterListId": 1749, -"tagId": 1 -}, -{ -"filterListId": 1760, -"tagId": 1 -}, -{ -"filterListId": 1771, -"tagId": 1 -}, -{ -"filterListId": 1782, -"tagId": 1 -}, -{ -"filterListId": 1793, -"tagId": 1 -}, -{ -"filterListId": 1749, -"tagId": 2 -}, -{ -"filterListId": 1760, -"tagId": 2 -}, -{ -"filterListId": 1771, -"tagId": 2 -}, -{ -"filterListId": 1782, -"tagId": 2 -}, -{ -"filterListId": 1793, -"tagId": 2 -}, -{ -"filterListId": 1749, -"tagId": 3 -}, -{ -"filterListId": 1760, -"tagId": 3 -}, -{ -"filterListId": 1771, -"tagId": 3 -}, -{ -"filterListId": 1782, -"tagId": 3 -}, -{ -"filterListId": 1793, -"tagId": 3 -}, -{ -"filterListId": 1749, -"tagId": 6 -}, -{ -"filterListId": 1760, -"tagId": 6 -}, -{ -"filterListId": 1771, -"tagId": 6 -}, -{ -"filterListId": 1782, -"tagId": 6 -}, -{ -"filterListId": 1793, -"tagId": 6 -}, -{ -"filterListId": 1749, -"tagId": 7 -}, -{ -"filterListId": 1760, -"tagId": 7 -}, -{ -"filterListId": 1771, -"tagId": 7 -}, -{ -"filterListId": 1782, -"tagId": 7 -}, -{ -"filterListId": 1793, -"tagId": 7 -}, -{ -"filterListId": 1749, -"tagId": 9 -}, -{ -"filterListId": 1760, -"tagId": 9 -}, -{ -"filterListId": 1771, -"tagId": 9 -}, -{ -"filterListId": 1782, -"tagId": 9 -}, -{ -"filterListId": 1793, -"tagId": 9 -}, -{ -"filterListId": 1749, -"tagId": 11 -}, -{ -"filterListId": 1760, -"tagId": 11 -}, -{ -"filterListId": 1771, -"tagId": 11 -}, -{ -"filterListId": 1782, -"tagId": 11 -}, -{ -"filterListId": 1793, -"tagId": 11 -}, -{ -"filterListId": 1750, -"tagId": 3 -}, -{ -"filterListId": 1761, -"tagId": 3 -}, -{ -"filterListId": 1772, -"tagId": 3 -}, -{ -"filterListId": 1783, -"tagId": 3 -}, -{ -"filterListId": 1794, -"tagId": 3 -}, -{ -"filterListId": 1750, -"tagId": 6 -}, -{ -"filterListId": 1761, -"tagId": 6 -}, -{ -"filterListId": 1772, -"tagId": 6 -}, -{ -"filterListId": 1783, -"tagId": 6 -}, -{ -"filterListId": 1794, -"tagId": 6 -}, -{ -"filterListId": 1751, -"tagId": 4 -}, -{ -"filterListId": 1762, -"tagId": 4 -}, -{ -"filterListId": 1773, -"tagId": 4 -}, -{ -"filterListId": 1784, -"tagId": 4 -}, -{ -"filterListId": 1795, -"tagId": 4 -}, -{ -"filterListId": 1752, -"tagId": 11 -}, -{ -"filterListId": 1763, -"tagId": 11 -}, -{ -"filterListId": 1774, -"tagId": 11 -}, -{ -"filterListId": 1785, -"tagId": 11 -}, -{ -"filterListId": 1796, -"tagId": 11 -}, -{ -"filterListId": 1753, -"tagId": 2 -}, -{ -"filterListId": 1764, -"tagId": 2 -}, -{ -"filterListId": 1775, -"tagId": 2 -}, -{ -"filterListId": 1786, -"tagId": 2 -}, -{ -"filterListId": 1797, -"tagId": 2 -} + "filterListId": 1743, + "tagId": 2 + }, + { + "filterListId": 1754, + "tagId": 2 + }, + { + "filterListId": 1765, + "tagId": 2 + }, + { + "filterListId": 1776, + "tagId": 2 + }, + { + "filterListId": 1787, + "tagId": 2 + }, + { + "filterListId": 1743, + "tagId": 3 + }, + { + "filterListId": 1754, + "tagId": 3 + }, + { + "filterListId": 1765, + "tagId": 3 + }, + { + "filterListId": 1776, + "tagId": 3 + }, + { + "filterListId": 1787, + "tagId": 3 + }, + { + "filterListId": 1743, + "tagId": 6 + }, + { + "filterListId": 1754, + "tagId": 6 + }, + { + "filterListId": 1765, + "tagId": 6 + }, + { + "filterListId": 1776, + "tagId": 6 + }, + { + "filterListId": 1787, + "tagId": 6 + }, + { + "filterListId": 1744, + "tagId": 1 + }, + { + "filterListId": 1755, + "tagId": 1 + }, + { + "filterListId": 1766, + "tagId": 1 + }, + { + "filterListId": 1777, + "tagId": 1 + }, + { + "filterListId": 1788, + "tagId": 1 + }, + { + "filterListId": 1744, + "tagId": 2 + }, + { + "filterListId": 1755, + "tagId": 2 + }, + { + "filterListId": 1766, + "tagId": 2 + }, + { + "filterListId": 1777, + "tagId": 2 + }, + { + "filterListId": 1788, + "tagId": 2 + }, + { + "filterListId": 1744, + "tagId": 3 + }, + { + "filterListId": 1755, + "tagId": 3 + }, + { + "filterListId": 1766, + "tagId": 3 + }, + { + "filterListId": 1777, + "tagId": 3 + }, + { + "filterListId": 1788, + "tagId": 3 + }, + { + "filterListId": 1744, + "tagId": 6 + }, + { + "filterListId": 1755, + "tagId": 6 + }, + { + "filterListId": 1766, + "tagId": 6 + }, + { + "filterListId": 1777, + "tagId": 6 + }, + { + "filterListId": 1788, + "tagId": 6 + }, + { + "filterListId": 1745, + "tagId": 1 + }, + { + "filterListId": 1756, + "tagId": 1 + }, + { + "filterListId": 1767, + "tagId": 1 + }, + { + "filterListId": 1778, + "tagId": 1 + }, + { + "filterListId": 1789, + "tagId": 1 + }, + { + "filterListId": 1745, + "tagId": 2 + }, + { + "filterListId": 1756, + "tagId": 2 + }, + { + "filterListId": 1767, + "tagId": 2 + }, + { + "filterListId": 1778, + "tagId": 2 + }, + { + "filterListId": 1789, + "tagId": 2 + }, + { + "filterListId": 1745, + "tagId": 3 + }, + { + "filterListId": 1756, + "tagId": 3 + }, + { + "filterListId": 1767, + "tagId": 3 + }, + { + "filterListId": 1778, + "tagId": 3 + }, + { + "filterListId": 1789, + "tagId": 3 + }, + { + "filterListId": 1745, + "tagId": 6 + }, + { + "filterListId": 1756, + "tagId": 6 + }, + { + "filterListId": 1767, + "tagId": 6 + }, + { + "filterListId": 1778, + "tagId": 6 + }, + { + "filterListId": 1789, + "tagId": 6 + }, + { + "filterListId": 1745, + "tagId": 7 + }, + { + "filterListId": 1756, + "tagId": 7 + }, + { + "filterListId": 1767, + "tagId": 7 + }, + { + "filterListId": 1778, + "tagId": 7 + }, + { + "filterListId": 1789, + "tagId": 7 + }, + { + "filterListId": 1746, + "tagId": 1 + }, + { + "filterListId": 1757, + "tagId": 1 + }, + { + "filterListId": 1768, + "tagId": 1 + }, + { + "filterListId": 1779, + "tagId": 1 + }, + { + "filterListId": 1790, + "tagId": 1 + }, + { + "filterListId": 1746, + "tagId": 2 + }, + { + "filterListId": 1757, + "tagId": 2 + }, + { + "filterListId": 1768, + "tagId": 2 + }, + { + "filterListId": 1779, + "tagId": 2 + }, + { + "filterListId": 1790, + "tagId": 2 + }, + { + "filterListId": 1746, + "tagId": 3 + }, + { + "filterListId": 1757, + "tagId": 3 + }, + { + "filterListId": 1768, + "tagId": 3 + }, + { + "filterListId": 1779, + "tagId": 3 + }, + { + "filterListId": 1790, + "tagId": 3 + }, + { + "filterListId": 1746, + "tagId": 6 + }, + { + "filterListId": 1757, + "tagId": 6 + }, + { + "filterListId": 1768, + "tagId": 6 + }, + { + "filterListId": 1779, + "tagId": 6 + }, + { + "filterListId": 1790, + "tagId": 6 + }, + { + "filterListId": 1746, + "tagId": 7 + }, + { + "filterListId": 1757, + "tagId": 7 + }, + { + "filterListId": 1768, + "tagId": 7 + }, + { + "filterListId": 1779, + "tagId": 7 + }, + { + "filterListId": 1790, + "tagId": 7 + }, + { + "filterListId": 1747, + "tagId": 11 + }, + { + "filterListId": 1758, + "tagId": 11 + }, + { + "filterListId": 1769, + "tagId": 11 + }, + { + "filterListId": 1780, + "tagId": 11 + }, + { + "filterListId": 1791, + "tagId": 11 + }, + { + "filterListId": 1748, + "tagId": 1 + }, + { + "filterListId": 1758, + "tagId": 1 + }, + { + "filterListId": 1770, + "tagId": 1 + }, + { + "filterListId": 1781, + "tagId": 1 + }, + { + "filterListId": 1792, + "tagId": 1 + }, + { + "filterListId": 1748, + "tagId": 2 + }, + { + "filterListId": 1758, + "tagId": 2 + }, + { + "filterListId": 1770, + "tagId": 2 + }, + { + "filterListId": 1781, + "tagId": 2 + }, + { + "filterListId": 1792, + "tagId": 2 + }, + { + "filterListId": 1748, + "tagId": 3 + }, + { + "filterListId": 1758, + "tagId": 3 + }, + { + "filterListId": 1770, + "tagId": 3 + }, + { + "filterListId": 1781, + "tagId": 3 + }, + { + "filterListId": 1792, + "tagId": 3 + }, + { + "filterListId": 1748, + "tagId": 6 + }, + { + "filterListId": 1758, + "tagId": 6 + }, + { + "filterListId": 1770, + "tagId": 6 + }, + { + "filterListId": 1781, + "tagId": 6 + }, + { + "filterListId": 1792, + "tagId": 6 + }, + { + "filterListId": 1748, + "tagId": 7 + }, + { + "filterListId": 1758, + "tagId": 7 + }, + { + "filterListId": 1770, + "tagId": 7 + }, + { + "filterListId": 1781, + "tagId": 7 + }, + { + "filterListId": 1792, + "tagId": 7 + }, + { + "filterListId": 1748, + "tagId": 9 + }, + { + "filterListId": 1758, + "tagId": 9 + }, + { + "filterListId": 1770, + "tagId": 9 + }, + { + "filterListId": 1781, + "tagId": 9 + }, + { + "filterListId": 1792, + "tagId": 9 + }, + { + "filterListId": 1749, + "tagId": 1 + }, + { + "filterListId": 1760, + "tagId": 1 + }, + { + "filterListId": 1771, + "tagId": 1 + }, + { + "filterListId": 1782, + "tagId": 1 + }, + { + "filterListId": 1793, + "tagId": 1 + }, + { + "filterListId": 1749, + "tagId": 2 + }, + { + "filterListId": 1760, + "tagId": 2 + }, + { + "filterListId": 1771, + "tagId": 2 + }, + { + "filterListId": 1782, + "tagId": 2 + }, + { + "filterListId": 1793, + "tagId": 2 + }, + { + "filterListId": 1749, + "tagId": 3 + }, + { + "filterListId": 1760, + "tagId": 3 + }, + { + "filterListId": 1771, + "tagId": 3 + }, + { + "filterListId": 1782, + "tagId": 3 + }, + { + "filterListId": 1793, + "tagId": 3 + }, + { + "filterListId": 1749, + "tagId": 6 + }, + { + "filterListId": 1760, + "tagId": 6 + }, + { + "filterListId": 1771, + "tagId": 6 + }, + { + "filterListId": 1782, + "tagId": 6 + }, + { + "filterListId": 1793, + "tagId": 6 + }, + { + "filterListId": 1749, + "tagId": 7 + }, + { + "filterListId": 1760, + "tagId": 7 + }, + { + "filterListId": 1771, + "tagId": 7 + }, + { + "filterListId": 1782, + "tagId": 7 + }, + { + "filterListId": 1793, + "tagId": 7 + }, + { + "filterListId": 1749, + "tagId": 9 + }, + { + "filterListId": 1760, + "tagId": 9 + }, + { + "filterListId": 1771, + "tagId": 9 + }, + { + "filterListId": 1782, + "tagId": 9 + }, + { + "filterListId": 1793, + "tagId": 9 + }, + { + "filterListId": 1749, + "tagId": 11 + }, + { + "filterListId": 1760, + "tagId": 11 + }, + { + "filterListId": 1771, + "tagId": 11 + }, + { + "filterListId": 1782, + "tagId": 11 + }, + { + "filterListId": 1793, + "tagId": 11 + }, + { + "filterListId": 1750, + "tagId": 3 + }, + { + "filterListId": 1761, + "tagId": 3 + }, + { + "filterListId": 1772, + "tagId": 3 + }, + { + "filterListId": 1783, + "tagId": 3 + }, + { + "filterListId": 1794, + "tagId": 3 + }, + { + "filterListId": 1750, + "tagId": 6 + }, + { + "filterListId": 1761, + "tagId": 6 + }, + { + "filterListId": 1772, + "tagId": 6 + }, + { + "filterListId": 1783, + "tagId": 6 + }, + { + "filterListId": 1794, + "tagId": 6 + }, + { + "filterListId": 1751, + "tagId": 4 + }, + { + "filterListId": 1762, + "tagId": 4 + }, + { + "filterListId": 1773, + "tagId": 4 + }, + { + "filterListId": 1784, + "tagId": 4 + }, + { + "filterListId": 1795, + "tagId": 4 + }, + { + "filterListId": 1752, + "tagId": 11 + }, + { + "filterListId": 1763, + "tagId": 11 + }, + { + "filterListId": 1774, + "tagId": 11 + }, + { + "filterListId": 1785, + "tagId": 11 + }, + { + "filterListId": 1796, + "tagId": 11 + }, + { + "filterListId": 1753, + "tagId": 2 + }, + { + "filterListId": 1764, + "tagId": 2 + }, + { + "filterListId": 1775, + "tagId": 2 + }, + { + "filterListId": 1786, + "tagId": 2 + }, + { + "filterListId": 1797, + "tagId": 2 + }, + { + "filterListId": 1759, + "tagId": 1 + }, + { + "filterListId": 1759, + "tagId": 2 + }, + { + "filterListId": 1759, + "tagId": 3 + }, + { + "filterListId": 1759, + "tagId": 6 + }, + { + "filterListId": 1759, + "tagId": 7 + }, + { + "filterListId": 1759, + "tagId": 9 + }, + { + "filterListId": 1799, + "tagId": 5 + }, + { + "filterListId": 1800, + "tagId": 2 + }, + { + "filterListId": 1800, + "tagId": 3 + }, + { + "filterListId": 1800, + "tagId": 12 + }, + { + "filterListId": 1801, + "tagId": 2 + }, + { + "filterListId": 1801, + "tagId": 3 + }, + { + "filterListId": 1802, + "tagId": 2 + }, + { + "filterListId": 1803, + "tagId": 2 + }, + { + "filterListId": 1803, + "tagId": 3 + }, + { + "filterListId": 1804, + "tagId": 2 + }, + { + "filterListId": 1805, + "tagId": 2 + }, + { + "filterListId": 1805, + "tagId": 12 + }, + { + "filterListId": 1806, + "tagId": 6 + }, + { + "filterListId": 1807, + "tagId": 6 + }, + { + "filterListId": 1808, + "tagId": 6 + }, + { + "filterListId": 1809, + "tagId": 6 + }, + { + "filterListId": 1810, + "tagId": 6 + }, + { + "filterListId": 1811, + "tagId": 6 + }, + { + "filterListId": 1812, + "tagId": 6 + }, + { + "filterListId": 1813, + "tagId": 6 + }, + { + "filterListId": 1814, + "tagId": 21 + }, + { + "filterListId": 1814, + "tagId": 25 + }, + { + "filterListId": 1815, + "tagId": 15 + }, + { + "filterListId": 1816, + "tagId": 7 + }, + { + "filterListId": 1817, + "tagId": 2 + }, + { + "filterListId": 1817, + "tagId": 3 + }, + { + "filterListId": 1818, + "tagId": 2 + }, + { + "filterListId": 1818, + "tagId": 3 + }, + { + "filterListId": 1819, + "tagId": 15 + }, + { + "filterListId": 1819, + "tagId": 19 + }, + { + "filterListId": 1820, + "tagId": 2 + }, + { + "filterListId": 1821, + "tagId": 2 + }, + { + "filterListId": 1822, + "tagId": 6 + }, + { + "filterListId": 1823, + "tagId": 6 + }, + { + "filterListId": 1824, + "tagId": 6 + }, + { + "filterListId": 1825, + "tagId": 7 + }, + { + "filterListId": 1826, + "tagId": 6 + }, + { + "filterListId": 1827, + "tagId": 6 + }, + { + "filterListId": 1828, + "tagId": 7 + }, + { + "filterListId": 1829, + "tagId": 6 + }, + { + "filterListId": 1830, + "tagId": 6 + }, + { + "filterListId": 1831, + "tagId": 2 + }, + { + "filterListId": 1831, + "tagId": 3 + }, + { + "filterListId": 1832, + "tagId": 18 + }, + { + "filterListId": 1832, + "tagId": 30 + } ] diff --git a/data/Language.json b/data/Language.json index 4077e48e2..ac1263b30 100644 --- a/data/Language.json +++ b/data/Language.json @@ -216,7 +216,7 @@ "iso6392B": "snd", "iso6392T": "snd", "iso6393": "snd", - "localName": "سنڌي‎", + "localName": "سنڌي", "name": "Sindhi" }, { @@ -1799,4 +1799,4 @@ "localName": "isiZulu", "name": "Zulu" } -] \ No newline at end of file +] diff --git a/data/License.json b/data/License.json index d587af89d..164e91c46 100644 --- a/data/License.json +++ b/data/License.json @@ -215,7 +215,7 @@ }, { "id": 32, - "name": "Permissive but non-commercial", + "name": "Permissive non-commercial", "permissiveAdaptation": true, "permissiveCommercial": false }, @@ -265,5 +265,12 @@ "name": "Generic copyleft", "permissiveAdaptation": true, "permissiveCommercial": true + }, + { + "id": 40, + "descriptionUrl": "https://pgl.yoyo.org/license/", + "name": "McRae General Public License", + "permissiveAdaptation": true, + "permissiveCommercial": false } ] diff --git a/data/Maintainer.json b/data/Maintainer.json index 3cf302eb6..c0101ea57 100644 --- a/data/Maintainer.json +++ b/data/Maintainer.json @@ -733,5 +733,10 @@ "id": 139, "homeUrl": "https://www.github.developerdan.com/hosts/", "name": "lightswitch05" + }, + { + "id": 140, + "homeUrl": "https://github.com/mmotti", + "name": "mmotti" } ] diff --git a/data/Merge.json b/data/Merge.json index 5d95260dc..d5d5a0afb 100644 --- a/data/Merge.json +++ b/data/Merge.json @@ -315,14 +315,6 @@ "mergeFilterListId": 566, "upstreamFilterListId": 570 }, - { - "mergeFilterListId": 566, - "upstreamFilterListId": 571 - }, - { - "mergeFilterListId": 566, - "upstreamFilterListId": 572 - }, { "mergeFilterListId": 566, "upstreamFilterListId": 573 @@ -335,18 +327,6 @@ "mergeFilterListId": 566, "upstreamFilterListId": 575 }, - { - "mergeFilterListId": 566, - "upstreamFilterListId": 577 - }, - { - "mergeFilterListId": 566, - "upstreamFilterListId": 579 - }, - { - "mergeFilterListId": 566, - "upstreamFilterListId": 582 - }, { "mergeFilterListId": 566, "upstreamFilterListId": 583 @@ -358,13 +338,5 @@ { "mergeFilterListId": 566, "upstreamFilterListId": 586 - }, - { - "mergeFilterListId": 566, - "upstreamFilterListId": 587 - }, - { - "mergeFilterListId": 566, - "upstreamFilterListId": 588 } -] \ No newline at end of file +] diff --git a/data/Software.json b/data/Software.json index 86ec88027..683d4f4d5 100644 --- a/data/Software.json +++ b/data/Software.json @@ -217,5 +217,26 @@ "id": 34, "isAbpSubscribable": false, "name": "Windows command line" + }, + { + "id": 35, + "downloadUrl": "https://shadowsocks.org/en/download/clients.html", + "homeUrl": "https://shadowsocks.org/en/index.html", + "isAbpSubscribable": false, + "name": "Shadowsocks" + }, + { + "id": 36, + "downloadUrl": "https://github.com/shadowsocksrr/shadowsocksr-csharp/releases", + "homeUrl": "https://github.com/shadowsocksrr/shadowsocksr-csharp", + "isAbpSubscribable": false, + "name": "ShadowsocksR" + }, + { + "id": 37, + "downloadUrl": "https://apps.apple.com/app/shadowrocket/id932747118", + "homeUrl": "https://liguangming.com/Shadowrocket", + "isAbpSubscribable": false, + "name": "Shadowrocket" } -] \ No newline at end of file +] diff --git a/data/SoftwareSyntax.json b/data/SoftwareSyntax.json index d88a25d18..b2752b892 100644 --- a/data/SoftwareSyntax.json +++ b/data/SoftwareSyntax.json @@ -370,5 +370,21 @@ { "softwareId": 32, "syntaxId": 28 + }, + { + "softwareId": 35, + "syntaxId": 29 + }, + { + "softwareId": 36, + "syntaxId": 29 + }, + { + "softwareId": 37, + "syntaxId": 29 + }, + { + "softwareId": 14, + "syntaxId": 30 } -] \ No newline at end of file +] diff --git a/data/Syntax.json b/data/Syntax.json index 7402a1b50..2403ddf5d 100644 --- a/data/Syntax.json +++ b/data/Syntax.json @@ -119,5 +119,14 @@ { "id": 28, "name": "Adblocker-syntax domains" + }, + { + "id": 29, + "name": "Socks5" + }, + { + "id": 30, + "definitionUrl": "https://docs.pi-hole.net/ftldns/regex/tutorial/", + "name": "Pi-hole regular expressions" } ] diff --git a/docker-compose.agent.tests.yml b/docker-compose.agent.tests.yml index aa53c2b07..f3c6cfd2c 100644 --- a/docker-compose.agent.tests.yml +++ b/docker-compose.agent.tests.yml @@ -2,7 +2,7 @@ version: "3.7" services: agent: - image: collinbarrett/filterlists.agent:test-agent + image: collinbarrett2/filterlists.agent:test-agent build: context: . dockerfile: src/FilterLists.Agent/Dockerfile @@ -14,7 +14,7 @@ services: networks: test-agent: - + volumes: test-agent-results: external: true diff --git a/docker-compose.data.tests.yml b/docker-compose.data.tests.yml index 3e45a5d68..0544bf5a3 100644 --- a/docker-compose.data.tests.yml +++ b/docker-compose.data.tests.yml @@ -2,7 +2,7 @@ version: "3.7" services: api: - image: collinbarrett/filterlists.api:test-data + image: collinbarrett2/filterlists.api:test-data build: context: . dockerfile: src/FilterLists.Api/Dockerfile @@ -27,7 +27,7 @@ services: [ "mysqld", "--character-set-server=utf8mb4", - "--collation-server=utf8mb4_unicode_520_ci" + "--collation-server=utf8mb4_unicode_520_ci", ] networks: diff --git a/docker-compose.services.tests.yml b/docker-compose.services.tests.yml index 52f472ec5..9dd00b976 100644 --- a/docker-compose.services.tests.yml +++ b/docker-compose.services.tests.yml @@ -2,7 +2,7 @@ version: "3.7" services: api: - image: collinbarrett/filterlists.api:test-services + image: collinbarrett2/filterlists.api:test-services build: context: . dockerfile: src/FilterLists.Api/Dockerfile @@ -14,7 +14,7 @@ services: networks: test-services: - + volumes: test-services-results: external: true diff --git a/docker-compose.yml b/docker-compose.yml index 37d8826e7..ff7afac2e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: - ./ops/nginx/svr-includes:/etc/nginx/svr-includes:ro web: - image: collinbarrett/filterlists.web:latest + image: collinbarrett2/filterlists.web:latest restart: always build: context: . @@ -23,7 +23,7 @@ services: - reverse-proxy api: - image: collinbarrett/filterlists.api:latest + image: collinbarrett2/filterlists.api:latest restart: always build: context: . @@ -53,11 +53,11 @@ services: [ "mysqld", "--character-set-server=utf8mb4", - "--collation-server=utf8mb4_unicode_520_ci" + "--collation-server=utf8mb4_unicode_520_ci", ] agent: - image: collinbarrett/filterlists.agent:latest + image: collinbarrett2/filterlists.agent:latest build: context: . dockerfile: src/FilterLists.Agent/Dockerfile diff --git a/src/FilterLists.Agent/FilterLists.Agent.csproj b/src/FilterLists.Agent/FilterLists.Agent.csproj index be11dfbb2..64f889b00 100644 --- a/src/FilterLists.Agent/FilterLists.Agent.csproj +++ b/src/FilterLists.Agent/FilterLists.Agent.csproj @@ -36,7 +36,7 @@ - + @@ -51,14 +51,14 @@ - + - - + + - + diff --git a/src/FilterLists.Api/FilterLists.Api.csproj b/src/FilterLists.Api/FilterLists.Api.csproj index 3187b604b..770804bfd 100644 --- a/src/FilterLists.Api/FilterLists.Api.csproj +++ b/src/FilterLists.Api/FilterLists.Api.csproj @@ -43,10 +43,10 @@ - + - + \ No newline at end of file diff --git a/src/FilterLists.Services/FilterLists.Services.csproj b/src/FilterLists.Services/FilterLists.Services.csproj index 3d0f5784a..59db0ea0c 100644 --- a/src/FilterLists.Services/FilterLists.Services.csproj +++ b/src/FilterLists.Services/FilterLists.Services.csproj @@ -31,7 +31,7 @@ - + \ No newline at end of file diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json index 824648ead..5c095e1a9 100644 Binary files a/src/FilterLists.Web/package-lock.json and b/src/FilterLists.Web/package-lock.json differ diff --git a/src/FilterLists.Web/src/components/softwareCloud/SoftwareIcon.tsx b/src/FilterLists.Web/src/components/softwareCloud/SoftwareIcon.tsx index 55057f058..b1618bf98 100644 --- a/src/FilterLists.Web/src/components/softwareCloud/SoftwareIcon.tsx +++ b/src/FilterLists.Web/src/components/softwareCloud/SoftwareIcon.tsx @@ -88,4 +88,4 @@ const icons: { [id: number]: Icon; } = { 32: { image: img32, imageTitle: "AdNauseam" }, 33: { image: img33, imageTitle: "Legacy Unix derivatives" }, 34: { image: img34, imageTitle: "Windows command line" } -}; \ No newline at end of file +};