From facf72f774b2f7cf33397951b16d1aeabfdeeedb Mon Sep 17 00:00:00 2001
From: KizunaH <63988538+KizunaH@users.noreply.github.com>
Date: Wed, 26 Aug 2020 00:22:16 +0700
Subject: [PATCH 1/2] * Update URLs for default filters

---
 client/src/helpers/filters/filters.json | 8 ++++----
 home/filter.go                          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/src/helpers/filters/filters.json b/client/src/helpers/filters/filters.json
index e5f319a9..29b60f43 100644
--- a/client/src/helpers/filters/filters.json
+++ b/client/src/helpers/filters/filters.json
@@ -25,10 +25,10 @@
             "source": "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt"
         },
         "adaway-default-blocklist": {
-            "name": "AdAway default blocklist",
+            "name": "AdAway Default Blocklist",
             "categoryId": "general",
             "homepage": "https://github.com/AdAway/adaway.github.io/",
-            "source": "https://raw.githubusercontent.com/AdAway/adaway.github.io/master/hosts.txt"
+            "source": "https://adaway.org/hosts.txt"
         },
         "peter-lowe-list": {
             "name": "Peter Lowe's List",
@@ -153,8 +153,8 @@
         "BarbBlock": {
             "name": "BarbBlock",
             "categoryId": "other",
-            "homepage": "https://ssl.bblck.me/",
-            "source": "https://ssl.bblck.me/blacklists/ublock-origin.txt"
+            "homepage": "https://github.com/paulgb/BarbBlock/",
+            "source": "https://paulgb.github.io/BarbBlock/blacklists/hosts-file.txt"
         }
     }
 }
diff --git a/home/filter.go b/home/filter.go
index 18bb84e4..f21522df 100644
--- a/home/filter.go
+++ b/home/filter.go
@@ -60,7 +60,7 @@ func (f *Filtering) Close() {
 func defaultFilters() []filter {
 	return []filter{
 		{Filter: dnsfilter.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard DNS filter"},
-		{Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://github.com/AdAway/adaway.github.io/blob/master/hosts.txt", Name: "AdAway"},
+		{Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway Default Blocklist"},
 		{Filter: dnsfilter.Filter{ID: 4}, Enabled: false, URL: "https://www.malwaredomainlist.com/hostslist/hosts.txt", Name: "MalwareDomainList.com Hosts List"},
 	}
 }

From f04acaf92e59b0249912b8e6464d1f9c2f9ccc68 Mon Sep 17 00:00:00 2001
From: Simon Zolin <s.zolin@adguard.com>
Date: Thu, 27 Aug 2020 15:16:38 +0300
Subject: [PATCH 2/2] * Makefile: run 'npm ci' for 'lint-js' target

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7e01c9ad..d0e6266c 100644
--- a/Makefile
+++ b/Makefile
@@ -146,7 +146,7 @@ docker:
 
 lint: lint-js lint-go
 
-lint-js:
+lint-js: dependencies
 	@echo Running js linter
 	npm --prefix client run lint