diff options
| author | lain <lain@soykaf.club> | 2019-11-05 15:21:00 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-11-05 15:21:00 +0100 |
| commit | 1bd1f62af55e01613e6362661b36a19091c87424 (patch) | |
| tree | 519963a50af82c1a0b251f1405d663ba9ccd4714 /lib/pleroma/web/mastodon_api/websocket_handler.ex | |
| parent | faced6236b9e2ce9675cf743068f16098b744562 (diff) | |
| parent | f11eebc18383be7d7b4b037582e4e1e08b74653b (diff) | |
| download | pleroma-1bd1f62af55e01613e6362661b36a19091c87424.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
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} -> |