daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 2499-rewrites-3

Browse Source
This commit is contained in:
Dimitry Kolyshev
2022-12-12 12:27:15 +07:00
parent 55a0dec144 8d453e75a4
commit 2d29455d7f
44 changed files with 389 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
internal/filtering/servicelist.go
View File

@@ -251,14 +251,12 @@ var blockedServices = []blockedService{{
Name: "Mastodon",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 512 512\"><path d=\"M433 179.11c0-97.2-63.71-125.7-63.71-125.7-62.52-28.7-228.56-28.4-290.48 0 0 0-63.72 28.5-63.72 125.7 0 115.7-6.6 259.4 105.63 289.1 40.51 10.7 75.32 13 103.33 11.4 50.81-2.8 79.32-18.1 79.32-18.1l-1.7-36.9s-36.31 11.4-77.12 10.1c-40.41-1.4-83-4.4-89.63-54a102.54 102.54 0 0 1-.9-13.9c85.63 20.9 158.65 9.1 178.75 6.7 56.12-6.7 105-41.3 111.23-72.9 9.8-49.8 9-121.5 9-121.5zm-75.12 125.2h-46.63v-114.2c0-49.7-64-51.6-64 6.9v62.5h-46.33V197c0-58.5-64-56.6-64-6.9v114.2H90.19c0-122.1-5.2-147.9 18.41-175 25.9-28.9 79.82-30.8 103.83 6.1l11.6 19.5 11.6-19.5c24.11-37.1 78.12-34.8 103.83-6.1 23.71 27.3 18.4 53 18.4 175z\"/></svg>"),
Rules: []string{
"||aus.social^",
"||awscommunity.social^",
"||colorid.es^",
"||dizl.de^",
"||dju.social^",
"||dresden.network^",
"||fedibird.com^",
"||fosstodon.org^",
"||freiburg.social^",
"||glasgow.social^",
"||h4.io^",
"||hachyderm.io^",
@@ -269,32 +267,30 @@ var blockedServices = []blockedService{{
"||ieji.de^",
"||indieweb.social^",
"||ioc.exchange^",
"||kfem.cat^",
"||kolektiva.social^",
"||kurry.social^",
"||libretooth.gr^",
"||livellosegreto.it^",
"||lor.sh^",
"||m.cmx.im^",
"||mast.dragon-fly.club^",
"||mas.to^",
"||masto.ai^",
"||masto.es^",
"||masto.nobigtech.es^",
"||masto.pt^",
"||mastodon-belgium.be^",
"||mastodon.au^",
"||mastodon.bida.im^",
"||mastodon.com.tr^",
"||mastodon.eus^",
"||mastodon.ie^",
"||mastodon.iriseden.eu^",
"||mastodon.lol^",
"||mastodon.nl^",
"||mastodon.nu^",
"||mastodon.nz^",
"||mastodon.online^",
"||mastodon.scot^",
"||mastodon.sdf.org^",
"||mastodon.se^",
"||mastodon.social^",
"||mastodon.top^",
"||mastodon.uno^",
"||mastodon.world^",
"||mastodon.zaclys.com^",
@@ -304,6 +300,8 @@ var blockedServices = []blockedService{{
"||mastodontti.fi^",
"||mastouille.fr^",
"||mathstodon.xyz^",
"||meow.social^",
"||metalhead.club^",
"||mindly.social^",
"||mstdn.ca^",
"||mstdn.jp^",
@@ -311,14 +309,13 @@ var blockedServices = []blockedService{{
"||mstdn.social^",
"||muenchen.social^",
"||muenster.im^",
"||nerdculture.de^",
"||newsie.social^",
"||noc.social^",
"||norden.social^",
"||nrw.social^",
"||o3o.ca^",
"||ohai.social^",
"||oslo.town^",
"||pettingzoo.co^",
"||pewtix.com^",
"||phpc.social^",
"||piaille.fr^",
@@ -329,18 +326,20 @@ var blockedServices = []blockedService{{
"||ruby.social^",
"||ruhr.social^",
"||sfba.social^",
"||snabelen.no^",
"||socel.net^",
"||social.anoxinon.de^",
"||social.cologne^",
"||social.dev-wiki.de^",
"||social.linux.pizza^",
"||social.politicaconciencia.org^",
"||social.vivaldi.net^",
"||sociale.network^",
"||sself.co^",
"||sueden.social^",
"||techhub.social^",
"||theblower.au^",
"||tkz.one^",
"||toot.aquilenet.fr^",
"||toot.community^",
"||toot.funami.tech^",
"||toot.wales^",
"||troet.cafe^",
@@ -350,6 +349,7 @@ var blockedServices = []blockedService{{
"||urbanists.social^",
"||vocalodon.net^",
"||wxw.moe^",
"||xarxa.cloud^",
},
}, {
ID: "minecraft",