projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modify SQL to include followed-but-domain-blocked activities
[akkoma]
/
lib
/
pleroma
/
user.ex
diff --git
a/lib/pleroma/user.ex
b/lib/pleroma/user.ex
index b18a4c6a5099a4d381ec72e51d78033323eb474d..601aa9cf04963c50e2d448f3323850c903dd7954 100644
(file)
--- a/
lib/pleroma/user.ex
+++ b/
lib/pleroma/user.ex
@@
-762,6
+762,13
@@
defmodule Pleroma.User do
|> Repo.all()
end
|> Repo.all()
end
+ def get_friends_ap_ids(user) do
+ user
+ |> get_friends_query(nil)
+ |> select([u], u.ap_id)
+ |> Repo.all()
+ end
+
def get_friends_ids(user, page \\ nil) do
user
|> get_friends_query(page)
def get_friends_ids(user, page \\ nil) do
user
|> get_friends_query(page)
@@
-1020,7
+1027,8
@@
defmodule Pleroma.User do
do: Enum.member?(user.muted_notifications, ap_id)
def blocks?(%User{} = user, %User{} = target) 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
end
def blocks?(nil, _), do: false