From 478c70fc1c0a7163e37c033771a10a9a82ba8d92 Mon Sep 17 00:00:00 2001 From: Yuki2718 Date: Thu, 2 Sep 2021 20:48:42 +0900 Subject: [PATCH] Remove 280blocker and its related filters that are/is going to obsolete --- services/Directory/data/FilterList.json | 81 ------------------- .../Directory/data/FilterListLanguage.json | 44 ---------- .../Directory/data/FilterListMaintainer.json | 8 -- services/Directory/data/FilterListSyntax.json | 44 ---------- services/Directory/data/FilterListTag.json | 64 --------------- .../Directory/data/FilterListViewUrl.json | 66 --------------- 6 files changed, 307 deletions(-) diff --git a/services/Directory/data/FilterList.json b/services/Directory/data/FilterList.json index 9c64ef3cf..d4f359833 100644 --- a/services/Directory/data/FilterList.json +++ b/services/Directory/data/FilterList.json @@ -1,12 +1,4 @@ [ - { - "description": "A filter list that blocks mobile advertisements and trackers on Japanese properties", - "homeUrl": "https://280blocker.net", - "id": 1, - "licenseId": 1, - "name": "280blocker for japanese mobile site", - "submissionUrl": "https://docs.google.com/forms/d/e/1FAIpQLScNeZhFrFZt9GhIVGdThGz7oyepcNRKuOi5PJDnsC-awxTeOQ/viewform" - }, { "description": "Mute is an AdBlock Plus filter for user comments. In the same way that AdBlock hides ads, AdBlock can use this filter to hide user-generated comments, allowing you to browse the Internet with less stupidity clawing at your eyeballs.", "homeUrl": "https://github.com/B-Con/mute", @@ -9296,14 +9288,6 @@ "licenseId": 5, "name": "jawz101 MobileAdTrackers" }, - { - "description": "A filter list that blocks mobile advertisements and trackers on Japanese properties", - "homeUrl": "https://280blocker.net", - "id": 1483, - "licenseId": 1, - "name": "280blocker adblock domain lists", - "submissionUrl": "https://docs.google.com/forms/d/e/1FAIpQLScNeZhFrFZt9GhIVGdThGz7oyepcNRKuOi5PJDnsC-awxTeOQ/viewform" - }, { "homeUrl": "https://blocklist.site/", "id": 1484, @@ -12402,55 +12386,6 @@ "licenseId": 5, "name": "nocomments" }, - { - "description": "This is a filter to complement 280blocker by finding advertisements that are not blocked by 280blocker.", - "homeUrl": "https://github.com/nanj-adguard2/nanj-kakuchou-filter", - "id": 1857, - "licenseId": 20, - "name": "Nanj Kakuchou Filter - Supplement Rules" - }, - { - "description": "DNS rule filters to strengthen ad blocking.", - "homeUrl": "https://github.com/nanj-adguard2/nanj-kakuchou-filter", - "id": 1858, - "licenseId": 20, - "name": "Nanj Kakuchou Filter - DNS Rules" - }, - { - "description": "This is a filter that eradicates what 280blocker will not support in the future.", - "homeUrl": "https://github.com/nanj-adguard2/nanj-kakuchou-filter", - "id": 1859, - "licenseId": 20, - "name": "Nanj Kakuchou Filter - Paranoid Rules" - }, - { - "description": "This is a filter to fix bugs in AdGuard for Android when using Japanese websites / Japanese apps / 280blocker.", - "homeUrl": "https://github.com/nanj-adguard2/nanj-kaishuu-filter", - "id": 1860, - "licenseId": 20, - "name": "Nanj Kaishuu Filter" - }, - { - "description": "This is a filter to fix bugs in AdGuard for Android when using Japanese websites / Japanese apps / 280blocker.", - "homeUrl": "https://github.com/nanj-adguard2/nanj-kaishuu-filter", - "id": 1861, - "licenseId": 20, - "name": "Nanj Kaishuu DNS Filter" - }, - { - "description": "This is a filter to fix bugs in AdGuard for Android when using Japanese websites / Japanese apps / 280blocker.", - "homeUrl": "https://github.com/nanj-adguard2/nanj-kaishuu-filter", - "id": 1862, - "licenseId": 1, - "name": "280blocker + Nanj Kakuchou" - }, - { - "description": "This is a filter to fix bugs in AdGuard for Android when using Japanese websites / Japanese apps / 280blocker.", - "homeUrl": "https://github.com/nanj-adguard2/nanj-kaishuu-filter", - "id": 1863, - "licenseId": 1, - "name": "280blocker + Nanj Kakuchou - Supplement Rules" - }, { "description": "This is a quick list of Ad-blocking filters for Sri Lankan web sites. Use this to complement Easylist filters.", "homeUrl": "https://github.com/Ayesh/Adblock-Sinhala/", @@ -14110,14 +14045,6 @@ "licenseId": 8, "name": "Yuki's uBlock Japanese filters - Annoyances" }, - { - "description": "Enhance anti-scam capability of 280blocker adblock filter by utilizing advanced capability of AdGuard/uBlock Origin.", - "homeUrl": "https://github.com/Yuki2718/adblock", - "id": 2095, - "issuesUrl": "https://github.com/Yuki2718/adblock/issues", - "licenseId": 28, - "name": "Anti-scam enhancer for 280blocker adblock filter" - }, { "description": "Removes blogroll (feed-style mutual links) on Japanese sites. Included in Yuki's uBlock Japanese filters - Annoyances", "homeUrl": "https://github.com/Yuki2718/adblock", @@ -15528,14 +15455,6 @@ "licenseId": 35, "name": "1Hosts Pro (Domains with wildcards)" }, - { - "description": "A filter list that blocks mobile advertisements and trackers on Japanese properties", - "homeUrl": "https://280blocker.net", - "id": 2282, - "licenseId": 1, - "name": "280blocker adblock domain lists (AdGuard)", - "submissionUrl": "https://docs.google.com/forms/d/e/1FAIpQLScNeZhFrFZt9GhIVGdThGz7oyepcNRKuOi5PJDnsC-awxTeOQ/viewform" - }, { "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.", "forumUrl": "https://forum.xda-developers.com/android/software-hacking/goodbye-ads-advanced-protection-ads-ad-t3827269", diff --git a/services/Directory/data/FilterListLanguage.json b/services/Directory/data/FilterListLanguage.json index 4b635e4b8..f1dcf45b5 100644 --- a/services/Directory/data/FilterListLanguage.json +++ b/services/Directory/data/FilterListLanguage.json @@ -1,8 +1,4 @@ [ - { - "filterListId": 1, - "iso6391": "ja" - }, { "filterListId": 6, "iso6391": "ja" @@ -2279,10 +2275,6 @@ "filterListId": 1299, "iso6391": "zh" }, - { - "filterListId": 1483, - "iso6391": "ja" - }, { "filterListId": 1528, "iso6391": "az" @@ -2735,34 +2727,6 @@ "filterListId": 1853, "iso6391": "th" }, - { - "filterListId": 1857, - "iso6391": "ja" - }, - { - "filterListId": 1858, - "iso6391": "ja" - }, - { - "filterListId": 1859, - "iso6391": "ja" - }, - { - "filterListId": 1860, - "iso6391": "ja" - }, - { - "filterListId": 1861, - "iso6391": "ja" - }, - { - "filterListId": 1862, - "iso6391": "ja" - }, - { - "filterListId": 1863, - "iso6391": "ja" - }, { "filterListId": 1864, "iso6391": "si" @@ -2971,10 +2935,6 @@ "filterListId": 2094, "iso6391": "ja" }, - { - "filterListId": 2095, - "iso6391": "ja" - }, { "filterListId": 2096, "iso6391": "ja" @@ -3535,10 +3495,6 @@ "filterListId": 2278, "iso6391": "de" }, - { - "filterListId": 2282, - "iso6391": "ja" - }, { "filterListId": 2286, "iso6391": "da" diff --git a/services/Directory/data/FilterListMaintainer.json b/services/Directory/data/FilterListMaintainer.json index 05c4f7a7f..ab3c84220 100644 --- a/services/Directory/data/FilterListMaintainer.json +++ b/services/Directory/data/FilterListMaintainer.json @@ -1,8 +1,4 @@ [ - { - "filterListId": 1, - "maintainerId": 2 - }, { "filterListId": 2, "maintainerId": 3 @@ -3883,10 +3879,6 @@ "filterListId": 1480, "maintainerId": 118 }, - { - "filterListId": 1483, - "maintainerId": 2 - }, { "filterListId": 1484, "maintainerId": 154 diff --git a/services/Directory/data/FilterListSyntax.json b/services/Directory/data/FilterListSyntax.json index 4e42a3a7e..94e588b4e 100644 --- a/services/Directory/data/FilterListSyntax.json +++ b/services/Directory/data/FilterListSyntax.json @@ -1,8 +1,4 @@ [ - { - "filterListId": 1, - "syntaxId": 3 - }, { "filterListId": 2, "syntaxId": 3 @@ -4783,10 +4779,6 @@ "filterListId": 1481, "syntaxId": 1 }, - { - "filterListId": 1483, - "syntaxId": 2 - }, { "filterListId": 1484, "syntaxId": 2 @@ -6187,34 +6179,6 @@ "filterListId": 1856, "syntaxId": 3 }, - { - "filterListId": 1857, - "syntaxId": 3 - }, - { - "filterListId": 1858, - "syntaxId": 47 - }, - { - "filterListId": 1859, - "syntaxId": 3 - }, - { - "filterListId": 1860, - "syntaxId": 6 - }, - { - "filterListId": 1861, - "syntaxId": 3 - }, - { - "filterListId": 1862, - "syntaxId": 3 - }, - { - "filterListId": 1863, - "syntaxId": 3 - }, { "filterListId": 1864, "syntaxId": 3 @@ -7107,10 +7071,6 @@ "filterListId": 2094, "syntaxId": 4 }, - { - "filterListId": 2095, - "syntaxId": 4 - }, { "filterListId": 2096, "syntaxId": 4 @@ -7855,10 +7815,6 @@ "filterListId": 2281, "syntaxId": 16 }, - { - "filterListId": 2282, - "syntaxId": 47 - }, { "filterListId": 2283, "syntaxId": 47 diff --git a/services/Directory/data/FilterListTag.json b/services/Directory/data/FilterListTag.json index 522277610..2e8833191 100644 --- a/services/Directory/data/FilterListTag.json +++ b/services/Directory/data/FilterListTag.json @@ -1,12 +1,4 @@ [ - { - "filterListId": 1, - "tagId": 2 - }, - { - "filterListId": 1, - "tagId": 3 - }, { "filterListId": 2, "tagId": 4 @@ -6175,18 +6167,6 @@ "filterListId": 1481, "tagId": 4 }, - { - "filterListId": 1483, - "tagId": 3 - }, - { - "filterListId": 1483, - "tagId": 4 - }, - { - "filterListId": 1483, - "tagId": 10 - }, { "filterListId": 1484, "tagId": 24 @@ -9095,34 +9075,6 @@ "filterListId": 1856, "tagId": 4 }, - { - "filterListId": 1857, - "tagId": 2 - }, - { - "filterListId": 1858, - "tagId": 3 - }, - { - "filterListId": 1859, - "tagId": 9 - }, - { - "filterListId": 1860, - "tagId": 10 - }, - { - "filterListId": 1861, - "tagId": 10 - }, - { - "filterListId": 1862, - "tagId": 2 - }, - { - "filterListId": 1863, - "tagId": 2 - }, { "filterListId": 1864, "tagId": 2 @@ -10535,10 +10487,6 @@ "filterListId": 2094, "tagId": 9 }, - { - "filterListId": 2095, - "tagId": 7 - }, { "filterListId": 2096, "tagId": 9 @@ -11383,18 +11331,6 @@ "filterListId": 2281, "tagId": 6 }, - { - "filterListId": 2282, - "tagId": 3 - }, - { - "filterListId": 2282, - "tagId": 4 - }, - { - "filterListId": 2282, - "tagId": 10 - }, { "filterListId": 2283, "tagId": 2 diff --git a/services/Directory/data/FilterListViewUrl.json b/services/Directory/data/FilterListViewUrl.json index 8cf4325bc..78d932c73 100644 --- a/services/Directory/data/FilterListViewUrl.json +++ b/services/Directory/data/FilterListViewUrl.json @@ -1,10 +1,4 @@ [ - { - "filterListId": 1, - "id": 1, - "primariness": 1, - "url": "https://280blocker.net/files/280blocker_adblock.txt" - }, { "filterListId": 2, "id": 2, @@ -8849,12 +8843,6 @@ "primariness": 1, "url": "https://raw.githubusercontent.com/jawz101/MobileAdTrackers/master/hosts" }, - { - "filterListId": 1483, - "id": 1491, - "primariness": 1, - "url": "https://280blocker.net/files/280blocker_domain.txt" - }, { "filterListId": 1484, "id": 1492, @@ -11453,48 +11441,6 @@ "primariness": 1, "url": "https://raw.githubusercontent.com/lutoma/nocomments/master/abp.txt" }, - { - "filterListId": 1857, - "id": 1925, - "primariness": 1, - "url": "https://raw.githubusercontent.com/nanj-adguard2/nanj-kakuchou-filter/master/supplement-rules.txt" - }, - { - "filterListId": 1858, - "id": 1926, - "primariness": 1, - "url": "https://raw.githubusercontent.com/nanj-adguard2/nanj-kakuchou-filter/master/DNS-rules.txt" - }, - { - "filterListId": 1859, - "id": 1927, - "primariness": 1, - "url": "https://raw.githubusercontent.com/nanj-adguard2/nanj-kakuchou-filter/master/paranoid-rules.txt" - }, - { - "filterListId": 1860, - "id": 1928, - "primariness": 1, - "url": "https://raw.githubusercontent.com/nanj-adguard2/nanj-kaishuu-filter/master/nanj-kaishuu-filter.txt" - }, - { - "filterListId": 1861, - "id": 1929, - "primariness": 1, - "url": "https://raw.githubusercontent.com/nanj-adguard2/nanj-kaishuu-filter/master/nanj-kaishuu-dns-filter.txt" - }, - { - "filterListId": 1862, - "id": 1930, - "primariness": 1, - "url": "https://280blocker.net/files/280blocker_adblock_nanj.txt" - }, - { - "filterListId": 1863, - "id": 1931, - "primariness": 1, - "url": "https://280blocker.net/files/280blocker_adblock_nanj_supp.txt" - }, { "filterListId": 1864, "id": 1932, @@ -13097,12 +13043,6 @@ "primariness": 1, "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/jp-annoyances.txt" }, - { - "filterListId": 2095, - "id": 2202, - "primariness": 1, - "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/280-patch.txt" - }, { "filterListId": 2099, "id": 2203, @@ -14357,12 +14297,6 @@ "primariness": 2, "url": "https://raw.githubusercontent.com/badmojr/1Hosts/master/Pro/wildcards.txt" }, - { - "filterListId": 2282, - "id": 2425, - "primariness": 1, - "url": "https://280blocker.net/files/280blocker_domain_ag.txt" - }, { "filterListId": 2283, "id": 2426,