Partly revert #2534 and remove a few lists

services/Directory/data/FilterList.json

@@ -13518,14 +13518,6 @@
     "licenseId": 8,
     "name": "AdGuard Social Media Plus"
   },
-  {
-    "description": "AdGuard Tracking Protection filter is probably the least false-positive prone anti-tracking list; however, it comes with its own cost of less coverage which this filter aims to complement.",
-    "homeUrl": "https://github.com/Yuki2718/adblock",
-    "id": 2080,
-    "issuesUrl": "https://github.com/Yuki2718/adblock/issues",
-    "licenseId": 8,
-    "name": "AdGuard Tracking Protection 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",
@@ -13542,14 +13534,6 @@
     "licenseId": 8,
     "name": "Yuki's Blog Parts"
   },
-  {
-    "description": "Removes ranking buttons on adult sites.",
-    "homeUrl": "https://github.com/Yuki2718/adblock",
-    "id": 2083,
-    "issuesUrl": "https://github.com/Yuki2718/adblock/issues",
-    "licenseId": 8,
-    "name": "Yuki's Blog Parts Adult"
-  },
   {
     "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",
@@ -13566,14 +13550,6 @@
     "licenseId": 8,
     "name": "Yuki's uBlock Dynamic Rules"
   },
-  {
-    "description": "WordPress plugins have been security nightmare and are usually implemented in first-party resource that bypasses medium mode. Although it's impossible to block thousands of these plugins without breaking too many sites, blocking those unwanted plugins won't be a bad idea. While popular social and annoyances filters block many of them, they come with tons of unnecessary rules[^1] and also occasionally cause false-positive. For these reasons I've settled down to AdGuard Social media filter which is relatively small in size and rarely breaks pages; however, it only blocks minimal set of the plugins. This list includes 1) rules for the plugins not on the Social media filter or other default filter lists, 2) rules almost equivalent to Noscript's Application Boundaries Enforcer, and 3) a regex rule focused only on the latest survey scam campaign.",
-    "homeUrl": "https://github.com/Yuki2718/adblock",
-    "id": 2086,
-    "issuesUrl": "https://github.com/Yuki2718/adblock/issues",
-    "licenseId": 8,
-    "name": "Yuki's uBlock Static Rules"
-  },
   {
     "description": "Blocklist based on articles published by security research groups.",
     "homeUrl": "https://github.com/scafroglia93/blocklists/",
@@ -13598,14 +13574,6 @@
     "licenseId": 8,
     "name": "Placeholder Hider with no generic hiding"
   },
-  {
-    "description": "It's a mobile version of Placeholder Hider with no generic hiding.",
-    "homeUrl": "https://github.com/Yuki2718/adblock",
-    "id": 2090,
-    "issuesUrl": "https://github.com/Yuki2718/adblock/issues",
-    "licenseId": 8,
-    "name": "Placeholder Hider with no generic hiding for mobile"
-  },
   {
     "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",
@@ -13638,6 +13606,14 @@
     "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",

services/Directory/data/FilterListLanguage.json

@@ -2847,10 +2847,6 @@
     "filterListId": 2079,
     "languageId": 37
   },
-  {
-    "filterListId": 2080,
-    "languageId": 37
-  },
   {
     "filterListId": 2081,
     "languageId": 73
@@ -2859,10 +2855,6 @@
     "filterListId": 2082,
     "languageId": 73
   },
-  {
-    "filterListId": 2083,
-    "languageId": 73
-  },
   {
     "filterListId": 2084,
     "languageId": 37
@@ -2871,10 +2863,6 @@
     "filterListId": 2085,
     "languageId": 37
   },
-  {
-    "filterListId": 2086,
-    "languageId": 37
-  },
   {
     "filterListId": 2088,
     "languageId": 37
@@ -2883,10 +2871,6 @@
     "filterListId": 2089,
     "languageId": 37
   },
-  {
-    "filterListId": 2090,
-    "languageId": 37
-  },
   {
     "filterListId": 2091,
     "languageId": 73
@@ -2903,6 +2887,10 @@
     "filterListId": 2094,
     "languageId": 73
   },
+  {
+    "filterListId": 2095,
+    "languageId": 73
+  },
   {
     "filterListId": 2096,
     "languageId": 73

services/Directory/data/FilterListMaintainer.json

@@ -4819,10 +4819,6 @@
     "filterListId": 2079,
     "maintainerId": 150
   },
-  {
-    "filterListId": 2080,
-    "maintainerId": 150
-  },
   {
     "filterListId": 2081,
     "maintainerId": 150
@@ -4831,10 +4827,6 @@
     "filterListId": 2082,
     "maintainerId": 150
   },
-  {
-    "filterListId": 2083,
-    "maintainerId": 150
-  },
   {
     "filterListId": 2084,
     "maintainerId": 150
@@ -4843,10 +4835,6 @@
     "filterListId": 2085,
     "maintainerId": 150
   },
-  {
-    "filterListId": 2086,
-    "maintainerId": 150
-  },
   {
     "filterListId": 2088,
     "maintainerId": 150
@@ -4855,10 +4843,6 @@
     "filterListId": 2089,
     "maintainerId": 150
   },
-  {
-    "filterListId": 2090,
-    "maintainerId": 150
-  },
   {
     "filterListId": 2091,
     "maintainerId": 150
@@ -4875,6 +4859,10 @@
     "filterListId": 2094,
     "maintainerId": 150
   },
+  {
+    "filterListId": 2095,
+    "maintainerId": 150
+  },
   {
     "filterListId": 2096,
     "maintainerId": 150

services/Directory/data/FilterListSyntax.json

@@ -6799,10 +6799,6 @@
     "filterListId": 2079,
     "syntaxId": 3
   },
-  {
-    "filterListId": 2080,
-    "syntaxId": 3
-  },
   {
     "filterListId": 2081,
     "syntaxId": 6
@@ -6811,10 +6807,6 @@
     "filterListId": 2082,
     "syntaxId": 3
   },
-  {
-    "filterListId": 2083,
-    "syntaxId": 3
-  },
   {
     "filterListId": 2084,
     "syntaxId": 4
@@ -6823,10 +6815,6 @@
     "filterListId": 2085,
     "syntaxId": 53
   },
-  {
-    "filterListId": 2086,
-    "syntaxId": 4
-  },
   {
     "filterListId": 2087,
     "syntaxId": 2
@@ -6839,10 +6827,6 @@
     "filterListId": 2089,
     "syntaxId": 4
   },
-  {
-    "filterListId": 2090,
-    "syntaxId": 4
-  },
   {
     "filterListId": 2091,
     "syntaxId": 4
@@ -6859,6 +6843,10 @@
     "filterListId": 2094,
     "syntaxId": 4
   },
+  {
+    "filterListId": 2095,
+    "syntaxId": 6
+  },
   {
     "filterListId": 2096,
     "syntaxId": 4

services/Directory/data/FilterListTag.json

@@ -10163,10 +10163,6 @@
     "filterListId": 2079,
     "tagId": 4
   },
-  {
-    "filterListId": 2080,
-    "tagId": 3
-  },
   {
     "filterListId": 2081,
     "tagId": 8
@@ -10175,10 +10171,6 @@
     "filterListId": 2082,
     "tagId": 15
   },
-  {
-    "filterListId": 2083,
-    "tagId": 15
-  },
   {
     "filterListId": 2084,
     "tagId": 15
@@ -10187,10 +10179,6 @@
     "filterListId": 2085,
     "tagId": 10
   },
-  {
-    "filterListId": 2086,
-    "tagId": 15
-  },
   {
     "filterListId": 2087,
     "tagId": 6
@@ -10203,10 +10191,6 @@
     "filterListId": 2089,
     "tagId": 31
   },
-  {
-    "filterListId": 2090,
-    "tagId": 31
-  },
   {
     "filterListId": 2091,
     "tagId": 2
@@ -10223,6 +10207,10 @@
     "filterListId": 2094,
     "tagId": 9
   },
+  {
+    "filterListId": 2095,
+    "tagId": 6
+  },
   {
     "filterListId": 2096,
     "tagId": 9

services/Directory/data/FilterListViewUrl.json

@@ -12515,12 +12515,6 @@
     "primariness": 1,
     "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/adguard/social-plus.txt"
   },
-  {
-    "filterListId": 2080,
-    "id": 2187,
-    "primariness": 1,
-    "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/adguard/tracking-plus.txt"
-  },
   {
     "filterListId": 2081,
     "id": 2188,
@@ -12533,12 +12527,6 @@
     "primariness": 1,
     "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/blog-parts.txt"
   },
-  {
-    "filterListId": 2083,
-    "id": 2190,
-    "primariness": 1,
-    "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/blog-parts-adult.txt"
-  },
   {
     "filterListId": 2084,
     "id": 2191,
@@ -12551,12 +12539,6 @@
     "primariness": 1,
     "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/medium_mode/dynamic-rules.txt"
   },
-  {
-    "filterListId": 2086,
-    "id": 2193,
-    "primariness": 1,
-    "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/medium_mode/static-rules.txt"
-  },
   {
     "filterListId": 2087,
     "id": 2194,
@@ -12575,12 +12557,6 @@
     "primariness": 1,
     "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/no_gen_cosm/phhider.txt"
   },
-  {
-    "filterListId": 2090,
-    "id": 2197,
-    "primariness": 1,
-    "url": "https://raw.githubusercontent.com/Yuki2718/adblock/master/no_gen_cosm/phhider-mob.txt"
-  },
   {
     "filterListId": 2091,
     "id": 2198,
@@ -12605,6 +12581,12 @@
     "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,