diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-05-19 13:39:29 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-05-19 13:39:29 -0500 |
| commit | e343b46ea041ce6a542b23100df2e9c11e262c75 (patch) | |
| tree | 7bd219409244d97e51ad58f800889c65f41837a0 /lib/pleroma/pagination.ex | |
| parent | a5bbebda588a54cb76d1a75239523db676980eb0 (diff) | |
| parent | 8e9f032f25251d910b59c55226d10a305bad3cba (diff) | |
| download | pleroma-e343b46ea041ce6a542b23100df2e9c11e262c75.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into instance-view-recompilationinstance-view-recompilation
Diffstat (limited to 'lib/pleroma/pagination.ex')
| -rw-r--r-- | lib/pleroma/pagination.ex | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/pleroma/pagination.ex b/lib/pleroma/pagination.ex index 0d24e1010..33e45a0eb 100644 --- a/lib/pleroma/pagination.ex +++ b/lib/pleroma/pagination.ex @@ -93,6 +93,7 @@ defmodule Pleroma.Pagination do max_id: :string, offset: :integer, limit: :integer, + skip_extra_order: :boolean, skip_order: :boolean } @@ -114,6 +115,8 @@ defmodule Pleroma.Pagination do defp restrict(query, :order, %{skip_order: true}, _), do: query + defp restrict(%{order_bys: [_ | _]} = query, :order, %{skip_extra_order: true}, _), do: query + defp restrict(query, :order, %{min_id: _}, table_binding) do order_by( query, |