projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'change/web-push-encryption-dep' into 'develop'
[akkoma]
/
lib
/
pleroma
/
activity.ex
diff --git
a/lib/pleroma/activity.ex
b/lib/pleroma/activity.ex
index b88f74f4717ff27f24b12da153f6f65def14ed23..4106feef6d5baac44bc62c422ad4d3df2d6e2980 100644
(file)
--- a/
lib/pleroma/activity.ex
+++ b/
lib/pleroma/activity.ex
@@
-362,11
+362,9
@@
defmodule Pleroma.Activity do
end
def restrict_deactivated_users(query) do
end
def restrict_deactivated_users(query) do
- deactivated_users =
- from(u in User.Query.build(%{deactivated: true}), select: u.ap_id)
- |> Repo.all()
+ deactivated_users_query = from(u in User.Query.build(%{deactivated: true}), select: u.ap_id)
-
Activity.Queries.exclude_authors(query, deactivated_users
)
+
from(activity in query, where: activity.actor not in subquery(deactivated_users_query)
)
end
defdelegate search(user, query, options \\ []), to: Pleroma.Activity.Search
end
defdelegate search(user, query, options \\ []), to: Pleroma.Activity.Search