about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorAkihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>2017-05-04 22:55:13 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-05-04 15:55:13 +0200
commit0cdcf328657c4a827be2dca9d8614ccbf55045ed (patch)
tree84b8a088af1c4a6e57d1962ed8e66531a2f3652c /app
parent629a4d0fcac303a66b92d745e159a5913a38fa78 (diff)
Use ws protocol in streaming API base URL (#2606)
Diffstat (limited to 'app')
-rw-r--r--app/javascript/mastodon/stream.js12
1 files changed, 1 insertions, 11 deletions
diff --git a/app/javascript/mastodon/stream.js b/app/javascript/mastodon/stream.js
index 08da71607..4b36082b2 100644
--- a/app/javascript/mastodon/stream.js
+++ b/app/javascript/mastodon/stream.js
@@ -1,17 +1,7 @@
 import WebSocketClient from 'websocket.js';
 
-const createWebSocketURL = (url) => {
-  const a = document.createElement('a');
-
-  a.href     = url;
-  a.href     = a.href;
-  a.protocol = a.protocol.replace('http', 'ws');
-
-  return a.href;
-};
-
 export default function getStream(streamingAPIBaseURL, accessToken, stream, { connected, received, disconnected, reconnected }) {
-  const ws = new WebSocketClient(`${createWebSocketURL(streamingAPIBaseURL)}/api/v1/streaming/?access_token=${accessToken}&stream=${stream}`);
+  const ws = new WebSocketClient(`${streamingAPIBaseURL}/api/v1/streaming/?access_token=${accessToken}&stream=${stream}`);
 
   ws.onopen      = connected;
   ws.onmessage   = e => received(JSON.parse(e.data));