From 50b406c6262d60420ce9f0146fc5c19b2a803bba Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Wed, 3 Oct 2018 16:09:31 +0200 Subject: [PATCH 1/8] Added 4 lists and added functional links to 1 --- data/FilterList.json | 56 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index b056919a1..9780ed4db 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -575,11 +575,13 @@ { "id": 53, "description": "Blocks Japanese regional mobile advertisements and trackers.", - "homeUrl": "https://gmbk0.tumblr.com/", - "licenseId": 5, - "name": "gmbk0's AdAway Hosts for Android", + "discontinuedDate": "2014-05-07T15:14:00" + "homeUrl": "http://gmbk0.tumblr.com/", + "licenseId": 20, + "name": "gmbkslist (Hosts)", "syntaxId": 1, - "viewUrl": "https://gmbksfilters.googlecode.com/hg/hosts_adonly.txt" + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AncientLibrary/gmbkslist%20(Hosts).txt", + "viewUrl": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/AncientLibrary/gmbkslist%20(Hosts).txt" }, { "id": 54, @@ -8505,5 +8507,51 @@ "name": "1Hosts Mini (Domains)", "syntaxId": 2, "viewUrl": "https://1hosts.cf/mini/list.txt" + }, + { + "id": 813, + "description": "I use an ad blocker not because I hate ads, but because it makes the Internet so much more safe and less annoying. Most advertising is horrible and annoying, but there are exceptions. However, ad blocking lists like EasyList are dedicated to blocking all ads. The only maintained \"Acceptable Ads\" list is by Eyeo, Inc., which basically takes bribes to whitelist ads. I wanted to start an Acceptable Ads list that was of the people, by the people and for the people.", + "descriptionSourceUrl": "https://github.com/jwinnie/acceptable-ads#acceptable-ads", + "homeUrl": "https://github.com/jwinnie/acceptable-ads", + "issuesUrl": "https://github.com/jwinnie/acceptable-ads/issues", + "licenseId": 4, + "name": "jwinnie Acceptable Ads", + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/jwinnie/acceptable-ads/master/filters.txt" + }, + { + "id": 814, + "description": "Blocks Japanese regional mobile advertisements and trackers.", + "discontinuedDate": "2014-05-07T15:14:00" + "homeUrl": "http://gmbk0.tumblr.com/", + "licenseId": 20, + "name": "gmbkslist (ABP)", + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AncientLibrary/gmbkslist.txt", + "viewUrl": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/AncientLibrary/gmbkslist.txt" + }, + { + "id": 815, + "discontinuedDate": "2012-09-16T00:00:00" + "homeUrl": "https://code.google.com/archive/p/adblocking-openfilter-jp/", + "licenseId": 5, + "name": "Adblocking Open Filter JP", + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AncientLibrary/Adblocking%20Open%20Filter%20JP", + "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/AncientLibrary/Adblocking%20Open%20Filter%20JP" + }, + { + "id": 816, + "description": "Do you already have a favourite browser? Are you tired of seeing \"Try out [some browser] now!\" on some websites? Then this is a list is for you!.", + "descriptionSourceUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/I%20Don't%20Want%20to%20Download%20Your%20Browser.txt", + "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": 10, + "name": "I Don't Want to Download Your Browser", + "syntaxId": 4, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/I%20Don't%20Want%20to%20Download%20Your%20Browser.txt", + "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/I%20Don't%20Want%20to%20Download%20Your%20Browser.txt" } ] From 9c0cb6d849723bf5fea00553bccae64458421694 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Wed, 3 Oct 2018 16:10:43 +0200 Subject: [PATCH 2/8] Added missing commas --- data/FilterList.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 9780ed4db..87fe54996 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -575,7 +575,7 @@ { "id": 53, "description": "Blocks Japanese regional mobile advertisements and trackers.", - "discontinuedDate": "2014-05-07T15:14:00" + "discontinuedDate": "2014-05-07T15:14:00", "homeUrl": "http://gmbk0.tumblr.com/", "licenseId": 20, "name": "gmbkslist (Hosts)", @@ -8522,7 +8522,7 @@ { "id": 814, "description": "Blocks Japanese regional mobile advertisements and trackers.", - "discontinuedDate": "2014-05-07T15:14:00" + "discontinuedDate": "2014-05-07T15:14:00", "homeUrl": "http://gmbk0.tumblr.com/", "licenseId": 20, "name": "gmbkslist (ABP)", @@ -8532,7 +8532,7 @@ }, { "id": 815, - "discontinuedDate": "2012-09-16T00:00:00" + "discontinuedDate": "2012-09-16T00:00:00", "homeUrl": "https://code.google.com/archive/p/adblocking-openfilter-jp/", "licenseId": 5, "name": "Adblocking Open Filter JP", From f4d00911f9e4c2b35fda65eb8af911bd13596dbf Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Wed, 3 Oct 2018 16:11:38 +0200 Subject: [PATCH 3/8] Update FilterList.json --- data/FilterList.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 87fe54996..9fa0efe70 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -8528,7 +8528,7 @@ "name": "gmbkslist (ABP)", "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AncientLibrary/gmbkslist.txt", - "viewUrl": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/AncientLibrary/gmbkslist.txt" + "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/AncientLibrary/gmbkslist.txt" }, { "id": 815, From 7c6463a69f5614c0569e4608f349f7c8000dd3bd Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Wed, 3 Oct 2018 16:14:43 +0200 Subject: [PATCH 4/8] Added tags to the 4 new lists --- data/FilterListTag.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/data/FilterListTag.json b/data/FilterListTag.json index 2b167fd0c..af2bf47d2 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -3774,5 +3774,25 @@ { "filterListId": 812, "tagId": 6 + }, + { + "filterListId": 813, + "tagId": 10 + }, + { + "filterListId": 814, + "tagId": 2 + }, + { + "filterListId": 815, + "tagId": 2 + }, + { + "filterListId": 815, + "tagId": 9 + }, + { + "filterListId": 816, + "tagId": 15 } ] From e0eacba0dc1800f38cbc9bde53e9c9e764c039be Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Wed, 3 Oct 2018 16:16:08 +0200 Subject: [PATCH 5/8] Added languages to 2 of the new lists --- data/FilterListLanguage.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index 50d0da86f..d5c144a7f 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -1082,5 +1082,17 @@ { "filterListId": 809, "languageId": 108 + }, + { + "filterListId": 814, + "languageId": 141 + }, + { + "filterListId": 815, + "languageId": 110 + }, + { + "filterListId": 815, + "languageId": 141 } ] From 3ee7b24bbdd1a7ed130e28aa1ce0c3f27ec34aae Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Wed, 3 Oct 2018 16:32:23 +0200 Subject: [PATCH 6/8] Added some more maintainers to lists --- data/FilterListMaintainer.json | 76 ++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 7c23c8604..a7d8cd0e8 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -1778,5 +1778,81 @@ { "filterListId": 805, "maintainerId": 92 +}, +{ + "filterListId": 816, + "maintainerId": 22 +}, +{ + "filterListId": 214, + "maintainerId": 7 +}, +{ + "filterListId": 797, + "maintainerId": 7 +}, +{ + "filterListId": 202, + "maintainerId": 95 +}, +{ + "filterListId": 203, + "maintainerId": 95 +}, +{ + "filterListId": 204, + "maintainerId": 95 +}, +{ + "filterListId": 205, + "maintainerId": 95 +}, +{ + "filterListId": 227, + "maintainerId": 6 +}, +{ + "filterListId": 506, + "maintainerId": 6 +}, +{ + "filterListId": 620, + "maintainerId": 61 +}, +{ + "filterListId": 621, + "maintainerId": 61 +}, +{ + "filterListId": 622, + "maintainerId": 61 +}, +{ + "filterListId": 623, + "maintainerId": 61 +}, +{ + "filterListId": 624, + "maintainerId": 61 +}, +{ + "filterListId": 21, + "maintainerId": 23 +}, +{ + "filterListId": 22, + "maintainerId": 23 +}, +{ + "filterListId": 120, + "maintainerId": 23 +}, +{ + "filterListId": 81, + "maintainerId": 85 +}, +{ + "filterListId": 686, + "maintainerId": 82 } ] From 68c0995c82e09b243706c0b0191d0fc6853181fe Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Wed, 3 Oct 2018 16:35:18 +0200 Subject: [PATCH 7/8] Added 1 new maintainer --- data/Maintainer.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/Maintainer.json b/data/Maintainer.json index be48e1e56..73357b71d 100644 --- a/data/Maintainer.json +++ b/data/Maintainer.json @@ -491,5 +491,9 @@ { "id": 94, "name": "yourduskquibbles" + }, + { + "id": 95, + "name": "k2japan" } ] From 811421f85feef7ee0a2bbc0d2d5c502eaeb7ab96 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Wed, 3 Oct 2018 16:42:50 +0200 Subject: [PATCH 8/8] Update FilterList.json --- data/FilterList.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 9fa0efe70..86262b6e7 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -8542,7 +8542,7 @@ }, { "id": 816, - "description": "Do you already have a favourite browser? Are you tired of seeing \"Try out [some browser] now!\" on some websites? Then this is a list is for you!.", + "description": "Do you already have a favourite browser? Are you tired of seeing \"Try out [some browser] now!\" on some websites? Then this is a list is for you!", "descriptionSourceUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/I%20Don't%20Want%20to%20Download%20Your%20Browser.txt", "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", "emailAddress": "imreeil42@gmail.com",