squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ControllerHelper: Always return id field.

Browse Source
This commit is contained in:
lain 2020-06-13 13:12:43 +02:00
parent 4b865bba10
commit 1d625c29a0
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/pleroma/web/controller_helper.ex
View File

@ -65,21 +65,11 @@ defmodule Pleroma.Web.ControllerHelper do
|> Map.merge(extra_params) |> Map.merge(extra_params)
|> Map.drop(@id_keys) |> Map.drop(@id_keys)
fields = %{ %{
"next" => current_url(conn, Map.put(params, :max_id, max_id)), "next" => current_url(conn, Map.put(params, :max_id, max_id)),
"prev" => current_url(conn, Map.put(params, :min_id, min_id)) "prev" => current_url(conn, Map.put(params, :min_id, min_id)),
"id" => current_url(conn)
} }
# Generating an `id` without already present pagination keys would
# need a query-restriction with an `q.id >= ^id` or `q.id <= ^id`
# instead of the `q.id > ^min_id` and `q.id < ^max_id`.
# This is because we only have ids present inside of the page, while
# `min_id`, `since_id` and `max_id` requires to know one outside of it.
if Map.take(conn.params, @id_keys) != %{} do
Map.put(fields, "id", current_url(conn))
else
fields
end
end end
def get_pagination_fields(conn, activities, extra_params \\ %{}) do def get_pagination_fields(conn, activities, extra_params \\ %{}) do