X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fchannels%2Fuser_socket.ex;h=21b22b40994a6419282645f8ecb68dd757ff597a;hb=b4bd5e40e491c8b777c75ec4f096c0c466a6b4e2;hp=7aa8e556e9eaea19fb7864d1ce162d91b8a139d1;hpb=a93f3421a704d6728a856d5d82cdbf9c43f3f897;p=akkoma

diff --git a/lib/pleroma/web/channels/user_socket.ex b/lib/pleroma/web/channels/user_socket.ex
index 7aa8e556e..21b22b409 100644
--- a/lib/pleroma/web/channels/user_socket.ex
+++ b/lib/pleroma/web/channels/user_socket.ex
@@ -1,11 +1,15 @@
 defmodule Pleroma.Web.UserSocket do
   use Phoenix.Socket
+  alias Pleroma.User
 
   ## Channels
   # channel "room:*", Pleroma.Web.RoomChannel
+  if Application.get_env(:pleroma, :chat) |> Keyword.get(:enabled) do
+    channel("chat:*", Pleroma.Web.ChatChannel)
+  end
 
   ## Transports
-  transport :websocket, Phoenix.Transports.WebSocket
+  transport(:websocket, Phoenix.Transports.WebSocket)
   # transport :longpoll, Phoenix.Transports.LongPoll
 
   # Socket params are passed from the client and can
@@ -19,8 +23,13 @@ defmodule Pleroma.Web.UserSocket do
   #
   # See `Phoenix.Token` documentation for examples in
   # performing token verification on connect.
-  def connect(_params, socket) do
-    {:ok, socket}
+  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_name, user.nickname)}
+    else
+      _e -> :error
+    end
   end
 
   # Socket id's are topics that allow you to identify all sockets for a given user: