trav/custo-viewer
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better serve channel query, better error handling

Browse Source
This commit is contained in:
Anders Rune Jensen
2017-04-16 21:38:48 +02:00
parent 7a12c1f494
commit 5c13d7dc8d
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.js
+9 -8
View File
@@ -118,7 +118,7 @@ exports.init = function (sbot, config) {
} }
pull( pull(
sbot.createUserStream({ id: feedId, reverse: true, limit: 100 }), sbot.createUserStream({ id: feedId, reverse: true }),
pull.collect(function (err, logs) { pull.collect(function (err, logs) {
if (err) return respond(res, 500, err.stack || err) if (err) return respond(res, 500, err.stack || err)
res.writeHead(200, { res.writeHead(200, {
@@ -193,7 +193,7 @@ exports.init = function (sbot, config) {
} }
pull( pull(
sbot.createLogStream({ reverse: true, limit: 1000 }), sbot.createLogStream({ reverse: true, limit: 2500 }),
pull.filter((msg) => { pull.filter((msg) => {
return !msg.value || return !msg.value ||
(msg.value.author in following || (msg.value.author in following ||
@@ -241,10 +241,7 @@ exports.init = function (sbot, config) {
} }
pull( pull(
sbot.createLogStream({ reverse: true, limit: 2000 }), sbot.query.read({ limit: 500, reverse: true, query: [{$filter: { value: { content: { channel: channelId }}}}]}),
pull.filter((msg) => {
return !msg.value || msg.value.content.channel == channelId
}),
pull.filter((msg) => { // channel subscription pull.filter((msg) => { // channel subscription
return !msg.value.content.subscribed return !msg.value.content.subscribed
}), }),
@@ -596,8 +593,12 @@ function render(opts, c)
linkedText = c.vote.linkedText.substring(0, 100) linkedText = c.vote.linkedText.substring(0, 100)
return ' voted <a href="/' + c.vote.link + '">' + linkedText + '</a>' return ' voted <a href="/' + c.vote.link + '">' + linkedText + '</a>'
} }
else if (c.type == 'contact' && c.following) else if (c.type == 'contact' && c.following) {
return ' followed <a href="/user/' + c.contact + '">' + c.contactAbout.name + "</a>" var name = c.contact
if (typeof c.contactAbout != 'undefined')
name = c.contactAbout.name
return ' followed <a href="/user/' + c.contact + '">' + name + "</a>"
}
else if (typeof c == 'string') else if (typeof c == 'string')
return ' wrote something private ' return ' wrote something private '
else if (c.type == 'about') else if (c.type == 'about')