summaryrefslogtreecommitdiff
path: root/lib/pleroma/web/chat_channel.ex
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-05-01 18:45:24 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-05-01 18:45:24 +0300
commitd5cdc907e3fda14c2ce78ddbb124739441330ecc (patch)
treee6d214d87f18a7389f42049e5bae244e4d99aa77 /lib/pleroma/web/chat_channel.ex
parented4e9e6435cdc4740cf12464f01ffdb5a6a96583 (diff)
downloadpleroma-d5cdc907e3fda14c2ce78ddbb124739441330ecc.tar.gz
pleroma-d5cdc907e3fda14c2ce78ddbb124739441330ecc.zip
Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering).
Added support for :skip_notifications for accounts listing (index.json). Adjusted tests.
Diffstat (limited to 'lib/pleroma/web/chat_channel.ex')
-rw-r--r--lib/pleroma/web/chat_channel.ex8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/pleroma/web/chat_channel.ex b/lib/pleroma/web/chat_channel.ex
index 38ec774f7..3df8dc0f1 100644
--- a/lib/pleroma/web/chat_channel.ex
+++ b/lib/pleroma/web/chat_channel.ex
@@ -22,7 +22,13 @@ 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)
+
+ author =
+ Pleroma.Web.MastodonAPI.AccountView.render("show.json",
+ user: author,
+ skip_relationships: true
+ )
+
message = ChatChannelState.add_message(%{text: text, author: author})
broadcast!(socket, "new_msg", message)