mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pull request: 3564 9gag 

Updates #3564.

Squashed commit of the following:

commit dafb26d9c0a85f30fb06627411f653e160d38cc8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Sep 8 12:13:43 2021 +0300

    client: fix 9gag spelling

commit a6aa44853061839e427836fe2daf69605cc90d33
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Sep 8 12:07:59 2021 +0300

    all: chlog

commit d46b17c079584946b857b63296a11acd6d524346
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Sep 8 12:01:41 2021 +0300

    filtering: fix 9gag blocked service
This commit is contained in:
Ainar Garipov 2021-09-08 12:24:12 +03:00
parent b77ceaaf55
commit eeda06f9b0
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -110,6 +110,7 @@ In this release, the schema version has changed from 10 to 12.
### Fixed ### Fixed
- 9GAG blocking ([#3564]).
- DHCP now follows RFCs more closely ([#3443]). - DHCP now follows RFCs more closely ([#3443]).
- Occasional panics when reading old statistics databases ([#3506]). - Occasional panics when reading old statistics databases ([#3506]).
- `reload` service action on macOS and FreeBSD ([#3457]). - `reload` service action on macOS and FreeBSD ([#3457]).
@ -182,6 +183,7 @@ In this release, the schema version has changed from 10 to 12.
[#3450]: https://github.com/AdguardTeam/AdGuardHome/issues/3450 [#3450]: https://github.com/AdguardTeam/AdGuardHome/issues/3450
[#3457]: https://github.com/AdguardTeam/AdGuardHome/issues/3457 [#3457]: https://github.com/AdguardTeam/AdGuardHome/issues/3457
[#3506]: https://github.com/AdguardTeam/AdGuardHome/issues/3506 [#3506]: https://github.com/AdguardTeam/AdGuardHome/issues/3506
[#3564]: https://github.com/AdguardTeam/AdGuardHome/issues/3564

2
client/src/helpers/constants.js
View File

@ -202,7 +202,7 @@ export const FILTERS_URLS = {
export const SERVICES = [ export const SERVICES = [
{ {
id: '9gag', id: '9gag',
name: '9Gag', name: '9GAG',
}, },
{ {
id: 'amazon', id: 'amazon',

2
internal/filtering/blocked.go
View File

@ -197,7 +197,7 @@ var serviceRulesArray = []svc{
}}, }},
{"9gag", []string{ {"9gag", []string{
"||9cache.com^", "||9cache.com^",
"||gag.com^", "||9gag.com^",
}}, }},
{"telegram", []string{ {"telegram", []string{
"||t.me^", "||t.me^",