diff options
| author | Sadposter <hannah+pleroma@coffee-and-dreams.uk> | 2019-11-28 10:38:38 +0000 |
|---|---|---|
| committer | Sadposter <hannah+pleroma@coffee-and-dreams.uk> | 2019-11-28 10:38:38 +0000 |
| commit | fa97eddf8a7e5c3a0ed51eff562d6592bd478b95 (patch) | |
| tree | 5c68526915628e7100d253b53f137d866ae1d1be /lib/pleroma | |
| parent | cb656938ca85f44efc6d5a4d4c21050de0fca9f5 (diff) | |
| download | pleroma-fa97eddf8a7e5c3a0ed51eff562d6592bd478b95.tar.gz | |
make follows take precedence over domain blocks
Diffstat (limited to 'lib/pleroma')
| -rw-r--r-- | lib/pleroma/user.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index b18a4c6a5..6a97e1928 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -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 |