aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-06-03 10:58:37 +0300
committerrinpatch <rinpatch@sdf.org>2019-06-03 10:58:37 +0300
commit5bd41fef8b5aeff53ed6b096e04507d51c93a83a (patch)
tree1186b75e6bdbe8a23a32d348b6e3ff8e43f022a0 /lib
parentbaefb97dc4f4435027f6e23e77433e4bfaf0dcd1 (diff)
downloadpleroma-5bd41fef8b5aeff53ed6b096e04507d51c93a83a.tar.gz
Change query order in fetch_activities_for_context_query to make poll vote exclusion work
Diffstat (limited to 'lib')
-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 d494d5cd1..45feae25a 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -489,7 +489,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
from(activity in Activity)
|> maybe_preload_objects(opts)
- |> exclude_poll_votes(opts)
|> restrict_blocked(opts)
|> restrict_recipients(recipients, opts["user"])
|> where(
@@ -502,6 +501,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
^context
)
)
+ |> exclude_poll_votes(opts)
|> order_by([activity], desc: activity.id)
end