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

@ -149,7 +149,10 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
status = StatusView.render("status.json", %{activity: activity})
assert status.mentions == [AccountView.render("mention.json", %{user: user})]
actor = Repo.get_by(User, ap_id: activity.actor)
assert status.mentions ==
Enum.map([user, actor], fn u -> AccountView.render("mention.json", %{user: u}) end)
end
test "attachments" do