diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-05-28 13:38:44 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-05-28 13:38:44 -0500 |
| commit | 05b47aacd25a86ba6dfcdd6577c6c558229c8e95 (patch) | |
| tree | e4ecd6498fc64a78bf8d92c2ca6e8f8edc0fbcfe /lib/pleroma/pagination.ex | |
| parent | 9b0b0842ce2b0b9a870f57e16025160855aa4c11 (diff) | |
| parent | 7ad87571bdcd39959280d15f5bfe4175e04c442c (diff) | |
| download | pleroma-endpoint-url.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into endpoint-urlendpoint-url
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, |