From be98c5457477a9ccb1a3a43901877e4fb699c05c Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 6 Sep 2018 14:25:37 +0200 Subject: [PATCH 1/7] Adding Anti-Elsagate List --- data/FilterList.json | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 05b237d4a..a5cfa2cbf 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -11037,5 +11037,24 @@ "submissionUrl": null, "syntaxId": 1, "viewUrl": "https://raw.githubusercontent.com/kowith337/ThaiAntiTokenSites/master/AntiPumpSites_hosts.txt" + }, + { + "id": 603, + "chatUrl": null, + "description": "This list aims to remove particularly disturbing content on YouTube that targets young children, as well as nursery rhymes, \"Finger Family\", \"Wrong Heads\", and other things that are hotbeds for extremely unproductive videos. Also supports YouTube on mobile browsers (but sadly not the apps).", + "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": "Anti-Elsagate List for YouTube", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Anti-Elsagate%20List.txt" } -] \ No newline at end of file +] From d88e7f618838e382540e66c9eef4c7cb731ec403 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 6 Sep 2018 14:28:54 +0200 Subject: [PATCH 2/7] Assigned 3 of my lists to me --- data/FilterListMaintainer.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index c02f45495..4f7ec9f79 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -251,6 +251,18 @@ "filterListId": 434, "maintainerId": 22 }, + { + "filterListId": 504, + "maintainerId": 22 + }, + { + "filterListId": 505, + "maintainerId": 22 + }, + { + "filterListId": 603, + "maintainerId": 22 + }, { "filterListId": 23, "maintainerId": 23 @@ -1035,4 +1047,4 @@ "filterListId": 565, "maintainerId": 82 } -] \ No newline at end of file +] From 929f7515ae18f27cfaad41de5699a55d64aeef8f Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 6 Sep 2018 14:31:06 +0200 Subject: [PATCH 3/7] Assigned tags to the anti-Elsagate list --- data/FilterListTag.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/data/FilterListTag.json b/data/FilterListTag.json index 2c537e57f..f01d1c30a 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -750,5 +750,13 @@ { "filterListId": 602, "tagId": 7 + }, + { + "filterListId": 603, + "tagId": 11 + }, + { + "filterListId": 603, + "tagId": 15 } -] \ No newline at end of file +] From 9d38fa81ea1f64db85f01998a341f0d4382e1494 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 7 Sep 2018 11:28:01 +0200 Subject: [PATCH 4/7] Added 3 additional lists --- data/FilterList.json | 57 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/data/FilterList.json b/data/FilterList.json index a5cfa2cbf..466d8c1b7 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -11056,5 +11056,62 @@ "submissionUrl": null, "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Anti-Elsagate%20List.txt" + }, + { + "id": 604, + "chatUrl": null, + "description": "IPs used by forum spammers (last 30 days)", + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": "https://www.stopforumspam.com/forum/", + "homeUrl": "https://www.stopforumspam.com/", + "issuesUrl": null, + "licenseId": 26, + "name": "StopForumSpam", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 9, + "viewUrl": "https://raw.githubusercontent.com/firehol/blocklist-ipsets/master/stopforumspam_30d.ipset" + }, + { + "id": 605, + "chatUrl": null, + "description": "An ipset made from blocklists that track attacks, spyware, viruses. It includes IPs than have been reported or detected in the last 30 days. (includes: bruteforceblocker ciarmy dshield_30d dshield_top_1000 malc0de maxmind_proxy_fraud myip shunlist snort_ipfilter sslbl_aggressive talosintel_ipfilter zeus vxvault)", + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://iplists.firehol.org/", + "issuesUrl": null, + "licenseId": 2, + "name": "Firehol Level 3", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 9, + "viewUrl": "https://raw.githubusercontent.com/firehol/blocklist-ipsets/master/firehol_level3.netset" + }, + { + "id": 606, + "chatUrl": null, + "description": "Goodbye Ads is designed for Unix-like systems (such as Android), gets a list of domains that serve ads, tracking scripts and malware from multiple reputable sources and creates a hosts file that prevents your system from connecting to them.", + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": "https://forum.xda-developers.com/android/software-hacking/goodbye-ads-advanced-protection-ads-ad-t3827269", + "homeUrl": "https://github.com/jerryn70/GoodbyeAds", + "issuesUrl": "https://github.com/jerryn70/GoodbyeAds/issues", + "licenseId": 2, + "name": "Goodbye Ads", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/jerryn70/GoodbyeAds/master/Hosts/GoodbyeAds.txt" } ] From f77026038c5572eac3a875c92b3ddfcb93e4c3f7 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 7 Sep 2018 12:40:19 +0200 Subject: [PATCH 5/7] Added the maintainer of Goodbye Ads, part 1 --- data/Maintainer.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/data/Maintainer.json b/data/Maintainer.json index cc023bdbc..ae1943dfa 100644 --- a/data/Maintainer.json +++ b/data/Maintainer.json @@ -551,5 +551,12 @@ "homeUrl": "https://getadblock.com/", "name": "AdBlock", "twitterHandle": null + }, + { + "id": 83, + "emailAddress": null, + "homeUrl": "https://forum.xda-developers.com/member.php?u=4546389", + "name": "jerryn70", + "twitterHandle": null } -] \ No newline at end of file +] From 126cccb912a3afbae85c1741a6b64226243b1a2a Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 7 Sep 2018 12:41:04 +0200 Subject: [PATCH 6/7] Added the maintainer of Goodbye Ads, part 2 --- data/FilterListMaintainer.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 4f7ec9f79..3efd464a0 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -1046,5 +1046,9 @@ { "filterListId": 565, "maintainerId": 82 + }, + { + "filterListId": 606, + "maintainerId": 83 } ] From 150fe13acf9f7490c52bd51d902e98ae73dbaf2e Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 7 Sep 2018 12:42:31 +0200 Subject: [PATCH 7/7] Assigned StopForumSpam to Topical --- data/FilterListTag.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/FilterListTag.json b/data/FilterListTag.json index f01d1c30a..9ec39d2fc 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -758,5 +758,9 @@ { "filterListId": 603, "tagId": 15 + }, + { + "filterListId": 604, + "tagId": 15 } ]