diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-10-27 16:11:25 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-10-27 16:11:25 +0300 |
| commit | 791bcfd90f41da9d77ab5a5ad6eec22ae8050b8a (patch) | |
| tree | 98ebe750f99cb6be2532e9dbaf3b334957353777 /lib/pleroma/web/mastodon_api/websocket_handler.ex | |
| parent | 8eff05d4c62c4d3300fee173cad84f75a0aafb4d (diff) | |
| parent | 060adfd762a5183b3cc5f51e041819b24b8430d2 (diff) | |
| download | pleroma-791bcfd90f41da9d77ab5a5ad6eec22ae8050b8a.tar.gz | |
Merge branch 'develop' into feature/store-statuses-data-inside-flag
Diffstat (limited to 'lib/pleroma/web/mastodon_api/websocket_handler.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/websocket_handler.ex | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/pleroma/web/mastodon_api/websocket_handler.ex b/lib/pleroma/web/mastodon_api/websocket_handler.ex index 3c26eb406..a400d1c8d 100644 --- a/lib/pleroma/web/mastodon_api/websocket_handler.ex +++ b/lib/pleroma/web/mastodon_api/websocket_handler.ex @@ -35,6 +35,13 @@ defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do {_, stream} <- List.keyfind(params, "stream", 0), {:ok, user} <- allow_request(stream, [access_token, sec_websocket]), topic when is_binary(topic) <- expand_topic(stream, params) do + req = + if sec_websocket do + :cowboy_req.set_resp_header("sec-websocket-protocol", sec_websocket, req) + else + req + end + {:cowboy_websocket, req, %{user: user, topic: topic}, %{idle_timeout: @timeout}} else {:error, code} -> |