mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2026-02-15 17:16:57 +00:00
Merge branch 'order-favourites-reblogs' into 'develop'
Order favourites and reblogs list from newest to oldest See merge request pleroma/pleroma!4399
This commit is contained in:
commit
c06fcc7f5d
3 changed files with 19 additions and 5 deletions
|
|
@ -490,6 +490,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do
|
|||
users =
|
||||
User
|
||||
|> Ecto.Query.where([u], u.ap_id in ^likes)
|
||||
|> Ecto.Query.order_by([u], fragment("array_position(?, ?)", ^likes, u.ap_id))
|
||||
|> Repo.all()
|
||||
|> Enum.filter(&(not User.blocks?(user, &1)))
|
||||
|
||||
|
|
@ -525,6 +526,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do
|
|||
users =
|
||||
User
|
||||
|> Ecto.Query.where([u], u.ap_id in ^announces)
|
||||
|> Ecto.Query.order_by([u], fragment("array_position(?, ?)", ^announces, u.ap_id))
|
||||
|> Repo.all()
|
||||
|> Enum.filter(&(not User.blocks?(user, &1)))
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue