diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-01-03 08:59:05 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-01-03 08:59:05 +0000 |
| commit | 9ef664ffceed15727fd185c4c119025d0ee21e30 (patch) | |
| tree | 53f9d8fbd7c023b53f6aa1e3535ff5247afdd90e | |
| parent | d1983ed0282f1ae485f73024f25ec2753901fa8a (diff) | |
| parent | 8910e103ce32ccc593e748a2c83d18831c90f915 (diff) | |
| download | pleroma-9ef664ffceed15727fd185c4c119025d0ee21e30.tar.gz | |
Merge branch 'fix-chat' into 'develop'
Add handler for Phoenix-style socket.
See merge request pleroma/pleroma!619
| -rw-r--r-- | config/config.exs | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index d743406dc..11ee220e7 100644 --- 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, []}} ]} ] |