limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

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

Browse source 
Fix duplicate recipients from activity

See merge request pleroma/pleroma!1921
This commit is contained in:
kaniini 2019-11-01 12:06:44 +00:00
commit 1a60215076
2 changed files with 42 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/pleroma/user/query.ex
View file

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

59
test/user_test.exs
View file

@ -878,27 +878,50 @@ defmodule Pleroma.UserTest do
end end
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 end
describe ".deactivate" do describe ".deactivate" do