aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/activity.ex
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-09-06 23:25:30 +0000
committerkaniini <ariadne@dereferenced.org>2019-09-06 23:25:30 +0000
commitc45013df8e53334bcc1afb8cd1df673c290037ee (patch)
treedb1fc156e659cfcb5ec3ba9502ac9f2fc5ee6959 /lib/pleroma/activity.ex
parent130bc8e0d553eb918685edf2b1fdab7e69021446 (diff)
parent40a61532cadbac8b196917c6f5843c3f6cd7e78b (diff)
downloadpleroma-c45013df8e53334bcc1afb8cd1df673c290037ee.tar.gz
Merge branch 'chore/query-optimization' into 'develop'
chore: query optimization Closes #1224 See merge request pleroma/pleroma!1640
Diffstat (limited to 'lib/pleroma/activity.ex')
-rw-r--r--lib/pleroma/activity.ex10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index 2d4e9da0c..a7844c36b 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -362,12 +362,12 @@ 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()
+
from(activity in query,
- where:
- fragment(
- "? not in (SELECT ap_id FROM users WHERE info->'deactivated' @> 'true')",
- activity.actor
- )
+ where: activity.actor not in ^deactivated_users
)
end