Merge branch 'patch-2' into 'develop'

[akkoma] / lib / pleroma / web / channels / user_socket.ex

diff --git a/lib/pleroma/web/channels/user_socket.ex b/lib/pleroma/web/channels/user_socket.ex
index f18b3cb80d78bf140010030aa73817a8efe75d83..21b22b40994a6419282645f8ecb68dd757ff597a 100644 (file)
--- a/lib/pleroma/web/channels/user_socket.ex
+++ b/lib/pleroma/web/channels/user_socket.ex
@@ -1,16 +1,15 @@
 defmodule Pleroma.Web.UserSocket do
   use Phoenix.Socket
   alias Pleroma.User
-  alias Comeonin.Pbkdf2
 
   ## Channels
   # channel "room:*", Pleroma.Web.RoomChannel
   if Application.get_env(:pleroma, :chat) |> Keyword.get(:enabled) do
-    channel "chat:*", Pleroma.Web.ChatChannel
+    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