bida/bastodon
7
0
Fork 0
Code Issues 7 Pull requests Releases Wiki Activity

Fix streaming API queries

Browse source
This commit is contained in:
Eugen Rochko 2017-02-02 17:10:59 +01:00
parent 889b814385
commit df507f5e6e
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
streaming/index.js
View file

@ -44,7 +44,6 @@ const authenticationMiddleware = (req, res, next) => {
pgPool.connect((err, client, done) => { pgPool.connect((err, client, done) => {
if (err) { if (err) {
log.error(err)
return next(err) return next(err)
} }
@ -52,7 +51,6 @@ const authenticationMiddleware = (req, res, next) => {
done() done()
if (err) { if (err) {
log.error(err)
return next(err) return next(err)
} }
@ -71,10 +69,13 @@ const authenticationMiddleware = (req, res, next) => {
} }
const errorMiddleware = (err, req, res, next) => { const errorMiddleware = (err, req, res, next) => {
log.error(err)
res.writeHead(err.statusCode || 500, { 'Content-Type': 'application/json' }) res.writeHead(err.statusCode || 500, { 'Content-Type': 'application/json' })
res.end(JSON.stringify({ error: err.statusCode ? `${err}` : 'An unexpected error occured' })) res.end(JSON.stringify({ error: err.statusCode ? `${err}` : 'An unexpected error occured' }))
} }
const placeholders = (arr, shift = 0) => arr.map((_, i) => `$${i + 1 + shift}`).join(', ');
const streamFrom = (id, req, res, needsFiltering = false) => { const streamFrom = (id, req, res, needsFiltering = false) => {
log.verbose(`Starting stream from ${id} for ${req.accountId}`) log.verbose(`Starting stream from ${id} for ${req.accountId}`)
@ -100,9 +101,9 @@ const streamFrom = (id, req, res, needsFiltering = false) => {
} }
const unpackedPayload = JSON.parse(payload) const unpackedPayload = JSON.parse(payload)
const targetAccountIds = [unpackedPayload.account.id] + unpackedPayload.mentions.map(item => item.id) + (unpackedPayload.reblog ? unpackedPayload.reblog.account.id : []) const targetAccountIds = [unpackedPayload.account.id].concat(unpackedPayload.mentions.map(item => item.id)).concat(unpackedPayload.reblog ? [unpackedPayload.reblog.account.id] : [])
client.query('SELECT target_account_id FROM blocks WHERE account_id = $1 AND target_account_id IN ($2)', [req.accountId, targetAccountIds], (err, result) => { client.query(`SELECT target_account_id FROM blocks WHERE account_id = $1 AND target_account_id IN (${placeholders(targetAccountIds, 1)})`, [req.accountId].concat(targetAccountIds), (err, result) => {
done() done()
if (err) { if (err) {