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 @@ defmodule Pleroma.User.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,7 +878,8 @@ defmodule Pleroma.UserTest do
     end
   end
 
-  test "get recipients from activity" do
+  describe "get_recipients_from_activity" do
+    test "get recipients" do
       actor = insert(:user)
       user = insert(:user, local: true)
       user_two = insert(:user, local: false)
@@ -901,6 +902,28 @@ defmodule Pleroma.UserTest do
       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
     test "can de-activate then re-activate a user" do
       user = insert(:user)