X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fviews%2Fuser_view.ex;h=ffd76b5294ecaf501e056f6f451e10fc280d785b;hb=c8d418acddd72e628caad9a6b11ff6debd3386e9;hp=156a12f2621160483fc40400673ab0527369c09e;hpb=7a884d70d8fd92a44c35911509b248a902275e07;p=akkoma diff --git a/lib/pleroma/web/activity_pub/views/user_view.ex b/lib/pleroma/web/activity_pub/views/user_view.ex index 156a12f26..ffd76b529 100644 --- a/lib/pleroma/web/activity_pub/views/user_view.ex +++ b/lib/pleroma/web/activity_pub/views/user_view.ex @@ -104,9 +104,12 @@ defmodule Pleroma.Web.ActivityPub.UserView do "limit" => "10" } - if max_qid != nil do - params = Map.put(params, "max_id", max_qid) - end + params = + if max_qid != nil do + Map.put(params, "max_id", max_qid) + else + params + end activities = ActivityPub.fetch_public_activities(params) min_id = Enum.at(activities, 0).id @@ -144,21 +147,21 @@ defmodule Pleroma.Web.ActivityPub.UserView do end end - def collection(collection, iri, page, _total \\ nil) do + def collection(collection, iri, page, total \\ nil) do offset = (page - 1) * 10 items = Enum.slice(collection, offset, 10) items = Enum.map(items, fn user -> user.ap_id end) - total = _total || length(collection) + total = total || length(collection) map = %{ "id" => "#{iri}?page=#{page}", "type" => "OrderedCollectionPage", "partOf" => iri, - "totalItems" => length(collection), + "totalItems" => total, "orderedItems" => items } - if offset < length(collection) do + if offset < total do Map.put(map, "next", "#{iri}?page=#{page + 1}") end end