Browse Source

Hide follower counter when hiding is activated

chore/benchmark-dedicated-db
Egor Kislitsyn 4 years ago
parent
commit
8f79f433bc
No known key found for this signature in database GPG Key ID: 1B49CB15B71E7805
2 changed files with 8 additions and 2 deletions
  1. +7
    -1
      lib/pleroma/web/activity_pub/views/user_view.ex
  2. +1
    -1
      test/web/activity_pub/views/user_view_test.exs

+ 7
- 1
lib/pleroma/web/activity_pub/views/user_view.ex View File

@@ -201,7 +201,6 @@ defmodule Pleroma.Web.ActivityPub.UserView do
%{
"id" => "#{user.ap_id}/followers",
"type" => "OrderedCollection",
"totalItems" => total,
"first" =>
if showing_items do
collection(followers, "#{user.ap_id}/followers", 1, showing_items, total)
@@ -209,6 +208,7 @@ defmodule Pleroma.Web.ActivityPub.UserView do
"#{user.ap_id}/followers?page=1"
end
}
|> maybe_put_total_items(showing_count, total)
|> Map.merge(Utils.make_json_ld_header())
end

@@ -251,6 +251,12 @@ defmodule Pleroma.Web.ActivityPub.UserView do
|> Map.merge(Utils.make_json_ld_header())
end

defp maybe_put_total_items(map, false, _total), do: map

defp maybe_put_total_items(map, true, total) do
Map.put(map, "totalItems", total)
end

def collection(collection, iri, page, show_items \\ true, total \\ nil) do
offset = (page - 1) * 10
items = Enum.slice(collection, offset, 10)


+ 1
- 1
test/web/activity_pub/views/user_view_test.exs View File

@@ -126,7 +126,7 @@ defmodule Pleroma.Web.ActivityPub.UserViewTest do
{:ok, _other_user, user, _activity} = CommonAPI.follow(other_user, user)
assert %{"totalItems" => 1} = UserView.render("followers.json", %{user: user})
user = Map.merge(user, %{hide_followers_count: true, hide_followers: true})
assert %{"totalItems" => 0} = UserView.render("followers.json", %{user: user})
refute UserView.render("followers.json", %{user: user}) |> Map.has_key?("totalItems")
end

test "sets correct totalItems when followers are hidden but the follower counter is not" do


Loading…
Cancel
Save