aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2018-03-26 09:51:43 +0200
committerlain <lain@soykaf.club>2018-03-26 09:51:43 +0200
commit46f63ea8afa2f1405934b7cae181bfad8a653de2 (patch)
treeb76768046c34c769715bcfabdf3e47a6b71c5946 /lib
parent2c1c221301ee91a8bccc1da2dc658b0f5a5598c9 (diff)
downloadpleroma-46f63ea8afa2f1405934b7cae181bfad8a653de2.tar.gz
Fix atom feed pagination.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/ostatus/ostatus_controller.ex5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index cb435e031..7e71c156c 100644
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -23,7 +23,10 @@ defmodule Pleroma.Web.OStatus.OStatusController do
def feed(conn, %{"nickname" => nickname} = params) do
user = User.get_cached_by_nickname(nickname)
- activities = ActivityPub.fetch_public_activities(%{"whole_db" => true, "actor_id" => user.ap_id})
+ query_params = Map.take(params, ["max_id"])
+ |> Map.merge(%{"whole_db" => true, "actor_id" => user.ap_id})
+
+ activities = ActivityPub.fetch_public_activities(query_params)
|> Enum.reverse
response = user