Merge branch 'fix/tusky-dm' into 'develop'

Add actor to recipients list

Closes #390

See merge request pleroma/pleroma!683
This commit is contained in:
kaniini 2019-01-25 05:19:32 +00:00
commit 4c99b6d35a
9 changed files with 79 additions and 52 deletions

View file

@ -672,12 +672,13 @@ defmodule Pleroma.UserTest do
"status" => "hey @#{addressed.nickname} @#{addressed_remote.nickname}"
})
assert [addressed] == User.get_recipients_from_activity(activity)
assert Enum.map([actor, addressed], & &1.ap_id) --
Enum.map(User.get_recipients_from_activity(activity), & &1.ap_id) == []
{:ok, user} = User.follow(user, actor)
{:ok, _user_two} = User.follow(user_two, actor)
recipients = User.get_recipients_from_activity(activity)
assert length(recipients) == 2
assert length(recipients) == 3
assert user in recipients
assert addressed in recipients
end