diff options
| author | lain <lain@soykaf.club> | 2020-05-27 08:02:00 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-27 08:02:00 +0000 |
| commit | b9e2678b9e1223f354d3a00a8c31b50807d8da62 (patch) | |
| tree | 74b7a405329349ec9ef5454afa1f30d833780e04 | |
| parent | cf139b06a3761983f877ac0dd5839689485cae94 (diff) | |
| parent | 7e13200869a41647f25bdcf416ecd36ff09219bc (diff) | |
| download | pleroma-b9e2678b9e1223f354d3a00a8c31b50807d8da62.tar.gz | |
Merge branch 'fav-speedup' into 'develop'
ActivityPub: Change ordering to `nulls last` in favorites query
See merge request pleroma/pleroma!2594
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 2 |
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 0fe71694a..b8a2873d8 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -1158,7 +1158,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do |> Activity.with_joined_object() |> Object.with_joined_activity() |> select([_like, object, activity], %{activity | object: object}) - |> order_by([like, _, _], desc: like.id) + |> order_by([like, _, _], desc_nulls_last: like.id) |> Pagination.fetch_paginated( Map.merge(params, %{"skip_order" => true}), pagination, |