Merge branch 'mass-follow-fixes' into 'develop'

User.follow_all: Respect blocks in both directions.

See merge request pleroma/pleroma!823

1 files changed, 4 insertions, 1 deletions

diff --git a/test/user_test.exs b/test/user_test.exs
index 523ab1ea4..a282274ce 100644
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -55,18 +55,21 @@ defmodule Pleroma.UserTest do
     followed_two = insert(:user)
     blocked = insert(:user)
     not_followed = insert(:user)
+    reverse_blocked = insert(:user)
 
     {:ok, user} = User.block(user, blocked)
+    {:ok, reverse_blocked} = User.block(reverse_blocked, user)
 
     {:ok, user} = User.follow(user, followed_zero)
 
-    {:ok, user} = User.follow_all(user, [followed_one, followed_two, blocked])
+    {:ok, user} = User.follow_all(user, [followed_one, followed_two, blocked, reverse_blocked])
 
     assert User.following?(user, followed_one)
     assert User.following?(user, followed_two)
     assert User.following?(user, followed_zero)
     refute User.following?(user, not_followed)
     refute User.following?(user, blocked)
+    refute User.following?(user, reverse_blocked)
   end
 
   test "follow_all follows mutliple users without duplicating" do