From c59a07a1ab2308c6f22255fc17e76825971f2ed9 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Fri, 21 Jun 2019 14:08:58 -0500 Subject: [PATCH] Revert "data tidies" This reverts commit aea5335ed8e46074cc218889f5b45fbcdbff1f2d. --- data/FilterList.json | 109 ++++++++++++++--------------- data/FilterListLanguage.json | 26 +++---- data/FilterListMaintainer.json | 122 ++++++++++++++++----------------- data/FilterListTag.json | 2 +- data/Language.json | 2 +- data/Maintainer.json | 2 +- data/Software.json | 2 +- data/SoftwareSyntax.json | 34 ++++----- 8 files changed, 145 insertions(+), 154 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 9f3f80b14..b19671e9e 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -16638,7 +16638,6 @@ "id": 1573, "homeUrl": "https://github.com/qwIvan/privoxy-adfilter", "issuesUrl": "https://github.com/qwIvan/privoxy-adfilter/issues", - "licenseId": 5, "name": "Privoxy Adfilter", "syntaxId": 19, "viewUrl": "https://raw.githubusercontent.com/qwIvan/privoxy-adfilter/master/adfilter.action" @@ -16663,8 +16662,8 @@ "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", "licenseId": 10, "name": "Twitch: Even More Pure Viewing Experience", - "publishedDate": "2019-05-11T13:00:00", "syntaxId": 21, + "publishedDate": "2019-05-11T13:00:00", "updatedDate": "2019-05-11T13:00:00", "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/TwitchEvenMorePureViewingExperience.txt", "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/TwitchEvenMorePureViewingExperience.txt", @@ -16679,8 +16678,8 @@ "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", "licenseId": 10, "name": "Anti-'Custom cursors' List", - "publishedDate": "2019-05-11T13:00:00", "syntaxId": 4, + "publishedDate": "2019-05-11T13:00:00", "updatedDate": "2019-05-11T13:00:00", "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Anti-'Custom%20cursors'%20List.txt", "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/Anti-'Custom%20cursors'%20List.txt", @@ -16716,8 +16715,8 @@ "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", "licenseId": 10, "name": "Extremely Condensed Adblocking List", - "publishedDate": "2019-05-15T00:00:00", "syntaxId": 3, + "publishedDate": "2019-05-15T00:00:00", "updatedDate": "2019-05-17T00:00:00", "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/ExtremelyCondensedList.txt", "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/ExtremelyCondensedList.txt", @@ -16790,8 +16789,8 @@ "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", "licenseId": 10, "name": "Dandelion Sprout's Nordic Filters for Tidier Websites (dnsmasq)", - "publishedDate": "2019-05-19T00:00:00", "syntaxId": 20, + "publishedDate": "2019-05-19T00:00:00", "updatedDate": "2019-05-19T00:00:00", "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersDnsmasq.conf", "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/NorwegianExperimentalList%20alternate%20versions/NordicFiltersDnsmasq.conf", @@ -16806,8 +16805,8 @@ "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", "licenseId": 10, "name": "Dandelion Sprout's Nordic Filters for Tidier Websites (The «hosts.deny» version)", - "publishedDate": "2019-05-19T00:00:00", "syntaxId": 23, + "publishedDate": "2019-05-19T00:00:00", "updatedDate": "2019-05-19T00:00:00", "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersHostsDeny.deny", "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/NorwegianExperimentalList%20alternate%20versions/NordicFiltersHostsDeny.deny", @@ -16823,7 +16822,7 @@ "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", "licenseId": 10, "name": "Dandelion Sprout's Anti-Malware List (for Adblock Plus and AdBlock)", - "publishedDate": "2018-01-04T00:00:00", + "publishedDate": "2019-04-19T00:00:00", "syntaxId": 28, "updatedDate": "2019-04-19T00:21:10", "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareABP.txt", @@ -16840,7 +16839,7 @@ "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", "licenseId": 10, "name": "Dandelion Sprout's Anti-Malware List (for AdGuard)", - "publishedDate": "2018-01-04T00:00:00", + "publishedDate": "2019-04-19T00:00:00", "syntaxId": 6, "updatedDate": "2019-04-19T00:21:10", "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareAdGuard.txt", @@ -16857,7 +16856,7 @@ "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", "licenseId": 10, "name": "Dandelion Sprout's Anti-Malware List (Internet Explorer TPL)", - "publishedDate": "2018-01-04T00:00:00", + "publishedDate": "2019-04-19T00:00:00", "syntaxId": 10, "updatedDate": "2019-04-19T00:21:10", "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareTPL.tpl", @@ -16874,7 +16873,7 @@ "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", "licenseId": 10, "name": "Dandelion Sprout's Anti-Malware List (for Privoxy)", - "publishedDate": "2018-01-04T00:00:00", + "publishedDate": "2019-04-19T00:00:00", "syntaxId": 19, "updatedDate": "2019-04-19T00:21:10", "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwarePrivoxy.action", @@ -16938,8 +16937,8 @@ "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", "licenseId": 10, "name": "Dandelion Sprout's Nordic Filters for Tidier Websites (without tracker whitelistings)", - "publishedDate": "2019-06-05T00:00:00", "syntaxId": 4, + "publishedDate": "2019-06-05T00:00:00", "updatedDate": "2019-06-05T00:00:00", "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersPrivacy.txt", "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/NorwegianExperimentalList%20alternate%20versions/NordicFiltersPrivacy.txt", @@ -16950,97 +16949,89 @@ "description": "AntiSocial Blacklist is an extensive collection of potentially malicious domains. We work hard scouring the internet looking for servers that are trying to impersonate common brands and the companies you do business with. Using our data, we then use our cloud platform to protect vulnerable computer users. You may not spot the IDN characters in iCłoud.com or the zero in Micr0Soft.com - But AntiSocial Blacklist will.", "emailAddress": "Contact@TheAntiSocialEngineer.com", "homeUrl": "https://theantisocialengineer.com/blacklist/", - "licenseId": 5, - "name": "The AntiSocial Engineer Blacklist", - "syntaxId": 2, + "Name": "The AntiSocial Engineer Blacklist", + "syntaxid": 2, "viewUrl": "https://theantisocialengineer.com/AntiSocial_Blacklist_Community_V1.txt" - }, - { +}, +{ "id": 1595, "description": "The Blocklist to filter Phishing.", "homeUrl": "https://phishing.army/", - "licenseId": 13, - "name": "Phishing Army", - "syntaxId": 2, - "viewUrl": "https://phishing.army/download/phishing_army_blocklist.txt" - }, - { + "Name": "Phishing Army", + "syntaxid": 2, + "viewUrl": "https://phishing.army/download/phishing_army_blocklist.txt", + "licenseid": 13 +}, +{ "id": 1596, - "licenseId": 5, - "name": "De Hakkelaar's Cryptojacking Campaign List", - "syntaxId": 2, + "Name": "De Hakkelaar's Cryptojacking Campaign List", + "syntaxid": 2, "viewUrl": "https://dehakkelaar.nl/lists/cryptojacking_campaign.list.txt" - }, - { +}, +{ "id": 1597, "description": "Introducing the Amazing/Sensational/Remarkable/Revolutionary; #1 Blocklist :)", "donateUrl": "https://paypal.me/sjhgvr", "homeUrl": "https://www.reddit.com/r/pihole/comments/bppug1/introducing_the/", - "licenseId": 5, - "name": "OISD", - "syntaxId": 2, + "Name": "OISD", + "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" - }, - { +}, +{ "id": 1598, "description": "Introducing the Amazing/Sensational/Remarkable/Revolutionary; #1 Blocklist :)", "donateUrl": "https://paypal.me/sjhgvr", "homeUrl": "https://www.reddit.com/r/pihole/comments/bppug1/introducing_the/", - "licenseId": 5, - "name": "OISD (Hosts)", - "syntaxId": 1, + "Name": "OISD (Hosts)", + "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" - }, - { +}, +{ "id": 1599, "description": "Introducing the Amazing/Sensational/Remarkable/Revolutionary; #1 Blocklist :)", "donateUrl": "https://paypal.me/sjhgvr", "homeUrl": "https://www.reddit.com/r/pihole/comments/bppug1/introducing_the/", - "licenseId": 5, - "name": "OISD Mobile", - "syntaxId": 2, + "Name": "OISD Mobile", + "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" - }, - { +}, +{ "id": 1600, "description": "Introducing the Amazing/Sensational/Remarkable/Revolutionary; #1 Blocklist :)", "donateUrl": "https://paypal.me/sjhgvr", "homeUrl": "https://www.reddit.com/r/pihole/comments/bppug1/introducing_the/", - "licenseId": 5, - "name": "OISD Mobile (Hosts)", - "syntaxId": 1, + "Name": "OISD Mobile (Hosts)", + "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" - }, - { +}, +{ "id": 1601, "description": "Currently blocking ad serving and malware domains.", "donateUrl": "https://paypal.me/sjhgvr", "homeUrl": "https://github.com/joeylane/hosts", "issuesUrl": "https://github.com/joeylane/hosts/issues", - "licenseId": 5, - "name": "Joey Lane's Hosts", - "syntaxId": 1, + "Name": "Joey Lane's Hosts", + "syntaxid": 1, "viewUrl": "https://raw.githubusercontent.com/joeylane/hosts/master/hosts" - }, - { +}, +{ "id": 1602, "description": "A blocklist for app promotion on Chinese websites", "homeUrl": "https://github.com/HankAviator/app-ads-blocklist-china", "issuesUrl": "https://github.com/HankAviator/app-ads-blocklist-china/issues", - "licenseId": 5, - "name": "App ads blocklist China", - "syntaxId": 4, + "Name": "App ads blocklist China", + "syntaxid": 4, "viewUrl": "https://raw.githubusercontent.com/HankAviator/app-ads-blocklist-china/master/app_blocklist.txt" - }, - { +}, +{ "id": 1603, "description": "A block list of malicious URLs that are being used for malware distribution. This is a lite version by including online URLs only", "descriptionSourceUrl": "https://gitlab.com/curben/urlhaus-filter/blob/master/README.md", @@ -17052,5 +17043,5 @@ "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" - } -] \ No newline at end of file +} +] diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index b7d31d25a..adbc26131 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -819,10 +819,6 @@ "filterListId": 670, "languageId": 44 }, - { - "filterListId": 670, - "languageId": 106 - }, { "filterListId": 680, "languageId": 44 @@ -1967,14 +1963,6 @@ "filterListId": 1239, "languageId": 167 }, - { - "filterListId": 1242, - "languageId": 110 - }, - { - "filterListId": 1242, - "languageId": 167 - }, { "filterListId": 1279, "languageId": 11 @@ -2107,6 +2095,18 @@ "filterListId": 1574, "languageId": 18 }, + { + "filterListId": 1242, + "languageId": 110 + }, + { + "filterListId": 1242, + "languageId": 167 + }, + { + "filterListId": 670, + "languageId": 106 + }, { "filterListId": 1581, "languageId": 44 @@ -2199,4 +2199,4 @@ "filterListId": 1602, "languageId": 99 } -] \ No newline at end of file +] diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index ee0650f70..1715a8744 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -259,10 +259,6 @@ "filterListId": 1538, "maintainerId": 7 }, - { - "filterListId": 1539, - "maintainerId": 7 - }, { "filterListId": 1540, "maintainerId": 7 @@ -563,6 +559,14 @@ "filterListId": 20, "maintainerId": 22 }, + { + "filterListId": 1581, + "maintainerId": 22 + }, + { + "filterListId": 1582, + "maintainerId": 22 + }, { "filterListId": 327, "maintainerId": 22 @@ -767,10 +771,6 @@ "filterListId": 1564, "maintainerId": 22 }, - { - "filterListId": 1565, - "maintainerId": 22 - }, { "filterListId": 1575, "maintainerId": 22 @@ -779,22 +779,6 @@ "filterListId": 1576, "maintainerId": 22 }, - { - "filterListId": 1579, - "maintainerId": 22 - }, - { - "filterListId": 1580, - "maintainerId": 22 - }, - { - "filterListId": 1581, - "maintainerId": 22 - }, - { - "filterListId": 1582, - "maintainerId": 22 - }, { "filterListId": 1583, "maintainerId": 22 @@ -935,14 +919,6 @@ "filterListId": 211, "maintainerId": 23 }, - { - "filterListId": 1571, - "maintainerId": 23 - }, - { - "filterListId": 1572, - "maintainerId": 23 - }, { "filterListId": 27, "maintainerId": 24 @@ -1303,22 +1279,6 @@ "filterListId": 1528, "maintainerId": 46 }, - { - "filterListId": 1567, - "maintainerId": 46 - }, - { - "filterListId": 1568, - "maintainerId": 46 - }, - { - "filterListId": 1569, - "maintainerId": 46 - }, - { - "filterListId": 1570, - "maintainerId": 46 - }, { "filterListId": 207, "maintainerId": 47 @@ -1503,10 +1463,6 @@ "filterListId": 1288, "maintainerId": 63 }, - { - "filterListId": 1580, - "maintainerId": 63 - }, { "filterListId": 399, "maintainerId": 64 @@ -4448,8 +4404,32 @@ "maintainerId": 132 }, { - "filterListId": 1574, - "maintainerId": 132 + "filterListId": 1565, + "maintainerId": 22 + }, + { + "filterListId": 1567, + "maintainerId": 46 + }, + { + "filterListId": 1568, + "maintainerId": 46 + }, + { + "filterListId": 1569, + "maintainerId": 46 + }, + { + "filterListId": 1570, + "maintainerId": 46 + }, + { + "filterListId": 1571, + "maintainerId": 23 + }, + { + "filterListId": 1572, + "maintainerId": 23 }, { "filterListId": 199, @@ -4463,6 +4443,10 @@ "filterListId": 201, "maintainerId": 133 }, + { + "filterListId": 884, + "maintainerId": 134 + }, { "filterListId": 729, "maintainerId": 134 @@ -4471,10 +4455,6 @@ "filterListId": 730, "maintainerId": 134 }, - { - "filterListId": 884, - "maintainerId": 134 - }, { "filterListId": 1284, "maintainerId": 134 @@ -4500,11 +4480,31 @@ "maintainerId": 135 }, { - "filterListId": 71, - "maintainerId": 136 + "filterListId": 1539, + "maintainerId": 7 + }, + { + "filterListId": 1574, + "maintainerId": 132 + }, + { + "filterListId": 1579, + "maintainerId": 22 }, { "filterListId": 1580, + "maintainerId": 22 + }, + { + "filterListId": 1580, + "maintainerId": 63 + }, + { + "filterListId": 1580, + "maintainerId": 136 + }, + { + "filterListId": 71, "maintainerId": 136 }, { @@ -4527,4 +4527,4 @@ "filterListId": 1602, "maintainerId": 138 } -] \ No newline at end of file +] diff --git a/data/FilterListTag.json b/data/FilterListTag.json index 716023433..0b3b1c20e 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -6875,4 +6875,4 @@ "filterListId": 1603, "tagId": 6 } -] \ No newline at end of file +] diff --git a/data/Language.json b/data/Language.json index 4077e48e2..e0080bc12 100644 --- a/data/Language.json +++ b/data/Language.json @@ -1799,4 +1799,4 @@ "localName": "isiZulu", "name": "Zulu" } -] \ No newline at end of file +] diff --git a/data/Maintainer.json b/data/Maintainer.json index 559d707aa..273a356f1 100644 --- a/data/Maintainer.json +++ b/data/Maintainer.json @@ -732,4 +732,4 @@ "homeUrl": "https://github.com/HankAviator", "name": "HankAviator" } -] \ No newline at end of file +] diff --git a/data/Software.json b/data/Software.json index 88960522a..bd3556809 100644 --- a/data/Software.json +++ b/data/Software.json @@ -218,4 +218,4 @@ "isAbpSubscribable": false, "name": "Windows command line" } -] \ No newline at end of file +] diff --git a/data/SoftwareSyntax.json b/data/SoftwareSyntax.json index d88a25d18..2f6ebf56e 100644 --- a/data/SoftwareSyntax.json +++ b/data/SoftwareSyntax.json @@ -199,10 +199,6 @@ "softwareId": 18, "syntaxId": 9 }, - { - "softwareId": 32, - "syntaxId": 9 - }, { "softwareId": 16, "syntaxId": 10 @@ -215,6 +211,10 @@ "softwareId": 5, "syntaxId": 12 }, + { + "softwareId": 32, + "syntaxId": 9 + }, { "softwareId": 1, "syntaxId": 13 @@ -279,10 +279,6 @@ "softwareId": 5, "syntaxId": 17 }, - { - "softwareId": 32, - "syntaxId": 17 - }, { "softwareId": 20, "syntaxId": 18 @@ -295,6 +291,10 @@ "softwareId": 23, "syntaxId": 20 }, + { + "softwareId": 32, + "syntaxId": 17 + }, { "softwareId": 1, "syntaxId": 21 @@ -319,10 +319,6 @@ "softwareId": 28, "syntaxId": 22 }, - { - "softwareId": 33, - "syntaxId": 23 - }, { "softwareId": 29, "syntaxId": 24 @@ -335,10 +331,6 @@ "softwareId": 30, "syntaxId": 26 }, - { - "softwareId": 34, - "syntaxId": 27 - }, { "softwareId": 1, "syntaxId": 28 @@ -370,5 +362,13 @@ { "softwareId": 32, "syntaxId": 28 + }, + { + "softwareId": 33, + "syntaxId": 23 + }, + { + "softwareId": 34, + "syntaxId": 27 } -] \ No newline at end of file +]