X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fuser.ex;h=706aee2ffb8d6aa6eef91a9b3bfe7a509f1d3bf2;hb=34d85f8a5473fe0f85e8a8e9e8f58e40b3964ba4;hp=cebadc8ab0c8f830d0cb063242114deb5fd3faff;hpb=8cfaab8f04cae6fcc20a37cdb463ee0c93b71217;p=akkoma diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index cebadc8ab..706aee2ff 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -1143,7 +1143,7 @@ defmodule Pleroma.User do def blocks?(nil, _), do: false def blocks?(%User{} = user, %User{} = target) do - blocks_ap_id?(user, target) || + blocks_user?(user, target) || (!User.following?(user, target) && blocks_domain?(user, target)) end