projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request 'Update elixir versions' (#512) from norm/akkoma:update-elixir...
[akkoma]
/
lib
/
pleroma
/
pagination.ex
diff --git
a/lib/pleroma/pagination.ex
b/lib/pleroma/pagination.ex
index 4535ca7c5c2b65d3d68b9acf469996ccfec8da51..28e37933e2abfbaaaa2258c82b65f96f210cb0df 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-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
21
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
@@
-12,19
+12,23
@@
defmodule Pleroma.Pagination do
alias Pleroma.Repo
alias Pleroma.Repo
+ @type type :: :keyset | :offset
+
@default_limit 20
@default_limit 20
+ @max_limit 40
@page_keys ["max_id", "min_id", "limit", "since_id", "order"]
def page_keys, do: @page_keys
@page_keys ["max_id", "min_id", "limit", "since_id", "order"]
def page_keys, do: @page_keys
+ @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, 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
@@
-37,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)
@@
-45,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
@@
-57,8
+61,15
@@
defmodule Pleroma.Pagination do
|> Repo.all()
end
|> Repo.all()
end
+ @spec paginate(Ecto.Query.t(), map(), type(), atom() | nil) :: [Ecto.Schema.t()]
def paginate(query, options, method \\ :keyset, table_binding \\ nil)
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)
@@
-77,20
+88,15
@@
defmodule Pleroma.Pagination do
defp cast_params(params) do
param_types = %{
defp cast_params(params) do
param_types = %{
- min_id: :string,
- since_id: :string,
- max_id: :string,
+ min_id:
params[:id_type] ||
:string,
+ since_id:
params[:id_type] ||
:string,
+ max_id:
params[:id_type] ||
:string,
offset: :integer,
limit: :integer,
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
@@
-109,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,
@@
-130,7
+138,11
@@
defmodule Pleroma.Pagination do
end
defp restrict(query, :limit, options, _table_binding) do
end
defp restrict(query, :limit, options, _table_binding) do
- limit = Map.get(options, :limit, @default_limit)
+ limit =
+ case Map.get(options, :limit, @default_limit) do
+ limit when limit < @max_limit -> limit
+ _ -> @max_limit
+ end
query
|> limit(^limit)
query
|> limit(^limit)