mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-23 08:36:29 +00:00
Merge branch 'chat-message-pagination' into 'develop'
ChatMessages: Fix pagination headers. See merge request pleroma/pleroma!3250
This commit is contained in:
commit
100e34b4a1
2 changed files with 5 additions and 5 deletions
|
@ -67,7 +67,7 @@ defmodule Pleroma.Web.ControllerHelper do
|
||||||
defp build_pagination_fields(conn, min_id, max_id, extra_params) do
|
defp build_pagination_fields(conn, min_id, max_id, extra_params) do
|
||||||
params =
|
params =
|
||||||
conn.params
|
conn.params
|
||||||
|> Map.drop(Map.keys(conn.path_params))
|
|> Map.drop(Map.keys(conn.path_params) |> Enum.map(&String.to_existing_atom/1))
|
||||||
|> Map.merge(extra_params)
|
|> Map.merge(extra_params)
|
||||||
|> Map.drop(@id_keys)
|
|> Map.drop(@id_keys)
|
||||||
|
|
||||||
|
|
|
@ -211,12 +211,12 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
|
||||||
|
|
||||||
assert String.match?(
|
assert String.match?(
|
||||||
next,
|
next,
|
||||||
~r(#{api_endpoint}.*/messages\?id=.*&limit=\d+&max_id=.*; rel=\"next\"$)
|
~r(#{api_endpoint}.*/messages\?limit=\d+&max_id=.*; rel=\"next\"$)
|
||||||
)
|
)
|
||||||
|
|
||||||
assert String.match?(
|
assert String.match?(
|
||||||
prev,
|
prev,
|
||||||
~r(#{api_endpoint}.*/messages\?id=.*&limit=\d+&min_id=.*; rel=\"prev\"$)
|
~r(#{api_endpoint}.*/messages\?limit=\d+&min_id=.*; rel=\"prev\"$)
|
||||||
)
|
)
|
||||||
|
|
||||||
assert length(result) == 20
|
assert length(result) == 20
|
||||||
|
@ -229,12 +229,12 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
|
||||||
|
|
||||||
assert String.match?(
|
assert String.match?(
|
||||||
next,
|
next,
|
||||||
~r(#{api_endpoint}.*/messages\?id=.*&limit=\d+&max_id=.*; rel=\"next\"$)
|
~r(#{api_endpoint}.*/messages\?limit=\d+&max_id=.*; rel=\"next\"$)
|
||||||
)
|
)
|
||||||
|
|
||||||
assert String.match?(
|
assert String.match?(
|
||||||
prev,
|
prev,
|
||||||
~r(#{api_endpoint}.*/messages\?id=.*&limit=\d+&max_id=.*&min_id=.*; rel=\"prev\"$)
|
~r(#{api_endpoint}.*/messages\?limit=\d+&max_id=.*&min_id=.*; rel=\"prev\"$)
|
||||||
)
|
)
|
||||||
|
|
||||||
assert length(result) == 10
|
assert length(result) == 10
|
||||||
|
|
Loading…
Reference in a new issue