diff options
| author | Roger Braun <roger@rogerbraun.net> | 2018-02-11 09:50:55 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2018-02-11 09:50:55 +0100 |
| commit | 52200998c997576c9008cbe50b0a7b9f0e6134cc (patch) | |
| tree | c0d68f476442b8dd86fca1e182d5c09553800810 /lib/pleroma/web/channels/user_socket.ex | |
| parent | 4a13b8488787773d09f67d1a436d5906e2f5b171 (diff) | |
| parent | 0e2ca77eec511857508208d3faeb9217c4496f8a (diff) | |
| download | pleroma-52200998c997576c9008cbe50b0a7b9f0e6134cc.tar.gz | |
Merge branch 'develop' into feature/activitypub
Diffstat (limited to 'lib/pleroma/web/channels/user_socket.ex')
| -rw-r--r-- | lib/pleroma/web/channels/user_socket.ex | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/channels/user_socket.ex b/lib/pleroma/web/channels/user_socket.ex index 4a9bb8e22..f18b3cb80 100644 --- a/lib/pleroma/web/channels/user_socket.ex +++ b/lib/pleroma/web/channels/user_socket.ex @@ -5,7 +5,9 @@ defmodule Pleroma.Web.UserSocket do ## 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 transport :websocket, Phoenix.Transports.WebSocket |