From f4b17e7ae459467b31f5d0389308b75ffb38367b Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 22 Jun 2019 19:21:41 +0200 Subject: [PATCH] Late June pull (#808) * Update FilterList.json * Update Tag.json * Update FilterListTag.json * Update FilterListMaintainer.json --- data/FilterList.json | 74 +++++++++++++++++++++++---- data/FilterListMaintainer.json | 12 +++++ data/FilterListTag.json | 92 ++++++++++++++++++++-------------- data/Tag.json | 7 ++- 4 files changed, 136 insertions(+), 49 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index b19671e9e..1f0c7b69a 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -16950,7 +16950,7 @@ "emailAddress": "Contact@TheAntiSocialEngineer.com", "homeUrl": "https://theantisocialengineer.com/blacklist/", "Name": "The AntiSocial Engineer Blacklist", - "syntaxid": 2, + "syntaxId": 2, "viewUrl": "https://theantisocialengineer.com/AntiSocial_Blacklist_Community_V1.txt" }, { @@ -16958,14 +16958,14 @@ "description": "The Blocklist to filter Phishing.", "homeUrl": "https://phishing.army/", "Name": "Phishing Army", - "syntaxid": 2, + "syntaxId": 2, "viewUrl": "https://phishing.army/download/phishing_army_blocklist.txt", - "licenseid": 13 + "licenseId": 13 }, { "id": 1596, "Name": "De Hakkelaar's Cryptojacking Campaign List", - "syntaxid": 2, + "syntaxId": 2, "viewUrl": "https://dehakkelaar.nl/lists/cryptojacking_campaign.list.txt" }, { @@ -16974,7 +16974,7 @@ "donateUrl": "https://paypal.me/sjhgvr", "homeUrl": "https://www.reddit.com/r/pihole/comments/bppug1/introducing_the/", "Name": "OISD", - "syntaxid": 2, + "syntaxId": 2, "viewUrl": "https://dbl.oisd.nl/", "viewUrlMirror1": "https://raw.githubusercontent.com/ookangzheng/dbl-oisd-nl/master/dbl.txt", "viewUrlMirror2": "https://gitlab.com/ookangzheng/dbl-oisd-nl/raw/master/dbl.txt" @@ -16985,7 +16985,7 @@ "donateUrl": "https://paypal.me/sjhgvr", "homeUrl": "https://www.reddit.com/r/pihole/comments/bppug1/introducing_the/", "Name": "OISD (Hosts)", - "syntaxid": 1, + "syntaxId": 1, "viewUrl": "https://hosts.oisd.nl/", "viewUrlMirror1": "https://raw.githubusercontent.com/ookangzheng/dbl-oisd-nl/master/dblzero.txt", "viewUrlMirror2": "https://gitlab.com/ookangzheng/dbl-oisd-nl/raw/master/dblzero.txt" @@ -16996,7 +16996,7 @@ "donateUrl": "https://paypal.me/sjhgvr", "homeUrl": "https://www.reddit.com/r/pihole/comments/bppug1/introducing_the/", "Name": "OISD Mobile", - "syntaxid": 2, + "syntaxId": 2, "viewUrl": "https://dblmobile.oisd.nl/", "viewUrlMirror1": "https://raw.githubusercontent.com/ookangzheng/dbl-oisd-nl/master/dbl2.txt", "viewUrlMirror2": "https://gitlab.com/ookangzheng/dbl-oisd-nl/raw/master/dbl2.txt" @@ -17007,7 +17007,7 @@ "donateUrl": "https://paypal.me/sjhgvr", "homeUrl": "https://www.reddit.com/r/pihole/comments/bppug1/introducing_the/", "Name": "OISD Mobile (Hosts)", - "syntaxid": 1, + "syntaxId": 1, "viewUrl": "https://hostsmobile.oisd.nl/", "viewUrlMirror1": "https://raw.githubusercontent.com/ookangzheng/dbl-oisd-nl/master/hostsmobile.txt", "viewUrlMirror2": "https://gitlab.com/ookangzheng/dbl-oisd-nl/raw/master/hostsmobile.txt" @@ -17019,7 +17019,7 @@ "homeUrl": "https://github.com/joeylane/hosts", "issuesUrl": "https://github.com/joeylane/hosts/issues", "Name": "Joey Lane's Hosts", - "syntaxid": 1, + "syntaxId": 1, "viewUrl": "https://raw.githubusercontent.com/joeylane/hosts/master/hosts" }, { @@ -17028,7 +17028,7 @@ "homeUrl": "https://github.com/HankAviator/app-ads-blocklist-china", "issuesUrl": "https://github.com/HankAviator/app-ads-blocklist-china/issues", "Name": "App ads blocklist China", - "syntaxid": 4, + "syntaxId": 4, "viewUrl": "https://raw.githubusercontent.com/HankAviator/app-ads-blocklist-china/master/app_blocklist.txt" }, { @@ -17043,5 +17043,59 @@ "viewUrl": "https://gitlab.com/curben/urlhaus-filter/raw/master/urlhaus-filter-online.txt", "viewUrlMirror1": "https://glcdn.githack.com/curben/urlhaus-filter/raw/master/urlhaus-filter-online.txt", "viewUrlMirror2": "https://cdn.staticaly.com/gl/curben/urlhaus-filter/raw/master/urlhaus-filter-online.txt" +}, + { + "id": 1604, + "description": "Have you ever been watching «Pinkie Cooper and the Jet Set Pets» on DailyMotion, but you keep getting distracted by all the trend-based recommendations below the video player? This list will help focus your attention on the video instead.", + "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": "DailyMotion Simplicity", + "publishedDate": "2019-06-12T00:00:00", + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/DailyMotionSimplicity.txt", + "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/DailyMotionSimplicity.txt", + "viewUrlMirror2": "https://gitlab.com/DandelionSprout/adfilt/raw/master/DailyMotionSimplicity.txt" + }, + { + "id": 1605, + "description": "«Powerpuff Girls», especially the 90's-00's seasons, is a cartoon that taught children such values as beating others senseless, extrajudicial violence, vigilante mob beatings, the expendability of entire neighbourhoods, and discrimination against past offenders. If you too are absolutely embarrassed by ever having watched that show, here's a list for you.", + "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-'Powerpuff Girls' List", + "publishedDate": "2019-06-22T00:00:00", + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AntiPPGList.txt", + "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/AntiPPGList.txt", + "viewUrlMirror2": "https://gitlab.com/DandelionSprout/adfilt/raw/master/AntiPPGList.txt" + }, + { + "id": 1606, + "description": "Office Online, which is effectively a free lite version of Microsoft Office, was a pretty nice and kind move by Microsoft. However, they seem to think that quick access to Skype from it is essential for project communication, which is less than desirable for those who've moved on to e.g. Discord or MeWe. Here's a list that will make your Office Online experience Skype-free.", + "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-Skype List for Office Online", + "publishedDate": "2019-06-22T00:00:00", + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Anti-Skype%20List.txt", + "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/Anti-Skype%20List.txt", + "viewUrlMirror2": "https://gitlab.com/DandelionSprout/adfilt/raw/master/Anti-Skype%20List.txt" + }, + { + "id": 1607, + "description": "HostsY generated hosts files", + "homeUrl": "https://github.com/Laicure/HostsY_hosts", + "issuesUrl": "https://github.com/Laicure/HostsY_hosts/issues", + "Name": "HostsY Hosts", + "syntaxId": 2, + "viewUrl": "https://raw.githubusercontent.com/Laicure/HostsY_hosts/master/shithosts" } ] diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 1715a8744..693165f05 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -823,6 +823,18 @@ "filterListId": 1593, "maintainerId": 22 }, + { + "filterListId": 1604, + "maintainerId": 22 + }, + { + "filterListId": 1605, + "maintainerId": 22 + }, + { + "filterListId": 1606, + "maintainerId": 22 + }, { "filterListId": 21, "maintainerId": 23 diff --git a/data/FilterListTag.json b/data/FilterListTag.json index 0b3b1c20e..0f5373a7f 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -1753,7 +1753,7 @@ }, { "filterListId": 381, - "tagId": 15 + "tagId": 30 }, { "filterListId": 382, @@ -1801,7 +1801,7 @@ }, { "filterListId": 391, - "tagId": 15 + "tagId": 30 }, { "filterListId": 392, @@ -1973,11 +1973,11 @@ }, { "filterListId": 432, - "tagId": 15 + "tagId": 30 }, { "filterListId": 433, - "tagId": 15 + "tagId": 30 }, { "filterListId": 434, @@ -2553,7 +2553,7 @@ }, { "filterListId": 603, - "tagId": 15 + "tagId": 30 }, { "filterListId": 604, @@ -2665,7 +2665,7 @@ }, { "filterListId": 632, - "tagId": 15 + "tagId": 30 }, { "filterListId": 634, @@ -2757,7 +2757,7 @@ }, { "filterListId": 654, - "tagId": 15 + "tagId": 30 }, { "filterListId": 655, @@ -3153,7 +3153,7 @@ }, { "filterListId": 751, - "tagId": 15 + "tagId": 30 }, { "filterListId": 752, @@ -3709,7 +3709,7 @@ }, { "filterListId": 863, - "tagId": 15 + "tagId": 30 }, { "filterListId": 863, @@ -5537,19 +5537,19 @@ }, { "filterListId": 1359, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1360, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1361, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1362, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1363, @@ -5585,11 +5585,11 @@ }, { "filterListId": 1371, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1372, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1373, @@ -5609,11 +5609,11 @@ }, { "filterListId": 1377, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1378, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1379, @@ -5633,35 +5633,35 @@ }, { "filterListId": 1383, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1384, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1385, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1386, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1387, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1388, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1389, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1390, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1391, @@ -5681,19 +5681,19 @@ }, { "filterListId": 1395, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1396, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1397, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1398, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1399, @@ -5761,11 +5761,11 @@ }, { "filterListId": 1415, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1416, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1417, @@ -5897,19 +5897,19 @@ }, { "filterListId": 1449, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1450, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1451, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1452, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1453, @@ -6493,7 +6493,7 @@ }, { "filterListId": 1556, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1557, @@ -6561,7 +6561,7 @@ }, { "filterListId": 1565, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1566, @@ -6745,7 +6745,7 @@ }, { "filterListId": 1592, - "tagId": 15 + "tagId": 30 }, { "filterListId": 1593, @@ -6874,5 +6874,21 @@ { "filterListId": 1603, "tagId": 6 + }, + { + "filterListId": 1604, + "tagId": 9 + }, + { + "filterListId": 1605, + "tagId": 30 + }, + { + "filterListId": 1606, + "tagId": 19 + }, + { + "filterListId": 1607, + "tagId": 6 } ] diff --git a/data/Tag.json b/data/Tag.json index cc5314f7e..aa22261ea 100644 --- a/data/Tag.json +++ b/data/Tag.json @@ -143,5 +143,10 @@ "id": 29, "description": "Prevents \"How can I help you?\" prompts from popping up", "name": "helpprompt" + }, + { + "id": 30, + "description": "Blocks certain cultural content", + "name": "cultural" } -] \ No newline at end of file +]