commit: 9ef664ffceed15727fd185c4c119025d0ee21e30
parent: d1983ed0282f1ae485f73024f25ec2753901fa8a
Author: rinpatch <rinpatch@sdf.org>
Date: Thu, 3 Jan 2019 08:59:05 +0000
Merge branch 'fix-chat' into 'develop'
Add handler for Phoenix-style socket.
See merge request pleroma/pleroma!619
Diffstat:
1 file changed, 13 insertions(+), 0 deletions(-)
diff --git a/config/config.exs b/config/config.exs
@@ -54,6 +54,17 @@ config :pleroma, :uri_schemes,
"xmpp"
]
+websocket_config = [
+ path: "/websocket",
+ serializer: [
+ {Phoenix.Socket.V1.JSONSerializer, "~> 1.0.0"},
+ {Phoenix.Socket.V2.JSONSerializer, "~> 2.0.0"}
+ ],
+ timeout: 60_000,
+ transport_log: false,
+ compress: false
+]
+
# Configures the endpoint
config :pleroma, Pleroma.Web.Endpoint,
url: [host: "localhost"],
@@ -62,6 +73,8 @@ config :pleroma, Pleroma.Web.Endpoint,
{:_,
[
{"/api/v1/streaming", Elixir.Pleroma.Web.MastodonAPI.WebsocketHandler, []},
+ {"/socket/websocket", Phoenix.Endpoint.CowboyWebSocket,
+ {nil, {Pleroma.Web.Endpoint, Pleroma.Web.UserSocket, websocket_config}}},
{:_, Plug.Adapters.Cowboy.Handler, {Pleroma.Web.Endpoint, []}}
]}
]