From 4d7c87df051930d47efa0e3b945ef99636819ceb Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 12 Apr 2018 22:30:08 +0200 Subject: [PATCH 01/12] Added my newest lists --- data/FilterList.json | 121 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 118 insertions(+), 3 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 0cfadc58c..79b6220cc 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -372,7 +372,7 @@ "homeUrl": "https://github.com/DandelionSprout/adfilt", "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", "licenseId": 10, - "name": "Dandelion Sprouts Norwegian Filters for More Clean Web Pages", + "name": "Dandelion Sprout's Norwegian Filters for Tidier Websites", "policyUrl": null, "publishedDate": null, "submissionUrl": null, @@ -7275,5 +7275,120 @@ "submissionUrl": "https://austinhuang.me/contact", "syntaxId": 4, "viewUrl": "https://raw.githubusercontent.com/austinhuang0131/0131-block-list/master/list.txt" - } -] \ No newline at end of file + }, + { + "id": 384, + "chatUrl": null, + "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", + "emailAddress": "imreeil42@gmail.com", + "forumUrl": null, + "homeUrl": "https://github.com/DandelionSprout/adfilt", + "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", + "licenseId": 10, + "name": "Norwegian Cashback Helper", + "policyUrl": null, + "publishedDate": 2018-04-12T20:08:49, + "submissionUrl": null, + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianCashbackHelper.txt" + }, + { + "id": 385, + "chatUrl": null, + "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", + "emailAddress": "imreeil42@gmail.com", + "forumUrl": null, + "homeUrl": "https://github.com/DandelionSprout/adfilt", + "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", + "licenseId": 10, + "name": "Username Hider for Compilation Creators", + "policyUrl": null, + "publishedDate": 2018-04-12T20:17:23, + "submissionUrl": null, + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Username%20Hider%20for%20Compilation%20Creators.txt" + }, + { + "id": 386, + "chatUrl": null, + "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", + "emailAddress": "imreeil42@gmail.com", + "forumUrl": null, + "homeUrl": "https://github.com/DandelionSprout/adfilt", + "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", + "licenseId": 10, + "name": "Dandelion Sprout's Tidy Sami-languages Internet List", + "policyUrl": null, + "publishedDate": 2018-04-12T20:18:16, + "submissionUrl": null, + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/S%C3%A1megiella-interneahttalisttu.txt" + }, + { + "id": 387, + "chatUrl": null, + "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", + "emailAddress": "imreeil42@gmail.com", + "forumUrl": null, + "homeUrl": "https://github.com/DandelionSprout/adfilt", + "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", + "licenseId": 10, + "name": "Dandelion Sprout's Norwegian Filters for Tidier Websites (iOS Safari)", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/DandelionSproutsNorskeFiltre.json" + }, + { + "id": 388, + "chatUrl": null, + "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", + "emailAddress": "imreeil42@gmail.com", + "forumUrl": null, + "homeUrl": "https://github.com/DandelionSprout/adfilt", + "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", + "licenseId": 10, + "name": "Dandelion Sprout's Norwegian Filters for Tidier Websites (Internet Explorer)", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/DandelionSproutsNorskeFiltre.tpl" + }, + { + { + "id": 389, + "chatUrl": null, + "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", + "emailAddress": "imreeil42@gmail.com", + "forumUrl": null, + "homeUrl": "https://github.com/DandelionSprout/adfilt", + "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", + "licenseId": 10, + "name": "Dandelion Sprout's list for Chrome Personal Blocklist", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/List%20for%20Chrome%20Personal%20Blocklist" + }, +] From 8ca150cbe042a26b462b1bab437c98f023c07f14 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 12 Apr 2018 22:36:44 +0200 Subject: [PATCH 02/12] Tied my lists to entries in this file --- data/FilterListMaintainer.json | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 1842f0777..6fa4127fe 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -99,6 +99,30 @@ "filterListId": 328, "maintainerId": 22 }, + { + "filterListId": 384 + "maintainerId": 22 + }, + { + "filterListId": 385 + "maintainerId": 22 + }, + { + "filterListId": 386 + "maintainerId": 22 + }, + { + "filterListId": 387 + "maintainerId": 22 + }, + { + "filterListId": 388 + "maintainerId": 22 + }, + { + "filterListId": 399 + "maintainerId": 22 + }, { "filterListId": 23, "maintainerId": 23 @@ -571,4 +595,4 @@ "filterListId": 172, "maintainerId": 60 } -] \ No newline at end of file +] From 64bd21caa58c9fd891e720442bb27cdf050d2110 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 12 Apr 2018 22:38:26 +0200 Subject: [PATCH 03/12] Fixed date tags --- data/FilterList.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 79b6220cc..67edb0193 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -7290,7 +7290,7 @@ "licenseId": 10, "name": "Norwegian Cashback Helper", "policyUrl": null, - "publishedDate": 2018-04-12T20:08:49, + "publishedDate": "2018-04-12T20:08:49", "submissionUrl": null, "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianCashbackHelper.txt" @@ -7309,7 +7309,7 @@ "licenseId": 10, "name": "Username Hider for Compilation Creators", "policyUrl": null, - "publishedDate": 2018-04-12T20:17:23, + "publishedDate": "2018-04-12T20:17:23", "submissionUrl": null, "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Username%20Hider%20for%20Compilation%20Creators.txt" @@ -7328,7 +7328,7 @@ "licenseId": 10, "name": "Dandelion Sprout's Tidy Sami-languages Internet List", "policyUrl": null, - "publishedDate": 2018-04-12T20:18:16, + "publishedDate": "2018-04-12T20:37:57", "submissionUrl": null, "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/S%C3%A1megiella-interneahttalisttu.txt" @@ -7372,7 +7372,7 @@ "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/DandelionSproutsNorskeFiltre.tpl" }, { - { + { "id": 389, "chatUrl": null, "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.", From 4c9cbc724b4700d666982a2c7e05f4c346d765c9 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 12 Apr 2018 22:39:05 +0200 Subject: [PATCH 04/12] Removed redundant bracket --- data/FilterList.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 67edb0193..0a72a9960 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -7371,7 +7371,6 @@ "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/DandelionSproutsNorskeFiltre.tpl" }, - { { "id": 389, "chatUrl": null, From 00fa02c8d4b78cdd49c6158c0e3e45ab95468875 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 12 Apr 2018 22:44:20 +0200 Subject: [PATCH 05/12] Added syntax IDs to two of my lists --- data/FilterList.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 0a72a9960..1527ac699 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -7368,7 +7368,7 @@ "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": 3, + "syntaxId": 10, "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/DandelionSproutsNorskeFiltre.tpl" }, { @@ -7387,7 +7387,7 @@ "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": 3, + "syntaxId": 8, "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/List%20for%20Chrome%20Personal%20Blocklist" }, ] From 72d68136ca21a5ca7ea6e7fa62766b80b47ab691 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 12 Apr 2018 22:47:35 +0200 Subject: [PATCH 06/12] Tied Sami list to Northern Sami language --- data/FilterListLanguage.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index 2bcb25352..879e74444 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -610,5 +610,9 @@ { "filterListId": 370, "languageId": 105 + }, + { + "filterListId": 386 + "languageId": 46 } -] \ No newline at end of file +] From 3abd0c7983f74b61ee79e5d93fa0503a97d0ec3e Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 12 Apr 2018 23:06:51 +0200 Subject: [PATCH 07/12] Tied Norwegian cashback list to Norwegian --- data/FilterListLanguage.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index 879e74444..3e99fb164 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -611,6 +611,10 @@ "filterListId": 370, "languageId": 105 }, + { + "filterListId": 384 + "languageId": 44 + }, { "filterListId": 386 "languageId": 46 From 7c529695f271908729354926315c2265eb71e697 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 12 Apr 2018 23:09:47 +0200 Subject: [PATCH 08/12] Tied two other lists to Norwegian --- data/FilterListLanguage.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index 3e99fb164..907959218 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -618,5 +618,13 @@ { "filterListId": 386 "languageId": 46 + }, + { + "filterListId": 387 + "languageId": 44 + }, + { + "filterListID": 388 + "languageId": 44 } ] From c31b8a6e8cb6120c2cb5c4f9e05c744ebfc2c896 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 12 Apr 2018 23:16:10 +0200 Subject: [PATCH 09/12] Update FilterList.json --- data/FilterList.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 1527ac699..6bb4021f1 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -7290,7 +7290,7 @@ "licenseId": 10, "name": "Norwegian Cashback Helper", "policyUrl": null, - "publishedDate": "2018-04-12T20:08:49", + "publishedDate": null, "submissionUrl": null, "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianCashbackHelper.txt" @@ -7309,7 +7309,7 @@ "licenseId": 10, "name": "Username Hider for Compilation Creators", "policyUrl": null, - "publishedDate": "2018-04-12T20:17:23", + "publishedDate": null, "submissionUrl": null, "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Username%20Hider%20for%20Compilation%20Creators.txt" @@ -7328,7 +7328,7 @@ "licenseId": 10, "name": "Dandelion Sprout's Tidy Sami-languages Internet List", "policyUrl": null, - "publishedDate": "2018-04-12T20:37:57", + "publishedDate": null, "submissionUrl": null, "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/S%C3%A1megiella-interneahttalisttu.txt" From aab1c974cca237758dd951358199f9fe761f6684 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 13 Apr 2018 06:39:46 +0200 Subject: [PATCH 10/12] Fixed colon errors, part 1 --- data/FilterListLanguage.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index 907959218..4b1dbe7f7 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -612,19 +612,19 @@ "languageId": 105 }, { - "filterListId": 384 + "filterListId": 384, "languageId": 44 }, { - "filterListId": 386 + "filterListId": 386, "languageId": 46 }, { - "filterListId": 387 + "filterListId": 387, "languageId": 44 }, { - "filterListID": 388 + "filterListID": 388, "languageId": 44 } ] From 35dd7620c391c15d5941394f39a6b68d81bc1b91 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 13 Apr 2018 06:40:31 +0200 Subject: [PATCH 11/12] Fixed colon errors, part 2 --- data/FilterListMaintainer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 6fa4127fe..4142e0bb2 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -100,27 +100,27 @@ "maintainerId": 22 }, { - "filterListId": 384 + "filterListId": 384, "maintainerId": 22 }, { - "filterListId": 385 + "filterListId": 385, "maintainerId": 22 }, { - "filterListId": 386 + "filterListId": 386, "maintainerId": 22 }, { - "filterListId": 387 + "filterListId": 387, "maintainerId": 22 }, { - "filterListId": 388 + "filterListId": 388, "maintainerId": 22 }, { - "filterListId": 399 + "filterListId": 399, "maintainerId": 22 }, { From db7d983377f6e4e6c8c3d42d19d1a665ce5b585e Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 13 Apr 2018 06:43:31 +0200 Subject: [PATCH 12/12] Fixed an apparent formatting error --- data/FilterList.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 6bb4021f1..8bd6bf34f 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -7374,7 +7374,7 @@ { "id": 389, "chatUrl": null, - "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.", + "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",