From a69ffb242727f8e92e6f12463db6ee9a41290561 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Wed, 13 Feb 2019 19:10:51 +0100 Subject: [PATCH] Mid-February pull (#691) * Added 2 lists and edited 1 other list * Added tags to the 2 new lists * Update FilterListMaintainer.json --- data/FilterList.json | 36 +++++++++++++++++++++++++++++++--- data/FilterListMaintainer.json | 10 +++++++++- data/FilterListTag.json | 22 ++++++++++++++++++++- 3 files changed, 63 insertions(+), 5 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 844e47d2b..b2f10e42b 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -7087,13 +7087,13 @@ }, { "id": 603, - "description": "This list aims to remove particularly disturbing content on YouTube, DailyMotion, and Vimeo 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).", + "description": "This list aims to remove particularly disturbing content on YouTube, DailyMotion, Vimeo, and several other video sites, 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).", "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": "Anti-Elsagate List for YouTube", + "name": "Anti-Elsagate List", "syntaxId": 3, "updatedDate": "2018-12-09T20:07:10", "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Anti-Elsagate%20List.txt", @@ -16711,5 +16711,35 @@ "syntaxId": 1, "updatedDate": "2019-02-09T08:02:46", "viewUrl": "https://raw.githubusercontent.com/anudeepND/blacklist/master/facebook.txt" + }, + { + "id": 1459, + "description": "The alignment of the stars predict that you will use this list, in order to stop listening so much to such completely unfounded predictions anymore, and to get your eyes off the starry skies and onto your life that should be planted firmly on the ground.", + "descriptionSourceUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AntiAstrologyList.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": "Anti-Astrology List", + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AntiAstrologyList.txt", + "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/AntiAstrologyList.txt", + "viewUrlMirror2": "https://gitlab.com/DandelionSprout/adfilt/raw/master/AntiAstrologyList.txt" + }, + { + "id": 1460, + "description": "Most of us who are able to read this description, likely have some old relatives who get very easily confused about even the most basic of PC stuff. This list, if implemented on their PCs alongside uBlock Origin, can help you help them stay more safe from old people's tech mistakes, giving you fewer strange help requests from them as well.", + "descriptionSourceUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/ListForOldPeople.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": "Dandelion Sprout's List for Old People", + "syntaxId": 21, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/ListForOldPeople.txt", + "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/ListForOldPeople.txt", + "viewUrlMirror2": "https://gitlab.com/DandelionSprout/adfilt/raw/master/ListForOldPeople.txt" } -] \ No newline at end of file +] diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index f18b2b74f..61a0f9860 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -667,6 +667,14 @@ "filterListId": 1456, "maintainerId": 22 }, + { + "filterListId": 1459, + "maintainerId": 22 + }, + { + "filterListId": 1460, + "maintainerId": 22 + }, { "filterListId": 21, "maintainerId": 23 @@ -4395,4 +4403,4 @@ "filterListId": 1452, "maintainerId": 116 } -] \ No newline at end of file +] diff --git a/data/FilterListTag.json b/data/FilterListTag.json index 1a40d672c..c3d6325a5 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -6946,5 +6946,25 @@ { "filterListId": 1458, "tagId": 3 + }, + { + "filterListId": 1459, + "tagId": 15 + }, + { + "filterListId": 1460, + "tagId": 6 + }, + { + "filterListId": 1460, + "tagId": 7 + }, + { + "filterListId": 1460, + "tagId": 15 + }, + { + "filterListId": 1460, + "tagId": 20 } -] \ No newline at end of file +]