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 d43a96cd2ee4bcfef30d9570722c59e7fd730b89..33e45a0eb45b8b83a3a00fae90f22dd562c94ed1 100644
(file)
--- a/
lib/pleroma/pagination.ex
+++ b/
lib/pleroma/pagination.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Pagination do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Pagination do
@@
-23,12
+23,12
@@
defmodule Pleroma.Pagination do
@spec fetch_paginated(Ecto.Query.t(), map(), type(), atom() | nil) :: [Ecto.Schema.t()]
def fetch_paginated(query, params, type \\ :keyset, table_binding \\ nil)
@spec fetch_paginated(Ecto.Query.t(), map(), type(), atom() | nil) :: [Ecto.Schema.t()]
def fetch_paginated(query, params, type \\ :keyset, table_binding \\ nil)
- def fetch_paginated(query, %{
"total" =>
true} = params, :keyset, table_binding) do
+ def fetch_paginated(query, %{
total:
true} = params, :keyset, table_binding) do
total = Repo.aggregate(query, :count, :id)
%{
total: total,
total = Repo.aggregate(query, :count, :id)
%{
total: total,
- items: fetch_paginated(query, Map.drop(params, [
"total"
]), :keyset, table_binding)
+ items: fetch_paginated(query, Map.drop(params, [
:total
]), :keyset, table_binding)
}
end
}
end
@@
-41,7
+41,7
@@
defmodule Pleroma.Pagination do
|> enforce_order(options)
end
|> enforce_order(options)
end
- def fetch_paginated(query, %{
"total" =>
true} = params, :offset, table_binding) do
+ def fetch_paginated(query, %{
total:
true} = params, :offset, table_binding) do
total =
query
|> Ecto.Query.exclude(:left_join)
total =
query
|> Ecto.Query.exclude(:left_join)
@@
-49,7
+49,7
@@
defmodule Pleroma.Pagination do
%{
total: total,
%{
total: total,
- items: fetch_paginated(query, Map.drop(params, [
"total"
]), :offset, table_binding)
+ items: fetch_paginated(query, Map.drop(params, [
:total
]), :offset, table_binding)
}
end
}
end
@@
-64,6
+64,12
@@
defmodule Pleroma.Pagination do
@spec paginate(Ecto.Query.t(), map(), type(), atom() | nil) :: [Ecto.Schema.t()]
def paginate(query, options, method \\ :keyset, table_binding \\ nil)
@spec paginate(Ecto.Query.t(), map(), type(), atom() | nil) :: [Ecto.Schema.t()]
def paginate(query, options, method \\ :keyset, table_binding \\ nil)
+ def paginate(list, options, _method, _table_binding) when is_list(list) do
+ offset = options[:offset] || 0
+ limit = options[:limit] || 0
+ Enum.slice(list, offset, limit)
+ end
+
def paginate(query, options, :keyset, table_binding) do
query
|> restrict(:min_id, options, table_binding)
def paginate(query, options, :keyset, table_binding) do
query
|> restrict(:min_id, options, table_binding)
@@
-87,15
+93,10
@@
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
}
- params =
- Enum.reduce(params, %{}, fn
- {key, _value}, acc when is_atom(key) -> Map.drop(acc, [key])
- {key, value}, acc -> Map.put(acc, key, value)
- end)
-
changeset = cast({%{}, param_types}, params, Map.keys(param_types))
changeset.changes
end
changeset = cast({%{}, param_types}, params, Map.keys(param_types))
changeset.changes
end
@@
-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,