From 22dd0370d446271671819e1212cd3e8431abf5d0 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 15 May 2018 05:49:08 +0200 Subject: [PATCH 01/10] Added three new lists and updated some of my links --- data/FilterList.json | 72 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 63 insertions(+), 9 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 4e398be15..9a544dbd5 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -366,7 +366,7 @@ "description": "Removes ads, affiliation ads, and empty boxes on Norwegian sites to produce a cleaner browser experience. Meant to be used on top of general filters.", "descriptionSourceUrl": null, "discontinuedDate": null, - "donateUrl": "https://www.paypal.me/DandeeSprout", + "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", "emailAddress": "imreeil42@gmail.com", "forumUrl": null, "homeUrl": "https://github.com/DandelionSprout/adfilt", @@ -377,7 +377,7 @@ "publishedDate": null, "submissionUrl": null, "syntaxId": 3, - "viewUrl": "https://github.com/DandelionSprout/adfilt/raw/master/ExperimentalNorwegianList.txt" + "viewUrl": "https://github.com/DandelionSprout/adfilt/raw/master/NorwegianList.txt" }, { "id": 21, @@ -6199,7 +6199,7 @@ "description": "Removes \"Download Our App\" banners from mobile website versions, for those who prefer their phone web browsers instead of apps.", "descriptionSourceUrl": null, "discontinuedDate": null, - "donateUrl": "https://www.paypal.me/DandeeSprout", + "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", "emailAddress": "imreeil42@gmail.com", "forumUrl": null, "homeUrl": "https://github.com/DandelionSprout/adfilt", @@ -7282,7 +7282,7 @@ "description": "This list is made so as to make it a lot easier on paper to use Norwegian cashback services without necessarily having to turn off your adblocker. This is because it'll prevent your adblocker from working on these sites, as adblockers have otherwise been known to interrupt cashback recognition mechanisms. It's currently tailored to users of Kickback, ViaTrumf and Norwegian Reward.", "descriptionSourceUrl": null, "discontinuedDate": null, - "donateUrl": "https://www.paypal.me/DandeeSprout", + "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", "emailAddress": "imreeil42@gmail.com", "forumUrl": null, "homeUrl": "https://github.com/DandelionSprout/adfilt", @@ -7301,7 +7301,7 @@ "description": "Are you tired of having to use Paint to remove potentially sensitive usernames, each and every time you're making a compilation of social media posts? Say no more! This list will remove posters' usernames from the biggest compilation sources, so that you can simply take a screencap and add it directly into your video/timeline!", "descriptionSourceUrl": null, "discontinuedDate": null, - "donateUrl": "https://www.paypal.me/DandeeSprout", + "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", "emailAddress": "imreeil42@gmail.com", "forumUrl": null, "homeUrl": "https://github.com/DandelionSprout/adfilt", @@ -7320,7 +7320,7 @@ "description": "The Sami indigenous people, spanning 4 official countries, and 6 actively used Sami languages, deserve a list of their own to bolster their proudness.", "descriptionSourceUrl": null, "discontinuedDate": null, - "donateUrl": "https://www.paypal.me/DandeeSprout", + "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", "emailAddress": "imreeil42@gmail.com", "forumUrl": null, "homeUrl": "https://github.com/DandelionSprout/adfilt", @@ -7339,7 +7339,7 @@ "description": "Removes ads, affiliation ads, and empty boxes on Norwegian sites to produce a cleaner browser experience. Meant to be used on top of general filters.", "descriptionSourceUrl": null, "discontinuedDate": null, - "donateUrl": "https://www.paypal.me/DandeeSprout", + "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", "emailAddress": "imreeil42@gmail.com", "forumUrl": null, "homeUrl": "https://github.com/DandelionSprout/adfilt", @@ -7358,7 +7358,7 @@ "description": "Removes ads, affiliation ads, and empty boxes on Norwegian sites to produce a cleaner browser experience. Meant to be used on top of general filters. The quality of the current TPL conversion is so-so, so don't expect perfect results.", "descriptionSourceUrl": null, "discontinuedDate": null, - "donateUrl": "https://www.paypal.me/DandeeSprout", + "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", "emailAddress": "imreeil42@gmail.com", "forumUrl": null, "homeUrl": "https://github.com/DandelionSprout/adfilt", @@ -7377,7 +7377,7 @@ "description": "Here's how this list works. This is a categorised list of URLs that clot up Google search results. The list is designed for use with Personal Blocklist (and its Import function) for Google Search and Google Chrome users, in such a way that it removes search results for the URLs from your Google searches. If any other URL-based search-result-blockers for other search engines (incl. for Google Image Search) and browsers exist out there, feel free to tell me about them. The list is VERY subjective, so quite a few of you may NOT want to block the results for ALL of these URLs. In that case, simply pick whichever ones from this buffet that you want to block, and paste them into Personal Blocklist. While this list is technically possible to add to adblocker tools, it'd be a very bad idea to do so, since you wouldn't have any control over which URLs you'll be able to block outright or not.", "descriptionSourceUrl": null, "discontinuedDate": null, - "donateUrl": "https://www.paypal.me/DandeeSprout", + "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", "emailAddress": "imreeil42@gmail.com", "forumUrl": null, "homeUrl": "https://github.com/DandelionSprout/adfilt", @@ -7408,5 +7408,59 @@ "submissionUrl": null, "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/PolishFiltersTeam/PolishRSSFilters/master/polish_rss_filters.txt" + }, + { + "id": 391, + "description": "Removes popular games and most bad games from the front pages of various webstores and app stores.", + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", + "emailAddress": "imreeil42@gmail.com", + "forumUrl": null, + "homeUrl": "https://github.com/DandelionSprout/adfilt", + "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", + "licenseId": 10, + "name": "I Hate Overpromoted Games", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/IHateOverpromotedGames.txt" + }, + { + "id": 392, + "description": "Intends to make it easier to browse various websites without being forced by various nag-windows to log in. At the time of writing (15th of May 2018) it chiefly supports Pinterest, Facebook and Pixiv.", + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", + "emailAddress": "imreeil42@gmail.com", + "forumUrl": null, + "homeUrl": "https://github.com/DandelionSprout/adfilt", + "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", + "licenseId": 10, + "name": "Browsing websites without logging in", + "policyUrl": null, + "publishedDate": "2018-05-15T00:00:00", + "submissionUrl": null, + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/BrowseWebsitesWithoutLoggingIn.txt" + }, + { + "id": 393, + "description": "A list that demonstrates and makes use of Einar Egilsson's Redirector extensions, in order to accomplish things that no adblock tool could've achieved. Examples include turning 32-bit Windows program installation links into 64-bit ones, making Disney's US websites accessible from other countries, and turning mobile Wikipedia links into desktop ones, among other things.", + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", + "emailAddress": "imreeil42@gmail.com", + "forumUrl": null, + "homeUrl": "https://github.com/DandelionSprout/adfilt/tree/master/Dandelion%20Sprout-s%20Redirector%20Assistant%20List", + "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", + "licenseId": 10, + "name": "Dandelion Sprout's Redirector List", + "policyUrl": null, + "publishedDate": "2018-05-15T00:00:00", + "submissionUrl": null, + "syntaxId": null, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Dandelion%20Sprout-s%20Redirector%20Assistant%20List/DandelionSproutRedirectorList.json" } ] From 483b707c8167af7f17ad052c121635bbc79e14e8 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 15 May 2018 05:53:15 +0200 Subject: [PATCH 02/10] Added maintainer entries for the new lists --- data/FilterListMaintainer.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 4b1a743f7..d910111a0 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -598,5 +598,17 @@ { "filterListId": 390, "maintainerId": 34 + }, + { + "filterListId": 391, + "maintainerId": 22 + }, + { + "filterListId": 392, + "maintainerId": 22 + }, + { + "filterListId": 393, + "maintainerId": 22 } ] From 8cbe9f8a63c733a61136a9701b43eca87fe5f6c2 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 15 May 2018 05:59:17 +0200 Subject: [PATCH 03/10] Added some more adblocker tools --- data/Software.json | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/data/Software.json b/data/Software.json index a8a7b8eac..37285d527 100644 --- a/data/Software.json +++ b/data/Software.json @@ -1,4 +1,4 @@ -[ +[ { "id": 1, "downloadUrl": "https://github.com/gorhill/uBlock#installation", @@ -16,5 +16,23 @@ "downloadUrl": "https://adguard.com/en/download.html", "homeUrl": "https://adguard.com/", "name": "AdGuard" + }, + { + "id": 4, + "downloadUrl": "https://f-droid.org/packages/org.jak_linux.dns66/", + "homeUrl": "https://github.com/julian-klode/dns66", + "name": "DNS66" + }, + { + "id": 5, + "downloadUrl": "https://github.com/NanoAdblocker/NanoCore#nano-adblocker-core", + "homeUrl": "https://github.com/NanoAdblocker/NanoCore", + "name": "Nano Adblocker" + }, + { + "id": 6, + "downloadUrl": "https://getadblock.com/", + "homeUrl": "https://getadblock.com/", + "name": "AdBlock" } -] \ No newline at end of file +] From bbbcd532f5ed564ec84345b9a530800926f184f1 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 15 May 2018 06:05:07 +0200 Subject: [PATCH 04/10] Attempted to add syntaxes for the new adblockers --- data/SoftwareSyntax.json | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/data/SoftwareSyntax.json b/data/SoftwareSyntax.json index 5d554a6d1..79edba829 100644 --- a/data/SoftwareSyntax.json +++ b/data/SoftwareSyntax.json @@ -1,14 +1,26 @@ -[ - { - "softwareId": 2, - "syntaxId": 3 - }, + [ { "softwareId": 1, "syntaxId": 4 }, + { + "softwareId": 2, + "syntaxId": 3 + }, { "softwareId": 3, "syntaxId": 6 + }, + { + "softwareId": 4, + "syntaxId": 3 + }, + { + "softwareId": 5, + "syntaxId": 4 + }, + { + "softwareId": 6, + "syntaxId": 3 } -] \ No newline at end of file +] From 599903dc8f0456c1b7dcf05191eb044b7fec3879 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 15 May 2018 06:10:33 +0200 Subject: [PATCH 05/10] Added DNS66 to the list of software --- .github/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/README.md b/.github/README.md index 4cfd14465..ece297590 100644 --- a/.github/README.md +++ b/.github/README.md @@ -39,6 +39,7 @@ One can use FilterLists in the following software tools. Software support of any * [Adblock Plus](https://adblockplus.org/) * [AdGuard](https://adguard.com/) * [uBlock Origin](https://github.com/gorhill/uBlock) +* [DNS66](https://github.com/julian-klode/dns66) * ...[Did we forget one?](https://github.com/collinbarrett/FilterLists/issues) ## Miscellany From 83666fa52c2dd3b21934818afb38db4f9bdc9ba3 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 15 May 2018 06:20:26 +0200 Subject: [PATCH 06/10] Added Nano to the list of software --- .github/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/README.md b/.github/README.md index ece297590..c8231edf1 100644 --- a/.github/README.md +++ b/.github/README.md @@ -40,6 +40,7 @@ One can use FilterLists in the following software tools. Software support of any * [AdGuard](https://adguard.com/) * [uBlock Origin](https://github.com/gorhill/uBlock) * [DNS66](https://github.com/julian-klode/dns66) +* [Nano Adblocker](https://github.com/NanoAdblocker/NanoCore) * ...[Did we forget one?](https://github.com/collinbarrett/FilterLists/issues) ## Miscellany From e1ccf78881c4e2d7b759b1eea6ad2b25692cd715 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 15 May 2018 14:24:35 +0200 Subject: [PATCH 07/10] Attempted to arrange them alphabetically --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index c8231edf1..67b9f3ae4 100644 --- a/.github/README.md +++ b/.github/README.md @@ -38,9 +38,9 @@ One can use FilterLists in the following software tools. Software support of any * [AdBlock](https://getadblock.com/) * [Adblock Plus](https://adblockplus.org/) * [AdGuard](https://adguard.com/) -* [uBlock Origin](https://github.com/gorhill/uBlock) * [DNS66](https://github.com/julian-klode/dns66) * [Nano Adblocker](https://github.com/NanoAdblocker/NanoCore) +* [uBlock Origin](https://github.com/gorhill/uBlock) * ...[Did we forget one?](https://github.com/collinbarrett/FilterLists/issues) ## Miscellany From 670399c683ae6cd8b50392d35b560ab6362246a6 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 15 May 2018 14:32:10 +0200 Subject: [PATCH 08/10] Hopefully added a new syntax --- data/Syntax.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/data/Syntax.json b/data/Syntax.json index 4277c6e40..e1dbaf62f 100644 --- a/data/Syntax.json +++ b/data/Syntax.json @@ -43,5 +43,10 @@ "id": 10, "definitionUrl": "https://blogs.msdn.microsoft.com/ie/2010/12/07/ie9-and-privacy-introducing-tracking-protection/", "name": "Tracking Protection List (IE)" + }, + { + "id": 11, + "definitionUrl": null, + "name": "JSON (Non-Adblock Plus)" } -] \ No newline at end of file +] From 7e8ee8144cdff5b154c9656d7051560c18970356 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 15 May 2018 14:32:47 +0200 Subject: [PATCH 09/10] Corrected said syntax's name --- data/Syntax.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/Syntax.json b/data/Syntax.json index e1dbaf62f..68c477f80 100644 --- a/data/Syntax.json +++ b/data/Syntax.json @@ -47,6 +47,6 @@ { "id": 11, "definitionUrl": null, - "name": "JSON (Non-Adblock Plus)" + "name": "JavaScript (Non-Safari)" } ] From d4b85cd15f9232b568885803fa9e2f0976399f7b Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 15 May 2018 14:33:31 +0200 Subject: [PATCH 10/10] Added a syntax ID for the Redirector list --- data/FilterList.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 9a544dbd5..0e9f02ee7 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -7460,7 +7460,7 @@ "policyUrl": null, "publishedDate": "2018-05-15T00:00:00", "submissionUrl": null, - "syntaxId": null, + "syntaxId": 11, "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Dandelion%20Sprout-s%20Redirector%20Assistant%20List/DandelionSproutRedirectorList.json" } ]