diff options
| author | FloatingGhost <hannah@coffee-and-dreams.uk> | 2022-10-10 15:55:58 +0100 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2022-11-12 17:52:28 -0500 |
| commit | 4d321be05c0aa34921f96f38c17dd611691f3c44 (patch) | |
| tree | 2c643b6f61a400fe789e89d18641d96412f56724 /lib | |
| parent | 3d1828f43bd5ca59424616d2c1d0462bf75bcf20 (diff) | |
| download | pleroma-4d321be05c0aa34921f96f38c17dd611691f3c44.tar.gz pleroma-4d321be05c0aa34921f96f38c17dd611691f3c44.zip | |
Extract deactivated users query to a join
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/activity.ex | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex index ebfd4ed45..3556aaf9e 100644 --- a/lib/pleroma/activity.ex +++ b/lib/pleroma/activity.ex @@ -361,9 +361,11 @@ defmodule Pleroma.Activity do end def restrict_deactivated_users(query) do - deactivated_users_query = from(u in User.Query.build(%{deactivated: true}), select: u.ap_id) - - from(activity in query, where: activity.actor not in subquery(deactivated_users_query)) + query + |> join(:inner, [activity], user in User, + as: :user, + on: activity.actor == user.ap_id and user.is_active == true + ) end defdelegate search(user, query, options \\ []), to: Pleroma.Activity.Search |