diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-10-18 10:24:29 +0200 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-10-18 10:24:29 +0200 |
| commit | 2473702be22a44070fcff439ac901f5b9bb0586a (patch) | |
| tree | 31b6180315fad80c41f551adf3ece4dcebf71f74 /lib/pleroma/web/mastodon_api/websocket_handler.ex | |
| parent | 751513b6df0c76ad14026c70e1bf2635053bfea4 (diff) | |
| parent | 7511f3d192bff285d0ca22c03cd9a46fd552cdde (diff) | |
| download | pleroma-2473702be22a44070fcff439ac901f5b9bb0586a.tar.gz | |
Merge branch 'develop' into feature/relay-list
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} -> |