diff --git a/services/Directory/data/FilterList.json b/services/Directory/data/FilterList.json index 808aa2893..b9615f548 100644 --- a/services/Directory/data/FilterList.json +++ b/services/Directory/data/FilterList.json @@ -1,11 +1,11 @@ [ { - "description": "Add this if you use Yuki's uBlock Japanese filters with uBlock Origin on Firefox for Mobile.", - "homeUrl": "https://github.com/Yuki2718/adblock", + "description": "This complements AdGuard Japanese filter and mainly consists of 1) additional generic rules to counter circumvention ads and anti-adblock, and 2) specific rules to address sites not addresed in the Japanese filters.", + "homeUrl": "https://github.com/Yuki2718/adblock2", "id": 1, - "issuesUrl": "https://github.com/Yuki2718/adblock/issues", - "licenseId": 8, - "name": "Yuki's uBlock Japanese filters - Mobile" + "issuesUrl": "https://github.com/Yuki2718/adblock2/issues", + "licenseId": 4, + "name": "AdGuard Japanese filter Plus" }, { "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.", @@ -13486,44 +13486,12 @@ "licenseId": 2, "name": "Read the Docs Advertising Exception List" }, - { - "description": "AdGuard Social media filter tends to rely too much on cosmetic filters IMHO. This filter consists of network filters only and complements Social media filter.", - "homeUrl": "https://github.com/Yuki2718/adblock", - "id": 2079, - "issuesUrl": "https://github.com/Yuki2718/adblock/issues", - "licenseId": 8, - "name": "AdGuard Social Media Plus" - }, - { - "description": "Inspired by Sable Filter at MeetingLabs, this removes cookie consents. Main focuses are Japanese sites and other high-traffic sites many Japanese people will visit. False-positive prone rules won't be added (e.g. cookielaw.org, uk-cookie-consent plugin).", - "homeUrl": "https://github.com/Yuki2718/adblock", - "id": 2081, - "issuesUrl": "https://github.com/Yuki2718/adblock/issues", - "licenseId": 8, - "name": "Yuki's Cookie Dialogue filters" - }, - { - "description": "This removes blog parts and ranking buttons on Japanese websites.", - "homeUrl": "https://github.com/Yuki2718/adblock", - "id": 2082, - "issuesUrl": "https://github.com/Yuki2718/adblock/issues", - "licenseId": 8, - "name": "Yuki's Blog Parts" - }, - { - "description": "This is to counter unnecessary or too generic allowlists which were not addressed or won't be addressed by the maintainer. Only for advanced user as it can cause problems.", - "homeUrl": "https://github.com/Yuki2718/adblock", - "id": 2084, - "issuesUrl": "https://github.com/Yuki2718/adblock/issues", - "licenseId": 8, - "name": "Yuki's uBlock Anti-allowlist" - }, { "description": "A whitelist for medium mode of uBlock Origin for English user. The purpose is to help those non-techie, yet security-conscious, people to use the mode. Payment services and mobile sites are out-of-scope. This is not a list I myself use so won't be updated frequently.", - "homeUrl": "https://github.com/Yuki2718/adblock", + "homeUrl": "https://github.com/Yuki2718/adblock2", "id": 2085, - "issuesUrl": "https://github.com/Yuki2718/adblock/issues", - "licenseId": 8, + "issuesUrl": "https://github.com/Yuki2718/adblock2/issues", + "licenseId": 4, "name": "Yuki's uBlock Dynamic Rules" }, { @@ -13536,83 +13504,19 @@ }, { "description": "It's a mobile version of Yuki2718's uBlock Dynamic Rules.", - "homeUrl": "https://github.com/Yuki2718/adblock", + "homeUrl": "https://github.com/Yuki2718/adblock2", "id": 2088, - "issuesUrl": "https://github.com/Yuki2718/adblock/issues", - "licenseId": 8, + "issuesUrl": "https://github.com/Yuki2718/adblock2/issues", + "licenseId": 4, "name": "Yuki's uBlock Dynamic Rules for mobile" }, - { - "description": "Ignore generic cosmetic filters is recommended if you want better performance without sacrificing security or privacy. However, you'll notice ugly layout of many websites once you enabled this option. This filter mitigates this on English sites by removing placeholders left as a result of disabling generic cosmetic filters.", - "homeUrl": "https://github.com/Yuki2718/adblock", - "id": 2089, - "issuesUrl": "https://github.com/Yuki2718/adblock/issues", - "licenseId": 8, - "name": "Placeholder Hider with no generic hiding" - }, - { - "description": "The most comprehensive, block-first, and efficient Japanese list for uBlock Origin that removes ads and analytics on desktop, designed for advanced user.", - "homeUrl": "https://github.com/Yuki2718/adblock", - "id": 2091, - "issuesUrl": "https://github.com/Yuki2718/adblock/issues", - "licenseId": 8, - "name": "Yuki's uBlock Japanese filters" - }, - { - "description": "This can be added to uBlock Japanese filters for enhanced blocking. Use at your own risk.", - "homeUrl": "https://github.com/Yuki2718/adblock", - "id": 2092, - "issuesUrl": "https://github.com/Yuki2718/adblock/issues", - "licenseId": 8, - "name": "Yuki's uBlock Japanese filters - Paranoid" - }, - { - "description": "Removes share buttons mainly on Japanese sites.", - "homeUrl": "https://github.com/Yuki2718/adblock", - "id": 2093, - "issuesUrl": "https://github.com/Yuki2718/adblock/issues", - "licenseId": 8, - "name": "Yuki's uBlock Japanese filters - Social" - }, - { - "description": "Removes annoyances mainly on Japanese sites.", - "homeUrl": "https://github.com/Yuki2718/adblock", - "id": 2094, - "issuesUrl": "https://github.com/Yuki2718/adblock/issues", - "licenseId": 8, - "name": "Yuki's uBlock Japanese filters - Annoyances" - }, { "description": "This list fixes known problems in AdGuard DNS filter mostly for Japanese user.", - "homeUrl": "https://github.com/Yuki2718/adblock", + "homeUrl": "https://github.com/Yuki2718/adblock2", "id": 2095, - "issuesUrl": "https://github.com/Yuki2718/adblock/issues", - "licenseId": 8, - "name": "AdGuard DNS filter Unbreaker for Japanese" - }, - { - "description": "Removes blogroll (feed-style mutual links) on Japanese sites. Included in Yuki's uBlock Japanese filters - Annoyances", - "homeUrl": "https://github.com/Yuki2718/adblock", - "id": 2096, - "issuesUrl": "https://github.com/Yuki2718/adblock/issues", - "licenseId": 8, - "name": "Yuki's Blogroll filters" - }, - { - "description": "Removes annoyances which only some user, not everyone, want to remove mainly on Japanese sites.", - "homeUrl": "https://github.com/Yuki2718/adblock", - "id": 2097, - "issuesUrl": "https://github.com/Yuki2718/adblock/issues", - "licenseId": 8, - "name": "Yuki's uBlock Japanese filters - Annoyances Plus" - }, - { - "description": "Enhances anti anti-adblock capability of AdGuard by generic filters. Works on AdGuard for Windows, AdGuard for Android, AdGuard for Mac, and AdGuard Browser Extensions but not for AdGuard for Safari, AdGuard for iOS, and AdGuard Contents Blocker. This list also mitigates malicious popups often seen on porn sites, pirate sites, and/or short links.", - "homeUrl": "https://github.com/Yuki2718/adblock", - "id": 2098, - "issuesUrl": "https://github.com/Yuki2718/adblock/issues", + "issuesUrl": "https://github.com/Yuki2718/adblock2/issues", "licenseId": 4, - "name": "Anti Anti-adblock Enhancer for AdGuard" + "name": "AdGuard DNS filter Unbreaker for Japanese" }, { "description": "Blocks access to phishing, spam, malware and malicious domains. Our database of malicious domains is updated hourly and considered to be one of the best in the industry. Links that didn't fit in the Subscribe button URL texts, include 2a0d:2a00:2::2", @@ -16499,14 +16403,6 @@ "licenseId": 5, "name": "beer_blocklist" }, - { - "description": "This allowlist fixes incorrect blocking by standard filters such as EasyList, mainly on Japanese websites. It is based largely on Yuki's uBlock Japanese filters.", - "homeUrl": "https://github.com/hirorpt/filters", - "id": 2475, - "issuesUrl": "https://github.com/hirorpt/filters/issues", - "licenseId": 28, - "name": "Konayuki filters" - }, { "description": "A block of websites that host potentially unwanted programs", "homeUrl": "https://gitlab.com/malware-filter/pup-filter", diff --git a/services/Directory/data/FilterListLanguage.json b/services/Directory/data/FilterListLanguage.json index 0017483d3..b69e1c414 100644 --- a/services/Directory/data/FilterListLanguage.json +++ b/services/Directory/data/FilterListLanguage.json @@ -2843,10 +2843,6 @@ "filterListId": 2046, "languageId": 179 }, - { - "filterListId": 2079, - "languageId": 37 - }, { "filterListId": 2081, "languageId": 73 @@ -2867,42 +2863,10 @@ "filterListId": 2088, "languageId": 37 }, - { - "filterListId": 2089, - "languageId": 37 - }, - { - "filterListId": 2091, - "languageId": 73 - }, - { - "filterListId": 2092, - "languageId": 73 - }, - { - "filterListId": 2093, - "languageId": 73 - }, - { - "filterListId": 2094, - "languageId": 73 - }, { "filterListId": 2095, "languageId": 73 }, - { - "filterListId": 2096, - "languageId": 73 - }, - { - "filterListId": 2097, - "languageId": 73 - }, - { - "filterListId": 2098, - "languageId": 37 - }, { "filterListId": 2101, "languageId": 179 @@ -3707,10 +3671,6 @@ "filterListId": 2471, "languageId": 113 }, - { - "filterListId": 2475, - "languageId": 73 - }, { "filterListId": 2519, "languageId": 113 diff --git a/services/Directory/data/FilterListMaintainer.json b/services/Directory/data/FilterListMaintainer.json index bcf054538..08b7ce169 100644 --- a/services/Directory/data/FilterListMaintainer.json +++ b/services/Directory/data/FilterListMaintainer.json @@ -4939,10 +4939,6 @@ "filterListId": 2070, "maintainerId": 148 }, - { - "filterListId": 2079, - "maintainerId": 150 - }, { "filterListId": 2081, "maintainerId": 150 @@ -4963,42 +4959,10 @@ "filterListId": 2088, "maintainerId": 150 }, - { - "filterListId": 2089, - "maintainerId": 150 - }, - { - "filterListId": 2091, - "maintainerId": 150 - }, - { - "filterListId": 2092, - "maintainerId": 150 - }, - { - "filterListId": 2093, - "maintainerId": 150 - }, - { - "filterListId": 2094, - "maintainerId": 150 - }, { "filterListId": 2095, "maintainerId": 150 }, - { - "filterListId": 2096, - "maintainerId": 150 - }, - { - "filterListId": 2097, - "maintainerId": 150 - }, - { - "filterListId": 2098, - "maintainerId": 150 - }, { "filterListId": 2112, "maintainerId": 22 @@ -5675,10 +5639,6 @@ "filterListId": 2473, "maintainerId": 158 }, - { - "filterListId": 2475, - "maintainerId": 159 - }, { "filterListId": 2476, "maintainerId": 158 diff --git a/services/Directory/data/FilterListSyntax.json b/services/Directory/data/FilterListSyntax.json index 856c27707..470c2f925 100644 --- a/services/Directory/data/FilterListSyntax.json +++ b/services/Directory/data/FilterListSyntax.json @@ -6823,42 +6823,10 @@ "filterListId": 2088, "syntaxId": 53 }, - { - "filterListId": 2089, - "syntaxId": 4 - }, - { - "filterListId": 2091, - "syntaxId": 4 - }, - { - "filterListId": 2092, - "syntaxId": 4 - }, - { - "filterListId": 2093, - "syntaxId": 4 - }, - { - "filterListId": 2094, - "syntaxId": 4 - }, { "filterListId": 2095, "syntaxId": 3 }, - { - "filterListId": 2096, - "syntaxId": 4 - }, - { - "filterListId": 2097, - "syntaxId": 4 - }, - { - "filterListId": 2098, - "syntaxId": 6 - }, { "filterListId": 2099, "syntaxId": 22 @@ -8291,10 +8259,6 @@ "filterListId": 2473, "syntaxId": 25 }, - { - "filterListId": 2475, - "syntaxId": 4 - }, { "filterListId": 2476, "syntaxId": 4 diff --git a/services/Directory/data/FilterListTag.json b/services/Directory/data/FilterListTag.json index 54ca11338..caf7228fa 100644 --- a/services/Directory/data/FilterListTag.json +++ b/services/Directory/data/FilterListTag.json @@ -10199,42 +10199,10 @@ "filterListId": 2088, "tagId": 10 }, - { - "filterListId": 2089, - "tagId": 31 - }, - { - "filterListId": 2091, - "tagId": 2 - }, - { - "filterListId": 2092, - "tagId": 3 - }, - { - "filterListId": 2093, - "tagId": 4 - }, - { - "filterListId": 2094, - "tagId": 9 - }, { "filterListId": 2095, "tagId": 10 }, - { - "filterListId": 2096, - "tagId": 9 - }, - { - "filterListId": 2097, - "tagId": 9 - }, - { - "filterListId": 2098, - "tagId": 5 - }, { "filterListId": 2099, "tagId": 6 @@ -12195,10 +12163,6 @@ "filterListId": 2473, "tagId": 7 }, - { - "filterListId": 2475, - "tagId": 10 - }, { "filterListId": 2476, "tagId": 6 diff --git a/services/Directory/data/FilterListViewUrl.json b/services/Directory/data/FilterListViewUrl.json index eee1f47c0..a4dde0fc1 100644 --- a/services/Directory/data/FilterListViewUrl.json +++ b/services/Directory/data/FilterListViewUrl.json @@ -3,7 +3,7 @@ "filterListId": 1, "id": 1, "primariness": 1, - "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/jp-mob.txt" + "url": "https://raw.githubusercontent.com/Yuki2718/adblock2/main/japanese/jpf-plus.txt" }, { "filterListId": 2, @@ -12485,35 +12485,11 @@ "primariness": 1, "url": "https://ads-for-open-source.readthedocs.io/en/latest/_static/lists/readthedocs-ads.txt" }, - { - "filterListId": 2079, - "id": 2186, - "primariness": 1, - "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/adguard/social-plus.txt" - }, - { - "filterListId": 2081, - "id": 2188, - "primariness": 1, - "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/sabre-filters2.txt" - }, - { - "filterListId": 2082, - "id": 2189, - "primariness": 1, - "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/blog-parts.txt" - }, - { - "filterListId": 2084, - "id": 2191, - "primariness": 1, - "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/medium_mode/anti-allowlist.txt" - }, { "filterListId": 2085, "id": 2192, "primariness": 1, - "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/medium_mode/dynamic-rules.txt" + "url": "https://raw.githubusercontent.com/Yuki2718/adblock2/main/medium_mode/dynamic-rules.txt" }, { "filterListId": 2087, @@ -12525,43 +12501,13 @@ "filterListId": 2088, "id": 2195, "primariness": 1, - "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/medium_mode/dynamic-rules-mob.txt" - }, - { - "filterListId": 2089, - "id": 2196, - "primariness": 1, - "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/no_gen_cosm/phhider.txt" - }, - { - "filterListId": 2091, - "id": 2198, - "primariness": 1, - "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/jp-filters.txt" - }, - { - "filterListId": 2092, - "id": 2199, - "primariness": 1, - "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/jp-paranoid.txt" - }, - { - "filterListId": 2093, - "id": 2200, - "primariness": 1, - "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/jp-social.txt" - }, - { - "filterListId": 2094, - "id": 2201, - "primariness": 1, - "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/jp-annoyances.txt" + "url": "https://raw.githubusercontent.com/Yuki2718/adblock2/main/medium_mode/dynamic-rules-mob.txt" }, { "filterListId": 2095, "id": 2202, "primariness": 1, - "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/adguard/dns-unbreak.txt" + "url": "https://raw.githubusercontent.com/Yuki2718/adblock2/main/japanese/dns-unbreak.txt" }, { "filterListId": 2099, @@ -15125,18 +15071,6 @@ "primariness": 1, "url": "https://malware-filter.gitlab.io/malware-filter/phishing-filter-rpz.conf" }, - { - "filterListId": 2096, - "id": 2683, - "primariness": 1, - "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/blogroll.txt" - }, - { - "filterListId": 2475, - "id": 2684, - "primariness": 1, - "url": "https://raw.githubusercontent.com/hirorpt/filters/main/fix.txt" - }, { "filterListId": 2476, "id": 2685, @@ -15263,18 +15197,6 @@ "primariness": 1, "url": "https://raw.githubusercontent.com/troysjanda/MyBlockLists/master/UBOXPI" }, - { - "filterListId": 2097, - "id": 2706, - "primariness": 1, - "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/jp-annoyances-plus.txt" - }, - { - "filterListId": 2098, - "id": 2707, - "primariness": 1, - "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/adguard/anti-antiadb.txt" - }, { "filterListId": 2497, "id": 2708, diff --git a/services/Directory/data/Maintainer.json b/services/Directory/data/Maintainer.json index a82a13a84..27dfe0fce 100644 --- a/services/Directory/data/Maintainer.json +++ b/services/Directory/data/Maintainer.json @@ -819,11 +819,6 @@ "name": "Ming Di Leom", "url": "https://mdleom.com/" }, - { - "id": 159, - "name": "hirorpt", - "url": "https://github.com/hirorpt" - }, { "id": 160, "name": "Troy Janda",