diff options
author | Takeshi Umeda <noel.yoshiba@gmail.com> | 2020-05-10 17:36:18 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-10 10:36:18 +0200 |
commit | 26b08a3c54847f2816f78c3ac67ace001d3fea1f (patch) | |
tree | 9512f3ec81de5bd70b4b544475c84aecf1a58110 /streaming/index.js | |
parent | e9ecbca70d28c775a9eeda7670e06443a1037d5b (diff) |
Add remote only to public timeline (#13504)
* Add remote only to public timeline * Fix code style
Diffstat (limited to 'streaming/index.js')
-rw-r--r-- | streaming/index.js | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/streaming/index.js b/streaming/index.js index 0a19c74a6..500d577ce 100644 --- a/streaming/index.js +++ b/streaming/index.js @@ -266,6 +266,8 @@ const startWorker = (workerId) => { 'public:media', 'public:local', 'public:local:media', + 'public:remote', + 'public:remote:media', 'hashtag', 'hashtag:local', ]; @@ -297,6 +299,7 @@ const startWorker = (workerId) => { const PUBLIC_ENDPOINTS = [ '/api/v1/streaming/public', '/api/v1/streaming/public/local', + '/api/v1/streaming/public/remote', '/api/v1/streaming/hashtag', '/api/v1/streaming/hashtag/local', ]; @@ -535,6 +538,13 @@ const startWorker = (workerId) => { streamFrom(channel, req, streamToHttp(req, res), streamHttpEnd(req), true); }); + app.get('/api/v1/streaming/public/remote', (req, res) => { + const onlyMedia = req.query.only_media === '1' || req.query.only_media === 'true'; + const channel = onlyMedia ? 'timeline:public:remote:media' : 'timeline:public:remote'; + + streamFrom(channel, req, streamToHttp(req, res), streamHttpEnd(req), true); + }); + app.get('/api/v1/streaming/direct', (req, res) => { const channel = `timeline:direct:${req.accountId}`; streamFrom(channel, req, streamToHttp(req, res), streamHttpEnd(req, subscriptionHeartbeat(channel)), true); @@ -599,12 +609,18 @@ const startWorker = (workerId) => { case 'public:local': streamFrom('timeline:public:local', req, streamToWs(req, ws), streamWsEnd(req, ws), true); break; + case 'public:remote': + streamFrom('timeline:public:remote', req, streamToWs(req, ws), streamWsEnd(req, ws), true); + break; case 'public:media': streamFrom('timeline:public:media', req, streamToWs(req, ws), streamWsEnd(req, ws), true); break; case 'public:local:media': streamFrom('timeline:public:local:media', req, streamToWs(req, ws), streamWsEnd(req, ws), true); break; + case 'public:remote:media': + streamFrom('timeline:public:remote:media', req, streamToWs(req, ws), streamWsEnd(req, ws), true); + break; case 'direct': channel = `timeline:direct:${req.accountId}`; streamFrom(channel, req, streamToWs(req, ws), streamWsEnd(req, ws, subscriptionHeartbeat(channel)), true); |