Merge branch 'bugfix/follower_count' into 'develop'

update the follower count when a follower is blocked

See merge request pleroma/pleroma!1033

2 files changed, 19 insertions, 0 deletions

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 05f56c01e..4f579b597 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -945,6 +945,8 @@ defmodule Pleroma.User do
       unfollow(blocked, blocker)
     end
 
+    {:ok, blocker} = update_follower_count(blocker)
+
     info_cng =
       blocker.info
       |> User.Info.add_to_block(ap_id)
diff --git a/test/user_test.exs b/test/user_test.exs
index 38712cebb..4f98af683 100644
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -1125,4 +1125,21 @@ defmodule Pleroma.UserTest do
     assert {:ok, user_state3} = User.bookmark(user, id2)
     assert user_state3.bookmarks == [id2]
   end
+
+  test "follower count is updated when a follower is blocked" do
+    user = insert(:user)
+    follower = insert(:user)
+    follower2 = insert(:user)
+    follower3 = insert(:user)
+
+    {:ok, follower} = Pleroma.User.follow(follower, user)
+    {:ok, _follower2} = Pleroma.User.follow(follower2, user)
+    {:ok, _follower3} = Pleroma.User.follow(follower3, user)
+
+    {:ok, _} = Pleroma.User.block(user, follower)
+
+    user_show = Pleroma.Web.TwitterAPI.UserView.render("show.json", %{user: user})
+
+    assert Map.get(user_show, "followers_count") == 2
+  end
 end