X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Factivity.ex;h=4106feef6d5baac44bc62c422ad4d3df2d6e2980;hb=a3094b64df344622f1bcb03091ef2ff4dce6da82;hp=b88f74f4717ff27f24b12da153f6f65def14ed23;hpb=8286ceb46522069607cc0a0dec864022606bf19d;p=akkoma diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex index b88f74f47..4106feef6 100644 --- 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 - 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