projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'emoji-loader-fix' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
activity_pub.ex
diff --git
a/lib/pleroma/web/activity_pub/activity_pub.ex
b/lib/pleroma/web/activity_pub/activity_pub.ex
index d494d5cd1ee628b2de1dc32e506e3a2b57e97f74..45feae25a720fba541480753dd9ef97dd95c7e59 100644
(file)
--- 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)
from(activity in Activity)
|> maybe_preload_objects(opts)
- |> exclude_poll_votes(opts)
|> restrict_blocked(opts)
|> restrict_recipients(recipients, opts["user"])
|> where(
|> restrict_blocked(opts)
|> restrict_recipients(recipients, opts["user"])
|> where(
@@
-502,6
+501,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
^context
)
)
^context
)
)
+ |> exclude_poll_votes(opts)
|> order_by([activity], desc: activity.id)
end
|> order_by([activity], desc: activity.id)
end