a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge: * Update URLs for default filters 

* commit 'f04acaf92e59b0249912b8e6464d1f9c2f9ccc68':
  * Makefile: run 'npm ci' for 'lint-js' target
  * Update URLs for default filters
This commit is contained in:
Simon Zolin 2020-08-28 12:48:27 +03:00
parent c2ba8e4c09 f04acaf92e
commit c822297065
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -146,7 +146,7 @@ docker:
lint: lint-js lint-go lint: lint-js lint-go
lint-js: lint-js: dependencies
@echo Running js linter @echo Running js linter
npm --prefix client run lint npm --prefix client run lint

8
client/src/helpers/filters/filters.json
View File

@ -25,10 +25,10 @@
"source": "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt" "source": "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt"
}, },
"adaway-default-blocklist": { "adaway-default-blocklist": {
"name": "AdAway default blocklist", "name": "AdAway Default Blocklist",
"categoryId": "general", "categoryId": "general",
"homepage": "https://github.com/AdAway/adaway.github.io/", "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": { "peter-lowe-list": {
"name": "Peter Lowe's List", "name": "Peter Lowe's List",
@ -153,8 +153,8 @@
"BarbBlock": { "BarbBlock": {
"name": "BarbBlock", "name": "BarbBlock",
"categoryId": "other", "categoryId": "other",
"homepage": "https://ssl.bblck.me/", "homepage": "https://github.com/paulgb/BarbBlock/",
"source": "https://ssl.bblck.me/blacklists/ublock-origin.txt" "source": "https://paulgb.github.io/BarbBlock/blacklists/hosts-file.txt"
} }
} }
} }

2
home/filter.go
View File

@ -60,7 +60,7 @@ func (f *Filtering) Close() {
func defaultFilters() []filter { func defaultFilters() []filter {
return []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: 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"}, {Filter: dnsfilter.Filter{ID: 4}, Enabled: false, URL: "https://www.malwaredomainlist.com/hostslist/hosts.txt", Name: "MalwareDomainList.com Hosts List"},
} }
} }