summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-10-09 04:35:08 +0900
committerGitHub <noreply@github.com>2018-10-09 04:35:08 +0900
commit7cf72f7447fc490989e44b9120f61ad462d03d87 (patch)
tree1863795414f51e1e68efed1dbdde3265ac158e1b /src
parentMerge pull request #2856 from syuilo/greenkeeper/typescript-eslint-parser-20.0.0 (diff)
parent/ に main stream も流す (diff)
downloadmisskey-7cf72f7447fc490989e44b9120f61ad462d03d87.tar.gz
misskey-7cf72f7447fc490989e44b9120f61ad462d03d87.tar.bz2
misskey-7cf72f7447fc490989e44b9120f61ad462d03d87.zip
Merge pull request #2860 from mei23/mei-1009-v10d
互換ストリーム / に main streamの内容も流す
Diffstat (limited to 'src')
-rw-r--r--src/server/api/streaming.ts4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/api/streaming.ts b/src/server/api/streaming.ts
index c8c4a8a294..a0a219a317 100644
--- a/src/server/api/streaming.ts
+++ b/src/server/api/streaming.ts
@@ -44,6 +44,10 @@ module.exports = (server: http.Server) => {
request.resourceURL.pathname === '/local-timeline' ? channels.localTimeline :
request.resourceURL.pathname === '/hybrid-timeline' ? channels.hybridTimeline :
request.resourceURL.pathname === '/global-timeline' ? channels.globalTimeline : null);
+
+ if (request.resourceURL.pathname === '/') {
+ main.connectChannel(Math.random().toString(), null, channels.main);
+ }
}
connection.once('close', () => {