pleroma

commit: a01093c505221d4a2ae2e0713680285348f4faf5
parent f34e22bba22e041a72ae379e3ac3807a00af9a8e
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Thu, 27 May 2021 21:01:54 +0000

Merge branch 'featured-totalItems' into 'develop'

Add missing totalItems field for featured collections

See merge request pleroma/pleroma!3416
Diffstat:
M
CHANGELOG.md
1
+
M
lib/pleroma/web/activity_pub/views/user_view.ex
3
++-
M
test/pleroma/web/activity_pub/activity_pub_controller_test.exs
2
+-

3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Return OAuth token `id` (primary key) in POST `/oauth/token`.
 - `AnalyzeMetadata` upload filter for extracting attachment dimensions and generating blurhashes.
 - Attachment dimensions and blurhashes are federated when available.
+- Pinned posts federation
 
 ### Fixed
 - Don't crash so hard when email settings are invalid.
diff --git a/lib/pleroma/web/activity_pub/views/user_view.ex b/lib/pleroma/web/activity_pub/views/user_view.ex
@@ -261,7 +261,8 @@ defmodule Pleroma.Web.ActivityPub.UserView do
     %{
       "id" => featured_address,
       "type" => "OrderedCollection",
-      "orderedItems" => objects
+      "orderedItems" => objects,
+      "totalItems" => length(objects)
     }
     |> Map.merge(Utils.make_json_ld_header())
   end
diff --git a/test/pleroma/web/activity_pub/activity_pub_controller_test.exs b/test/pleroma/web/activity_pub/activity_pub_controller_test.exs
@@ -1966,7 +1966,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
     %{nickname: nickname, featured_address: featured_address, pinned_objects: pinned_objects} =
       refresh_record(user)
 
-    %{"id" => ^featured_address, "orderedItems" => items} =
+    %{"id" => ^featured_address, "orderedItems" => items, "totalItems" => 2} =
       conn
       |> get("/users/#{nickname}/collections/featured")
       |> json_response(200)