diff options
| -rw-r--r-- | lib/pleroma/web/channels/user_socket.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/chat_channel.ex | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/pleroma/web/channels/user_socket.ex b/lib/pleroma/web/channels/user_socket.ex index d8171cabd..4a9bb8e22 100644 --- a/lib/pleroma/web/channels/user_socket.ex +++ b/lib/pleroma/web/channels/user_socket.ex @@ -25,7 +25,7 @@ defmodule Pleroma.Web.UserSocket do def connect(%{"token" => token}, socket) do with {:ok, user_id} <- Phoenix.Token.verify(socket, "user socket", token, max_age: 84600), %User{} = user <- Pleroma.Repo.get(User, user_id) do - {:ok, assign(socket, :user, user)} + {:ok, assign(socket, :user_name, user.nickname)} else _e -> :error end diff --git a/lib/pleroma/web/chat_channel.ex b/lib/pleroma/web/chat_channel.ex index c2277d73d..268bef17d 100644 --- a/lib/pleroma/web/chat_channel.ex +++ b/lib/pleroma/web/chat_channel.ex @@ -1,6 +1,7 @@ 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) @@ -12,10 +13,10 @@ defmodule Pleroma.Web.ChatChannel do {:noreply, socket} end - def handle_in("new_msg", %{"text" => text}, socket) do - author = socket.assigns[:user] + 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}) + message = ChatChannelState.add_message(%{text: text, author: author}) broadcast! socket, "new_msg", message {:noreply, socket} |