aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
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/web
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/web')
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index eeb826814..d23ec66ac 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -796,7 +796,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
)
unless opts["skip_preload"] do
- from([thread_mute: tm] in query, where: is_nil(tm))
+ from([thread_mute: tm] in query, where: is_nil(tm.user_id))
else
query
end