projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix aliases sorting
[akkoma]
/
lib
/
pleroma
/
pagination.ex
diff --git
a/lib/pleroma/pagination.ex
b/lib/pleroma/pagination.ex
index 0d24e10101755f6c6fb2e4eb8954b1f8bf616e43..33e45a0eb45b8b83a3a00fae90f22dd562c94ed1 100644
(file)
--- 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,
max_id: :string,
offset: :integer,
limit: :integer,
+ skip_extra_order: :boolean,
skip_order: :boolean
}
skip_order: :boolean
}
@@
-114,6
+115,8
@@
defmodule Pleroma.Pagination do
defp restrict(query, :order, %{skip_order: true}, _), do: query
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,
defp restrict(query, :order, %{min_id: _}, table_binding) do
order_by(
query,