projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfix/no-cc-mentions' 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 4a9bb8e2245a8ceabcabe8996bfb8334ff6617d5..21b22b40994a6419282645f8ecb68dd757ff597a 100644
(file)
--- a/
lib/pleroma/web/channels/user_socket.ex
+++ b/
lib/pleroma/web/channels/user_socket.ex
@@
-1,14
+1,15
@@
defmodule Pleroma.Web.UserSocket do
use Phoenix.Socket
alias Pleroma.User
defmodule Pleroma.Web.UserSocket do
use Phoenix.Socket
alias Pleroma.User
- alias Comeonin.Pbkdf2
## Channels
# channel "room:*", Pleroma.Web.RoomChannel
## Channels
# channel "room:*", Pleroma.Web.RoomChannel
- channel "chat:*", Pleroma.Web.ChatChannel
+ if Application.get_env(:pleroma, :chat) |> Keyword.get(:enabled) do
+ channel("chat:*", Pleroma.Web.ChatChannel)
+ end
## Transports
## 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
# transport :longpoll, Phoenix.Transports.LongPoll
# Socket params are passed from the client and can