Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'

Clear follow requests when blocking a user

See merge request pleroma/pleroma!1583

1 files changed, 11 insertions, 0 deletions

diff --git a/test/user_test.exs b/test/user_test.exs
index b363b322c..96f2a252d 100644
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -90,6 +90,17 @@ defmodule Pleroma.UserTest do
     assert activity
   end
 
+  test "clears follow requests when requester is blocked" do
+    followed = insert(:user, %{info: %{locked: true}})
+    follower = insert(:user)
+
+    CommonAPI.follow(follower, followed)
+    assert {:ok, [_activity]} = User.get_follow_requests(followed)
+
+    {:ok, _follower} = User.block(followed, follower)
+    assert {:ok, []} = User.get_follow_requests(followed)
+  end
+
   test "follow_all follows mutliple users" do
     user = insert(:user)
     followed_zero = insert(:user)