From ed0f457b7d8501d2dc79d1c8261d38c5ce538ade Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 26 Mar 2020 21:26:05 +0100 Subject: [PATCH] Update blocked_services.go Update README.md Trying to fix some Travis comma complaints Update README.md Update blocked_services.go Following GolangCIbot's spacing suggestion (Indentation spacing is pretty complicated sometimes.) Co-Authored-By: Bot from GolangCI <42910462+golangcibot@users.noreply.github.com> --- README.md | 2 ++ dnsfilter/blocked_services.go | 28 ++++++++++++++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6e06afa6..a4f1188e 100644 --- a/README.md +++ b/README.md @@ -226,3 +226,5 @@ This software wouldn't have been possible without: You might have seen that [CoreDNS](https://coredns.io) was mentioned here before — we've stopped using it in AdGuardHome. While we still use it on our servers for [AdGuard DNS](https://adguard.com/adguard-dns/overview.html) service, it seemed like an overkill for Home as it impeded with Home features that we plan to implement. For a full list of all node.js packages in use, please take a look at [client/package.json](https://github.com/AdguardTeam/AdGuardHome/blob/master/client/package.json) file. + +For info on which exact domains that are blocked by the *Blocked services* function, it can be found at [dnsfilter/blocked_services.go](https://github.com/AdguardTeam/AdGuardHome/blob/master/dnsfilter/blocked_services.go) diff --git a/dnsfilter/blocked_services.go b/dnsfilter/blocked_services.go index 4969b2d9..f11eed5a 100644 --- a/dnsfilter/blocked_services.go +++ b/dnsfilter/blocked_services.go @@ -20,19 +20,36 @@ type svc struct { // client/src/components/ui/Icons.js var serviceRulesArray = []svc{ {"whatsapp", []string{"||whatsapp.net^", "||whatsapp.com^"}}, - {"facebook", []string{"||facebook.com^", "||facebook.net^", "||fbcdn.net^", "||fb.me^", "||fb.com^", "||fbsbx.com^", "||messenger.com^"}}, + {"facebook", []string{ + "||facebook.com^", + "||facebook.net^", + "||fbcdn.net^", + "||fb.me^", + "||fb.com^", + "||fbsbx.com^", + "||messenger.com^", + "||facebookcorewwwi.onion^", + "||fbcdn.com^", + }}, {"twitter", []string{"||twitter.com^", "||t.co^", "||twimg.com^"}}, - {"youtube", []string{"||youtube.com^", "||ytimg.com^", "||youtu.be^", "||googlevideo.com^", "||youtubei.googleapis.com^"}}, + {"youtube", []string{ + "||youtube.com^", + "||ytimg.com^", + "||youtu.be^", + "||googlevideo.com^", + "||youtubei.googleapis.com^", + "||youtube-nocookie.com^", + }}, {"twitch", []string{"||twitch.tv^", "||ttvnw.net^"}}, {"netflix", []string{"||nflxext.com^", "||netflix.com^"}}, {"instagram", []string{"||instagram.com^", "||cdninstagram.com^"}}, {"snapchat", []string{"||snapchat.com^", "||sc-cdn.net^", "||impala-media-production.s3.amazonaws.com^"}}, - {"discord", []string{"||discord.gg^", "||discordapp.net^", "||discordapp.com^"}}, + {"discord", []string{"||discord.gg^", "||discordapp.net^", "||discordapp.com^", "||discord.media^"}}, {"ok", []string{"||ok.ru^"}}, {"skype", []string{"||skype.com^"}}, {"vk", []string{"||vk.com^"}}, {"origin", []string{"||origin.com^", "||signin.ea.com^", "||accounts.ea.com^"}}, - {"steam", []string{"||steam.com^"}}, + {"steam", []string{"||steam.com^", "||steampowered.com^"}}, {"epic_games", []string{"||epicgames.com^"}}, {"reddit", []string{"||reddit.com^", "||redditstatic.com^", "||redditmedia.com^", "||redd.it^"}}, {"mail_ru", []string{"||mail.ru^"}}, @@ -49,6 +66,8 @@ var serviceRulesArray = []svc{ "||cloudflare.cn^", "||one.one^", "||warp.plus^", + "||1.1.1.1^", + "||dns4torpnlfs2ifuz2s2yf3fc7rdmsbhm6rw75euj35pac6ap25zgqad.onion^", }}, {"amazon", []string{ "||amazon.com^", @@ -114,6 +133,7 @@ var serviceRulesArray = []svc{ "||ixigua.com^", "||muscdn.com^", "||bytedance.map.fastly.net^", + "||douyin.com^", }}, }