diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-12-13 02:12:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-13 02:12:41 +0100 |
commit | 0128b86d3098042cdbc3a1629f74b70f665f8dfb (patch) | |
tree | 7688384c9a5eb678d5e2b2f746358b04ade8373d /app/javascript/mastodon/stream.js | |
parent | 0370ba7b0a18d41f688269370d0eb089261047a9 (diff) |
Use streaming API for standalone timelines on /about and /tag pages (#5998)
Diffstat (limited to 'app/javascript/mastodon/stream.js')
-rw-r--r-- | app/javascript/mastodon/stream.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/javascript/mastodon/stream.js b/app/javascript/mastodon/stream.js index 36c68ffc5..9a6f4f26d 100644 --- a/app/javascript/mastodon/stream.js +++ b/app/javascript/mastodon/stream.js @@ -62,7 +62,13 @@ export function connectStream(path, pollingRefresh = null, callbacks = () => ({ export default function getStream(streamingAPIBaseURL, accessToken, stream, { connected, received, disconnected, reconnected }) { - const ws = new WebSocketClient(`${streamingAPIBaseURL}/api/v1/streaming/?access_token=${accessToken}&stream=${stream}`); + const params = [ `stream=${stream}` ]; + + if (accessToken !== null) { + params.push(`access_token=${accessToken}`); + } + + const ws = new WebSocketClient(`${streamingAPIBaseURL}/api/v1/streaming/?${params.join('&')}`); ws.onopen = connected; ws.onmessage = e => received(JSON.parse(e.data)); |