aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2018-03-12 11:30:12 +0100
committerlain <lain@soykaf.club>2018-03-12 11:30:12 +0100
commit312a8783f8dbf563ea9d5af3cc7991ca553dc286 (patch)
tree037dc4861febca470dbdd6fabb7a787dbc61260b
parent368e085144cc3bea501dc14a783f32cd696cb3af (diff)
downloadpleroma-312a8783f8dbf563ea9d5af3cc7991ca553dc286.tar.gz
Ignore incoming empty chat messages.
Fixes #62.
-rw-r--r--lib/pleroma/web/chat_channel.ex13
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/pleroma/web/chat_channel.ex b/lib/pleroma/web/chat_channel.ex
index 48a3553bf..ddc1d6f80 100644
--- a/lib/pleroma/web/chat_channel.ex
+++ b/lib/pleroma/web/chat_channel.ex
@@ -14,11 +14,14 @@ defmodule Pleroma.Web.ChatChannel do
end
def handle_in("new_msg", %{"text" => text}, %{assigns: %{user_name: user_name}} = socket) do
- author = User.get_cached_by_nickname(user_name)
- author = Pleroma.Web.MastodonAPI.AccountView.render("account.json", user: author)
- message = ChatChannelState.add_message(%{text: text, author: author})
-
- broadcast! socket, "new_msg", message
+ text = String.trim(text)
+ if String.length(text) > 0 do
+ author = User.get_cached_by_nickname(user_name)
+ author = Pleroma.Web.MastodonAPI.AccountView.render("account.json", user: author)
+ message = ChatChannelState.add_message(%{text: text, author: author})
+
+ broadcast! socket, "new_msg", message
+ end
{:noreply, socket}
end
end