Commit 91928b06 authored by lambda's avatar lambda

Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-pagination' into develop

parents e946f300 3c80d9b2
Pipeline #711 passed with stage
in 2 minutes and 40 seconds
......@@ -10,6 +10,8 @@ defmodule Pleroma.Web.OStatus.FeedRepresenter do
h = fn(str) -> [to_charlist(str)] end
last_activity = List.last(activities)
entries = activities
|> Enum.map(fn(activity) ->
{:entry, ActivityRepresenter.to_simple_form(activity, user)}
......@@ -32,7 +34,15 @@ defmodule Pleroma.Web.OStatus.FeedRepresenter do
{:link, [rel: 'salmon', href: h.(OStatus.salmon_path(user))], []},
{:link, [rel: 'self', href: h.(OStatus.feed_path(user)), type: 'application/atom+xml'], []},
{:author, UserRepresenter.to_simple_form(user)},
] ++ entries
] ++
if last_activity do
[{:link, [rel: 'next',
href: to_charlist(OStatus.feed_path(user)) ++ '?max_id=' ++ to_charlist(last_activity.id),
type: 'application/atom+xml'], []}]
else
[]
end
++ entries
}]
end
end
......@@ -17,7 +17,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
end
end
def feed(conn, %{"nickname" => nickname}) do
def feed(conn, %{"nickname" => nickname} = params) do
user = User.get_cached_by_nickname(nickname)
query = from activity in Activity,
where: fragment("?->>'actor' = ?", activity.data, ^user.ap_id),
......@@ -25,6 +25,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
order_by: [desc: :id]
activities = query
|> restrict_max(params)
|> Repo.all
response = user
......@@ -54,6 +55,11 @@ defmodule Pleroma.Web.OStatus.OStatusController do
end
end
defp restrict_max(query, %{"max_id" => max_id}) do
from activity in query, where: activity.id < ^max_id
end
defp restrict_max(query, _), do: query
def salmon_incoming(conn, _) do
{:ok, body, _conn} = read_body(conn)
{:ok, doc} = decode_or_retry(body)
......
......@@ -33,6 +33,7 @@ defmodule Pleroma.Web.OStatus.FeedRepresenterTest do
<author>
#{user_xml}
</author>
<link rel="next" href="#{OStatus.feed_path(user)}?max_id=#{note_activity.id}" type="application/atom+xml" />
<entry>
#{entry_xml}
</entry>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment