From 7ee8142b38603ec4e02b91762061b8778442d22d Mon Sep 17 00:00:00 2001
From: Andrey Meshkov <am@adguard.com>
Date: Wed, 15 Dec 2021 16:51:03 +0300
Subject: [PATCH] Pull request: revise vetted lists, fix #2644

Merge in DNS/adguard-home from 2644-reviselists to master

Squashed commit of the following:

commit 162985aed01742ec19db2f5ba4c642d005cd905f
Merge: c7e7f701 72db0149
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Dec 15 16:44:39 2021 +0300

    Merge branch 'master' into 2644-reviselists

commit c7e7f701abd4fbbb4c8eec9b068f895b7ecf69da
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Dec 15 16:39:29 2021 +0300

    revise vetted lists, fix #2644
---
 client/src/helpers/filters/filters.json | 30 +++++++++++++++----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/client/src/helpers/filters/filters.json b/client/src/helpers/filters/filters.json
index 37b286bb..565cd74d 100644
--- a/client/src/helpers/filters/filters.json
+++ b/client/src/helpers/filters/filters.json
@@ -42,6 +42,12 @@
             "homepage": "https://someonewhocares.org/",
             "source": "https://someonewhocares.org/hosts/zero/hosts"
         },
+        "oisd": {
+            "name": "OISD Blocklist Basic",
+            "categoryId": "general",
+            "homepage": "https://oisd.nl/",
+            "source": "https://abp.oisd.nl/basic/"
+        },
         "game-console-adblock-list": {
             "name": "Game Console Adblock List",
             "categoryId": "general",
@@ -54,12 +60,6 @@
             "homepage": "https://github.com/Perflyst/PiHoleBlocklist",
             "source": "https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/SmartTV-AGH.txt"
         },
-        "windows-spy-blocker" : {
-            "name": "WindowsSpyBlocker - Hosts spy rules",
-            "categoryId": "general",
-            "homepage": "https://github.com/crazy-max/WindowsSpyBlocker",
-            "source": "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt"
-        },
         "nocoin-filter-list": {
             "name": "NoCoin Filter List",
             "categoryId": "security",
@@ -84,18 +84,18 @@
             "homepage": "https://gitlab.com/curben/urlhaus-filter",
             "source": "https://curben.gitlab.io/malware-filter/urlhaus-filter-agh-online.txt"
         },
+        "dandelion-sprouts-anti-malware-list": {
+            "name": "Dandelion Sprout's Anti-Malware List",
+            "categoryId": "security",
+            "homepage": "https://github.com/DandelionSprout/adfilt",
+            "source": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareAdGuardHome.txt"
+        },
         "NOR-dandelion-sprouts-nordiske-filtre": {
             "name": "NOR: Dandelion Sprouts nordiske filtre",
             "categoryId": "regional",
             "homepage": "https://github.com/DandelionSprout/adfilt",
             "source": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersAdGuardHome.txt"
         },
-        "TUR-nurcan-turk-ad-list": {
-            "name": "TUR: nurcan Türk ad-list",
-            "categoryId": "regional",
-            "homepage": "https://github.com/DandelionSprout/adfilt",
-            "source": "https://raw.githubusercontent.com/xorcan/hosts/master/xhosts.txt"
-        },
         "POL-polish-filters-for-pihole": {
             "name": "POL: Polish filters for Pi hole",
             "categoryId": "regional",
@@ -155,6 +155,12 @@
             "categoryId": "regional",
             "homepage": "https://forums.lanik.us/viewforum.php?f=100",
             "source": "https://easylist-downloads.adblockplus.org/easylistdutch.txt"
+        },
+        "windows-spy-blocker" : {
+            "name": "WindowsSpyBlocker - Hosts spy rules",
+            "categoryId": "other",
+            "homepage": "https://github.com/crazy-max/WindowsSpyBlocker",
+            "source": "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt"
         }
     }
 }