diff --git a/services/Directory/data/FilterList.json b/services/Directory/data/FilterList.json index c8324adfe..cc47ff2ed 100644 --- a/services/Directory/data/FilterList.json +++ b/services/Directory/data/FilterList.json @@ -5222,14 +5222,6 @@ "licenseId": 35, "name": "Tor Redirector List" }, - { - "description": "A blocklist of malicious URLs that are being used for malware distribution.", - "homeUrl": "https://gitlab.com/curben/urlhaus-filter", - "id": 858, - "issuesUrl": "https://gitlab.com/curben/urlhaus-filter/issues", - "licenseId": 28, - "name": "urlhaus-filter" - }, { "description": "It seems to me that a common thought process on porn sites are \"Hey, do you know what would've made this cute woman even sexier? I know. We should give her a dick!\". Well, not anymore, thanks to this list.", "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", @@ -10268,7 +10260,7 @@ "id": 1603, "issuesUrl": "https://gitlab.com/curben/urlhaus-filter/issues", "licenseId": 28, - "name": "urlhaus-filter (Online)" + "name": "urlhaus-filter" }, { "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.", @@ -12647,21 +12639,13 @@ "licenseId": 35, "name": "Dandelion Sprout's Nordic Filters for Tidier Websites (for MinerBlock)" }, - { - "description": "A blocklist of malicious URLs that are being used for malware distribution.", - "homeUrl": "https://gitlab.com/curben/urlhaus-filter", - "id": 1879, - "issuesUrl": "https://gitlab.com/curben/urlhaus-filter/issues", - "licenseId": 28, - "name": "urlhaus-filter (Domains)" - }, { "description": "A blocklist of malicious URLs that are being used for malware distribution.", "homeUrl": "https://gitlab.com/curben/urlhaus-filter", "id": 1880, "issuesUrl": "https://gitlab.com/curben/urlhaus-filter/issues", "licenseId": 28, - "name": "urlhaus-filter (Online Domains)" + "name": "urlhaus-filter (Domains)" }, { "homeUrl": "https://github.com/angelics/pfbng", @@ -14707,7 +14691,7 @@ { "description": "A blocklist of malicious URLs that are being used for malware distribution.", "homeUrl": "https://gitlab.com/curben/urlhaus-filter", - "id": 2164, + "id": 2165, "issuesUrl": "https://gitlab.com/curben/urlhaus-filter/issues", "licenseId": 28, "name": "urlhaus-filter (dnsmasq)" @@ -14715,15 +14699,7 @@ { "description": "A blocklist of malicious URLs that are being used for malware distribution.", "homeUrl": "https://gitlab.com/curben/urlhaus-filter", - "id": 2165, - "issuesUrl": "https://gitlab.com/curben/urlhaus-filter/issues", - "licenseId": 28, - "name": "urlhaus-filter (Online Domains - dnsmasq)" - }, - { - "description": "A blocklist of malicious URLs that are being used for malware distribution.", - "homeUrl": "https://gitlab.com/curben/urlhaus-filter", - "id": 2166, + "id": 2167, "issuesUrl": "https://gitlab.com/curben/urlhaus-filter/issues", "licenseId": 28, "name": "urlhaus-filter (hosts)" @@ -14731,42 +14707,18 @@ { "description": "A blocklist of malicious URLs that are being used for malware distribution.", "homeUrl": "https://gitlab.com/curben/urlhaus-filter", - "id": 2167, - "issuesUrl": "https://gitlab.com/curben/urlhaus-filter/issues", - "licenseId": 28, - "name": "urlhaus-filter (Online hosts)" - }, - { - "description": "A blocklist of malicious URLs that are being used for malware distribution.", - "homeUrl": "https://gitlab.com/curben/urlhaus-filter", - "id": 2168, + "id": 2169, "issuesUrl": "https://gitlab.com/curben/urlhaus-filter/issues", "licenseId": 28, "name": "urlhaus-filter (BIND)" }, - { - "description": "A blocklist of malicious URLs that are being used for malware distribution.", - "homeUrl": "https://gitlab.com/curben/urlhaus-filter", - "id": 2169, - "issuesUrl": "https://gitlab.com/curben/urlhaus-filter/issues", - "licenseId": 28, - "name": "urlhaus-filter (Online Domains - BIND)" - }, - { - "description": "A blocklist of malicious URLs that are being used for malware distribution.", - "homeUrl": "https://gitlab.com/curben/urlhaus-filter", - "id": 2170, - "issuesUrl": "https://gitlab.com/curben/urlhaus-filter/issues", - "licenseId": 28, - "name": "urlhaus-filter (Unbound)" - }, { "description": "A blocklist of malicious URLs that are being used for malware distribution.", "homeUrl": "https://gitlab.com/curben/urlhaus-filter", "id": 2171, "issuesUrl": "https://gitlab.com/curben/urlhaus-filter/issues", "licenseId": 28, - "name": "urlhaus-filter (Online Domains - Unbound)" + "name": "urlhaus-filter (Unbound)" }, { "description": "Sites engaged in spreading malware", diff --git a/services/Directory/data/FilterListSyntax.json b/services/Directory/data/FilterListSyntax.json index 155c11708..6d744b681 100644 --- a/services/Directory/data/FilterListSyntax.json +++ b/services/Directory/data/FilterListSyntax.json @@ -2599,10 +2599,6 @@ "filterListId": 857, "syntaxId": 11 }, - { - "filterListId": 858, - "syntaxId": 4 - }, { "filterListId": 859, "syntaxId": 3 @@ -6315,10 +6311,6 @@ "filterListId": 1878, "syntaxId": 13 }, - { - "filterListId": 1879, - "syntaxId": 2 - }, { "filterListId": 1880, "syntaxId": 2 @@ -7431,34 +7423,18 @@ "filterListId": 2163, "syntaxId": 3 }, - { - "filterListId": 2164, - "syntaxId": 20 - }, { "filterListId": 2165, "syntaxId": 20 }, - { - "filterListId": 2166, - "syntaxId": 1 - }, { "filterListId": 2167, "syntaxId": 1 }, - { - "filterListId": 2168, - "syntaxId": 26 - }, { "filterListId": 2169, "syntaxId": 26 }, - { - "filterListId": 2170, - "syntaxId": 24 - }, { "filterListId": 2171, "syntaxId": 24 diff --git a/services/Directory/data/FilterListTag.json b/services/Directory/data/FilterListTag.json index 7c043e1be..0e8b3f6a4 100644 --- a/services/Directory/data/FilterListTag.json +++ b/services/Directory/data/FilterListTag.json @@ -3743,10 +3743,6 @@ "filterListId": 857, "tagId": 12 }, - { - "filterListId": 858, - "tagId": 6 - }, { "filterListId": 859, "tagId": 11 @@ -9303,10 +9299,6 @@ "filterListId": 1878, "tagId": 7 }, - { - "filterListId": 1879, - "tagId": 6 - }, { "filterListId": 1880, "tagId": 6 @@ -10883,34 +10875,18 @@ "filterListId": 2163, "tagId": 30 }, - { - "filterListId": 2164, - "tagId": 6 - }, { "filterListId": 2165, "tagId": 6 }, - { - "filterListId": 2166, - "tagId": 6 - }, { "filterListId": 2167, "tagId": 6 }, - { - "filterListId": 2168, - "tagId": 6 - }, { "filterListId": 2169, "tagId": 6 }, - { - "filterListId": 2170, - "tagId": 6 - }, { "filterListId": 2171, "tagId": 6 diff --git a/services/Directory/data/FilterListViewUrl.json b/services/Directory/data/FilterListViewUrl.json index 55e6cac30..e7ecacb7e 100644 --- a/services/Directory/data/FilterListViewUrl.json +++ b/services/Directory/data/FilterListViewUrl.json @@ -5399,24 +5399,6 @@ "primariness": 2, "url": "https://gitlab.com/DandelionSprout/adfilt/raw/master/Dandelion%20Sprout-s%20Redirector%20Assistant%20List/TorRedirectorList.json" }, - { - "filterListId": 858, - "id": 901, - "primariness": 1, - "url": "https://gitlab.com/curben/urlhaus-filter/raw/master/urlhaus-filter.txt" - }, - { - "filterListId": 858, - "id": 902, - "primariness": 2, - "url": "https://cdn.statically.io/gl/curben/urlhaus-filter/master/urlhaus-filter.txt" - }, - { - "filterListId": 858, - "id": 903, - "primariness": 3, - "url": "https://glcdn.githack.com/curben/urlhaus-filter/raw/master/urlhaus-filter.txt" - }, { "filterListId": 859, "id": 904, @@ -11681,24 +11663,6 @@ "primariness": 2, "url": "https://gitlab.com/DandelionSprout/adfilt/raw/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersForMinerBlock.txt" }, - { - "filterListId": 1879, - "id": 1948, - "primariness": 1, - "url": "https://gitlab.com/curben/urlhaus-filter/raw/master/urlhaus-filter-domains.txt" - }, - { - "filterListId": 1879, - "id": 1949, - "primariness": 2, - "url": "https://cdn.statically.io/gl/curben/urlhaus-filter/master/urlhaus-filter-domains.txt" - }, - { - "filterListId": 1879, - "id": 1950, - "primariness": 3, - "url": "https://glcdn.githack.com/curben/urlhaus-filter/raw/master/urlhaus-filter-domains.txt" - }, { "filterListId": 1880, "id": 1951, @@ -13709,24 +13673,6 @@ "primariness": 2, "url": "https://gitlab.com/DandelionSprout/adfilt/raw/master/UndertaleRemoverForSoundCloud.txt" }, - { - "filterListId": 2164, - "id": 2286, - "primariness": 1, - "url": "https://gitlab.com/curben/urlhaus-filter/raw/master/urlhaus-filter-dnsmasq.conf" - }, - { - "filterListId": 2164, - "id": 2287, - "primariness": 2, - "url": "https://cdn.statically.io/gl/curben/urlhaus-filter/master/urlhaus-filter-dnsmasq.conf" - }, - { - "filterListId": 2164, - "id": 2288, - "primariness": 3, - "url": "https://glcdn.githack.com/curben/urlhaus-filter/raw/master/urlhaus-filter-dnsmasq.conf" - }, { "filterListId": 2165, "id": 2289, @@ -13745,24 +13691,6 @@ "primariness": 3, "url": "https://glcdn.githack.com/curben/urlhaus-filter/raw/master/urlhaus-filter-dnsmasq-online.conf" }, - { - "filterListId": 2166, - "id": 2292, - "primariness": 1, - "url": "https://gitlab.com/curben/urlhaus-filter/raw/master/urlhaus-filter-hosts.txt" - }, - { - "filterListId": 2166, - "id": 2293, - "primariness": 2, - "url": "https://cdn.statically.io/gl/curben/urlhaus-filter/master/urlhaus-filter-hosts.txt" - }, - { - "filterListId": 2166, - "id": 2294, - "primariness": 3, - "url": "https://glcdn.githack.com/curben/urlhaus-filter/raw/master/urlhaus-filter-hosts.txt" - }, { "filterListId": 2167, "id": 2295, @@ -13781,24 +13709,6 @@ "primariness": 3, "url": "https://glcdn.githack.com/curben/urlhaus-filter/raw/master/urlhaus-filter-hosts-online.txt" }, - { - "filterListId": 2168, - "id": 2298, - "primariness": 1, - "url": "https://gitlab.com/curben/urlhaus-filter/raw/master/urlhaus-filter-bind.conf" - }, - { - "filterListId": 2168, - "id": 2299, - "primariness": 2, - "url": "https://cdn.statically.io/gl/curben/urlhaus-filter/master/urlhaus-filter-bind.conf" - }, - { - "filterListId": 2168, - "id": 2300, - "primariness": 3, - "url": "https://glcdn.githack.com/curben/urlhaus-filter/raw/master/urlhaus-filter-bind.conf" - }, { "filterListId": 2169, "id": 2301, @@ -13817,24 +13727,6 @@ "primariness": 3, "url": "https://glcdn.githack.com/curben/urlhaus-filter/raw/master/urlhaus-filter-bind-online.conf" }, - { - "filterListId": 2170, - "id": 2304, - "primariness": 1, - "url": "https://gitlab.com/curben/urlhaus-filter/raw/master/urlhaus-filter-unbound.conf" - }, - { - "filterListId": 2170, - "id": 2305, - "primariness": 2, - "url": "https://cdn.statically.io/gl/curben/urlhaus-filter/master/urlhaus-filter-unbound.conf" - }, - { - "filterListId": 2170, - "id": 2306, - "primariness": 3, - "url": "https://glcdn.githack.com/curben/urlhaus-filter/raw/master/urlhaus-filter-unbound.conf" - }, { "filterListId": 2171, "id": 2307,