Merge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'

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

diff --git a/lib/pleroma/web/chat_channel.ex b/lib/pleroma/web/chat_channel.ex
index c2277d73dd2da2933a9924d5a963be82ca95d16a..fe63ede664cc2b67bf019e4bce15de718f5682ec 100644 (file)
--- a/lib/pleroma/web/chat_channel.ex
+++ b/lib/pleroma/web/chat_channel.ex
@@ -1,6 +1,11 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.ChatChannel do
   use Phoenix.Channel
   alias Pleroma.Web.ChatChannel.ChatChannelState
+  alias Pleroma.User
 
   def join("chat:public", _message, socket) do
     send(self(), :after_join)
@@ -8,22 +13,26 @@ defmodule Pleroma.Web.ChatChannel do
   end
 
   def handle_info(:after_join, socket) do
-    push socket, "messages", %{messages: ChatChannelState.messages()}
+    push(socket, "messages", %{messages: ChatChannelState.messages()})
     {:noreply, socket}
   end
 
-  def handle_in("new_msg", %{"text" => text}, socket) do
-    author = socket.assigns[:user]
-    author = Pleroma.Web.MastodonAPI.AccountView.render("account.json", user: author)
-    message= ChatChannelState.add_message(%{text: text, author: author})
+  def handle_in("new_msg", %{"text" => text}, %{assigns: %{user_name: user_name}} = socket) do
+    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
 
-    broadcast! socket, "new_msg", message
     {:noreply, socket}
   end
 end
 
 defmodule Pleroma.Web.ChatChannel.ChatChannelState do
-  use Agent
   @max_messages 20
 
   def start_link do
@@ -40,6 +49,6 @@ defmodule Pleroma.Web.ChatChannel.ChatChannelState do
   end
 
   def messages() do
-    Agent.get(__MODULE__, fn state -> state[:messages] |> Enum.reverse end)
+    Agent.get(__MODULE__, fn state -> state[:messages] |> Enum.reverse() end)
   end
 end