[#2497] Fixed merge issue.

[akkoma] / lib / pleroma / web / chat_channel.ex

diff --git a/lib/pleroma/web/chat_channel.ex b/lib/pleroma/web/chat_channel.ex
index 3df8dc0f1e607c0be841c1f9eaab2af93e8f4daf..bce27897fd9b17a6559e704309da16f0dde3ded3 100644 (file)
--- a/lib/pleroma/web/chat_channel.ex
+++ b/lib/pleroma/web/chat_channel.ex
@@ -22,12 +22,7 @@ defmodule Pleroma.Web.ChatChannel do
 
     if String.length(text) in 1..Pleroma.Config.get([:instance, :chat_limit]) do
       author = User.get_cached_by_nickname(user_name)
-
-      author =
-        Pleroma.Web.MastodonAPI.AccountView.render("show.json",
-          user: author,
-          skip_relationships: true
-        )
+      author = Pleroma.Web.MastodonAPI.AccountView.render("show.json", user: author)
 
       message = ChatChannelState.add_message(%{text: text, author: author})