Preserve parameters in link headers (Mastodon API)
This commit is contained in:
parent
0fe715f3ba
commit
7342b5a45f
2 changed files with 37 additions and 0 deletions
|
@ -190,6 +190,11 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
|
||||||
end
|
end
|
||||||
|
|
||||||
defp add_link_headers(conn, method, activities, param \\ nil, params \\ %{}) do
|
defp add_link_headers(conn, method, activities, param \\ nil, params \\ %{}) do
|
||||||
|
params =
|
||||||
|
conn.params
|
||||||
|
|> Map.drop(["since_id", "max_id"])
|
||||||
|
|> Map.merge(params)
|
||||||
|
|
||||||
last = List.last(activities)
|
last = List.last(activities)
|
||||||
first = List.first(activities)
|
first = List.first(activities)
|
||||||
|
|
||||||
|
|
|
@ -1955,4 +1955,36 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|
||||||
|> json_response(400)
|
|> json_response(400)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "link headers" do
|
||||||
|
test "preserves parameters in link headers", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
other_user = insert(:user)
|
||||||
|
|
||||||
|
{:ok, activity1} =
|
||||||
|
CommonAPI.post(other_user, %{
|
||||||
|
"status" => "hi @#{user.nickname}",
|
||||||
|
"visibility" => "public"
|
||||||
|
})
|
||||||
|
|
||||||
|
{:ok, activity2} =
|
||||||
|
CommonAPI.post(other_user, %{
|
||||||
|
"status" => "hi @#{user.nickname}",
|
||||||
|
"visibility" => "public"
|
||||||
|
})
|
||||||
|
|
||||||
|
notification1 = Repo.get_by(Notification, activity_id: activity1.id)
|
||||||
|
notification2 = Repo.get_by(Notification, activity_id: activity2.id)
|
||||||
|
|
||||||
|
conn =
|
||||||
|
conn
|
||||||
|
|> assign(:user, user)
|
||||||
|
|> get("/api/v1/notifications", %{media_only: true})
|
||||||
|
|
||||||
|
assert [link_header] = get_resp_header(conn, "link")
|
||||||
|
assert link_header =~ ~r/media_only=true/
|
||||||
|
assert link_header =~ ~r/since_id=#{notification2.id}/
|
||||||
|
assert link_header =~ ~r/max_id=#{notification1.id}/
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue