Change query order in fetch_activities_for_context_query to make poll vote exclusion work

2019-06-03 10:58:37 +03:00 · 2019-06-03 10:58:37 +03:00 · 5bd41fef8b
commit 5bd41fef8b
parent baefb97dc4
1 changed files with 1 additions and 1 deletions
--- 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