hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Feature/1087 wildcard option for blocks

Browse source
This commit is contained in:
Alexander Strizhakov 2019-07-22 14:33:58 +00:00 • committed by kaniini
commit b70e659304
7 changed files with 244 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/pleroma/user.ex
View file

@ -873,10 +873,13 @@ defmodule Pleroma.User do
def blocks?(%User{info: info} = _user, %{ap_id: ap_id}) do
blocks = info.blocks
domain_blocks = info.domain_blocks
domain_blocks = Pleroma.Web.ActivityPub.MRF.subdomains_regex(info.domain_blocks)
%{host: host} = URI.parse(ap_id)
Enum.member?(blocks, ap_id) || Enum.any?(domain_blocks, &(&1 == host))
Enum.member?(blocks, ap_id) ||
Pleroma.Web.ActivityPub.MRF.subdomain_match?(domain_blocks, host)
end
def subscribed_to?(user, %{ap_id: ap_id}) do