projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'test-timeout' into 'develop'
[akkoma]
/
lib
/
pleroma
/
user.ex
diff --git
a/lib/pleroma/user.ex
b/lib/pleroma/user.ex
index cebadc8ab0c8f830d0cb063242114deb5fd3faff..706aee2ffb8d6aa6eef91a9b3bfe7a509f1d3bf2 100644
(file)
--- 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