nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'fix/timeline-headers' into 'develop'

Browse source 
Add next and previous headers to user pages and tag timelines.

Closes #72

See merge request pleroma/pleroma!70
This commit is contained in:
lambda 2018-03-09 15:06:04 +00:00
parent b0d242cd92 2e32012d57
commit c661cf504b
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View file

@ -135,14 +135,23 @@ def custom_emojis(conn, _params) do
json conn, mastodon_emoji json conn, mastodon_emoji
end end
defp add_link_headers(conn, method, activities) do defp add_link_headers(conn, method, activities, param \\ false) do
last = List.last(activities) last = List.last(activities)
first = List.first(activities) first = List.first(activities)
if last do if last do
min = last.id min = last.id
max = first.id max = first.id
next_url = mastodon_api_url(Pleroma.Web.Endpoint, method, max_id: min) {next_url, prev_url} = if param do
prev_url = mastodon_api_url(Pleroma.Web.Endpoint, method, since_id: max) {
mastodon_api_url(Pleroma.Web.Endpoint, method, param, max_id: min),
mastodon_api_url(Pleroma.Web.Endpoint, method, param, since_id: max)
}
else
{
mastodon_api_url(Pleroma.Web.Endpoint, method, max_id: min),
mastodon_api_url(Pleroma.Web.Endpoint, method, since_id: max)
}
end
conn conn
|> put_resp_header("link", "<#{next_url}>; rel=\"next\", <#{prev_url}>; rel=\"prev\"") |> put_resp_header("link", "<#{next_url}>; rel=\"next\", <#{prev_url}>; rel=\"prev\"")
else else
@ -178,7 +187,6 @@ def public_timeline(%{assigns: %{user: user}} = conn, params) do
|> render(StatusView, "index.json", %{activities: activities, for: user, as: :activity}) |> render(StatusView, "index.json", %{activities: activities, for: user, as: :activity})
end end
# TODO: Link headers
def user_statuses(%{assigns: %{user: user}} = conn, params) do def user_statuses(%{assigns: %{user: user}} = conn, params) do
with %User{ap_id: ap_id} <- Repo.get(User, params["id"]) do with %User{ap_id: ap_id} <- Repo.get(User, params["id"]) do
params = params params = params
@ -189,7 +197,9 @@ def user_statuses(%{assigns: %{user: user}} = conn, params) do
activities = ActivityPub.fetch_public_activities(params) activities = ActivityPub.fetch_public_activities(params)
|> Enum.reverse |> Enum.reverse
render conn, StatusView, "index.json", %{activities: activities, for: user, as: :activity} conn
|> add_link_headers(:user_statuses, activities, params["id"])
|> render(StatusView, "index.json", %{activities: activities, for: user, as: :activity})
end end
end end
@ -333,7 +343,6 @@ def reblogged_by(conn, %{"id" => id}) do
end end
end end
# TODO: Link headers
def hashtag_timeline(%{assigns: %{user: user}} = conn, params) do def hashtag_timeline(%{assigns: %{user: user}} = conn, params) do
params = params params = params
|> Map.put("type", "Create") |> Map.put("type", "Create")
@ -344,6 +353,7 @@ def hashtag_timeline(%{assigns: %{user: user}} = conn, params) do
|> Enum.reverse |> Enum.reverse
conn conn
|> add_link_headers(:hashtag_timeline, activities, params["tag"])
|> render(StatusView, "index.json", %{activities: activities, for: user, as: :activity}) |> render(StatusView, "index.json", %{activities: activities, for: user, as: :activity})
end end