moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change query order in fetch_activities_for_context_query to make poll vote exclusion work

This commit is contained in:
rinpatch 2019-06-03 10:58:37 +03:00
parent baefb97dc4
commit 5bd41fef8b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/activity_pub/activity_pub.ex
View File

@ -489,7 +489,6 @@ defp fetch_activities_for_context_query(context, opts) do
from(activity in Activity) from(activity in Activity)
|> maybe_preload_objects(opts) |> maybe_preload_objects(opts)
|> exclude_poll_votes(opts)
|> restrict_blocked(opts) |> restrict_blocked(opts)
|> restrict_recipients(recipients, opts["user"]) |> restrict_recipients(recipients, opts["user"])
|> where( |> where(
@ -502,6 +501,7 @@ defp fetch_activities_for_context_query(context, opts) do
^context ^context
) )
) )
|> exclude_poll_votes(opts)
|> order_by([activity], desc: activity.id) |> order_by([activity], desc: activity.id)
end end