OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Restore streaming API output format (#4100) 

* Restore streaming API output format

Regression from #4090

* Remove whitespace
pull/4101/head
Eugen Rochko 2017-07-07 16:56:52 +02:00 committed by GitHub
parent 6e1261f277
commit ebd2dde688
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
streaming/index.js
View File

@ -262,11 +262,12 @@ const startWorker = (workerId) => {
const { event, payload, queued_at } = JSON.parse(message); const { event, payload, queued_at } = JSON.parse(message);
const transmit = () => { const transmit = () => {
const now = new Date().getTime(); const now = new Date().getTime();
const delta = now - queued_at; const delta = now - queued_at;
const encodedPayload = typeof payload === 'number' ? payload : JSON.stringify(payload);
log.silly(req.requestId, `Transmitting for ${req.accountId}: ${event} ${payload} Delay: ${delta}ms`); log.silly(req.requestId, `Transmitting for ${req.accountId}: ${event} ${encodedPayload} Delay: ${delta}ms`);
output(event, payload); output(event, encodedPayload);
}; };
if (notificationOnly && event !== 'notification') { if (notificationOnly && event !== 'notification') {
@ -282,7 +283,7 @@ const startWorker = (workerId) => {
return; return;
} }
const unpackedPayload = JSON.parse(payload); const unpackedPayload = payload;
const targetAccountIds = [unpackedPayload.account.id].concat(unpackedPayload.mentions.map(item => item.id)); const targetAccountIds = [unpackedPayload.account.id].concat(unpackedPayload.mentions.map(item => item.id));
const accountDomain = unpackedPayload.account.acct.split('@')[1]; const accountDomain = unpackedPayload.account.acct.split('@')[1];