hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix merge

Browse source
This commit is contained in:
Egor Kislitsyn 2019-09-30 19:10:54 +07:00
commit e7aef27c00
No known key found for this signature in database
GPG key ID: 1B49CB15B71E7805
22 changed files with 1131 additions and 1114 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/chat_channel.ex
View file

@ -22,7 +22,7 @@ defmodule Pleroma.Web.ChatChannel do
if String.length(text) > 0 do
author = User.get_cached_by_nickname(user_name)
author = Pleroma.Web.MastodonAPI.AccountView.render("account.json", user: author)
author = Pleroma.Web.MastodonAPI.AccountView.render("show.json", user: author)
message = ChatChannelState.add_message(%{text: text, author: author})
broadcast!(socket, "new_msg", message)