Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add conversations API (#8832)

Browse source 
* Add conversations API

* Add web UI for conversations

* Add test for conversations API

* Add tests for ConversationAccount

* Improve web UI

* Rename ConversationAccount to AccountConversation

* Remove conversations on block and mute

* Change last_status_id to be a denormalization of status_ids

* Add optimistic locking
This commit is contained in:
Eugen Rochko 2018-10-07 23:44:58 +02:00 • committed by GitHub
parent 25744d43b0
commit 774ac47373
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 816 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

12
streaming/index.js
View file

@ -485,7 +485,8 @@ const startWorker = (workerId) => {
});
app.get('/api/v1/streaming/direct', (req, res) => {
streamFrom(`timeline:direct:${req.accountId}`, req, streamToHttp(req, res), streamHttpEnd(req), true);
const channel = `timeline:direct:${req.accountId}`;
streamFrom(channel, req, streamToHttp(req, res), streamHttpEnd(req, subscriptionHeartbeat(channel)), true);
});
app.get('/api/v1/streaming/hashtag', (req, res) => {
@ -525,9 +526,11 @@ const startWorker = (workerId) => {
ws.isAlive = true;
});
let channel;
switch(location.query.stream) {
case 'user':
const channel = `timeline:${req.accountId}`;
channel = `timeline:${req.accountId}`;
streamFrom(channel, req, streamToWs(req, ws), streamWsEnd(req, ws, subscriptionHeartbeat(channel)));
break;
case 'user:notification':
@ -546,7 +549,8 @@ const startWorker = (workerId) => {
streamFrom('timeline:public:local:media', req, streamToWs(req, ws), streamWsEnd(req, ws), true);
break;
case 'direct':
streamFrom(`timeline:direct:${req.accountId}`, req, streamToWs(req, ws), streamWsEnd(req, ws), true);
channel = `timeline:direct:${req.accountId}`;
streamFrom(channel, req, streamToWs(req, ws), streamWsEnd(req, ws, subscriptionHeartbeat(channel)), true);
break;
case 'hashtag':
streamFrom(`timeline:hashtag:${location.query.tag.toLowerCase()}`, req, streamToWs(req, ws), streamWsEnd(req, ws), true);
@ -563,7 +567,7 @@ const startWorker = (workerId) => {
return;
}
const channel = `timeline:list:${listId}`;
channel = `timeline:list:${listId}`;
streamFrom(channel, req, streamToWs(req, ws), streamWsEnd(req, ws, subscriptionHeartbeat(channel)));
});
break;