From: Roger Braun <roger@rogerbraun.net>
Date: Tue, 5 Dec 2017 09:01:36 +0000 (+0100)
Subject: Don't save user in socket, just save the name.
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=5945ec84e9c6333b0ad4fb09ef9453de603447a1;p=akkoma

Don't save user in socket, just save the name.
---

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}