diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-06-03 13:16:17 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-06-03 13:16:17 +0300 |
| commit | dc91bcc0afc82ddd52a617352e0e4e89e1a1d61c (patch) | |
| tree | e2625834287cb13a3951c93886ae080ed58c1484 /lib | |
| parent | 026b245dbc2900d90a737f024b87453bf552b62b (diff) | |
| parent | d33d248b69c77a7ab712cfe4b727c0000a77f4ea (diff) | |
| download | pleroma-dc91bcc0afc82ddd52a617352e0e4e89e1a1d61c.tar.gz | |
Merge branch 'develop' into feature/polls-2-electric-boogalo
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/conversation_view.ex | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/conversation_view.ex b/lib/pleroma/web/mastodon_api/views/conversation_view.ex index 8e8f7cf31..af1dcf66d 100644 --- a/lib/pleroma/web/mastodon_api/views/conversation_view.ex +++ b/lib/pleroma/web/mastodon_api/views/conversation_view.ex @@ -22,9 +22,14 @@ defmodule Pleroma.Web.MastodonAPI.ConversationView do last_status = StatusView.render("status.json", %{activity: activity, for: user}) + # Conversations return all users except the current user. + users = + participation.conversation.users + |> Enum.reject(&(&1.id == user.id)) + accounts = AccountView.render("accounts.json", %{ - users: participation.conversation.users, + users: users, as: :user }) |