Make deactivated user check into a subquery

Fixes #2792
This commit is contained in:
FloatingGhost 2021-12-06 11:44:17 +00:00
commit cd8bdbc761
2 changed files with 17 additions and 3 deletions

View file

@ -362,11 +362,10 @@ defmodule Pleroma.Activity do
end
def restrict_deactivated_users(query) do
deactivated_users =
deactivated_users_query =
from(u in User.Query.build(%{deactivated: true}), select: u.ap_id)
|> Repo.all()
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