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

make follows take precedence over domain blocks

Browse source
This commit is contained in:
Sadposter 2019-11-28 10:38:38 +00:00
commit fa97eddf8a
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/user.ex
View file

@ -1020,7 +1020,7 @@ defmodule Pleroma.User do
do: Enum.member?(user.muted_notifications, ap_id)
def blocks?(%User{} = user, %User{} = target) do
blocks_ap_id?(user, target) || blocks_domain?(user, target)
blocks_ap_id?(user, target) || (!User.following?(user, target) && blocks_domain?(user, target))
end
def blocks?(nil, _), do: false