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

Pull request: dnsfilter: restore enum value

Browse Source 
Merge in DNS/adguard-home from fix-filter-names to master

Squashed commit of the following:

commit 620d80df12878a1b236abb26cd2a331df998a3d5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Dec 14 20:02:41 2020 +0300

    dnsfilter: restore enum value
This commit is contained in:
Ainar Garipov 2020-12-14 20:12:57 +03:00
parent 0cddf4c11d
commit a2d39c810a
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.githooks/pre-commit
View File

@ -1,18 +1,13 @@
#!/bin/bash
set -e;
#!/bin/sh
found=0
git diff --cached --name-only | grep -q '.js$' && found=1
if [ $found == 1 ]; then
npm --prefix client run lint || exit 1
npm run test --prefix client || exit 1
set -e -f -u
if [ "$(git diff --cached --name-only '*.js')" ]
then
make js-lint js-test
fi
found=0
git diff --cached --name-only | grep -q '.go$' && found=1
if [ $found == 1 ]; then
make go-lint || exit 1
go test ./... || exit 1
if [ "$(git diff --cached --name-only '*.go')" ]
then
make go-lint go-test
fi
exit 0;

3
internal/dnsfilter/dnsfilter.go
View File

@ -129,6 +129,9 @@ const (
NotFilteredNotFound Reason = iota
// NotFilteredWhiteList - the host is explicitly whitelisted
NotFilteredWhiteList
// NotFilteredError is return where there was an error during
// checking. Reserved, currently unused.
NotFilteredError
// reasons for filtering