Merge branch 'fix-recipients-from-activity' into 'develop'

Fix duplicate recipients from activity

See merge request pleroma/pleroma!1921

lib/pleroma/user/query.ex

@@ -175,6 +175,7 @@ defp compose_query({:recipients_from_activity, to}, query) do
       [u, following: f, relationships: r],
       u.ap_id in ^to or (f.follower_address in ^to and r.state == "accept")
     )
+    |> distinct(true)
   end
 
   defp compose_query({:order_by, key}, query) do

test/user_test.exs

@@ -878,27 +878,50 @@ test "it imports user blocks from list" do
     end
   end
 
-  test "get recipients from activity" do
+  describe "get_recipients_from_activity" do
-    actor = insert(:user)
+    test "get recipients" do
-    user = insert(:user, local: true)
+      actor = insert(:user)
-    user_two = insert(:user, local: false)
+      user = insert(:user, local: true)
-    addressed = insert(:user, local: true)
+      user_two = insert(:user, local: false)
-    addressed_remote = insert(:user, local: false)
+      addressed = insert(:user, local: true)
+      addressed_remote = insert(:user, local: false)
 
-    {:ok, activity} =
+      {:ok, activity} =
-      CommonAPI.post(actor, %{
+        CommonAPI.post(actor, %{
-        "status" => "hey @#{addressed.nickname} @#{addressed_remote.nickname}"
+          "status" => "hey @#{addressed.nickname} @#{addressed_remote.nickname}"
-      })
+        })
 
-    assert Enum.map([actor, addressed], & &1.ap_id) --
+      assert Enum.map([actor, addressed], & &1.ap_id) --
-             Enum.map(User.get_recipients_from_activity(activity), & &1.ap_id) == []
+               Enum.map(User.get_recipients_from_activity(activity), & &1.ap_id) == []
 
-    {:ok, user} = User.follow(user, actor)
+      {:ok, user} = User.follow(user, actor)
-    {:ok, _user_two} = User.follow(user_two, actor)
+      {:ok, _user_two} = User.follow(user_two, actor)
-    recipients = User.get_recipients_from_activity(activity)
+      recipients = User.get_recipients_from_activity(activity)
-    assert length(recipients) == 3
+      assert length(recipients) == 3
-    assert user in recipients
+      assert user in recipients
-    assert addressed in recipients
+      assert addressed in recipients
+    end
+
+    test "has following" do
+      actor = insert(:user)
+      user = insert(:user)
+      user_two = insert(:user)
+      addressed = insert(:user, local: true)
+
+      {:ok, activity} =
+        CommonAPI.post(actor, %{
+          "status" => "hey @#{addressed.nickname}"
+        })
+
+      assert Enum.map([actor, addressed], & &1.ap_id) --
+               Enum.map(User.get_recipients_from_activity(activity), & &1.ap_id) == []
+
+      {:ok, _actor} = User.follow(actor, user)
+      {:ok, _actor} = User.follow(actor, user_two)
+      recipients = User.get_recipients_from_activity(activity)
+      assert length(recipients) == 2
+      assert addressed in recipients
+    end
   end
 
   describe ".deactivate" do