From cecdc93fd30b7c181e4e9720a98ef8f788355906 Mon Sep 17 00:00:00 2001 From: Jacob Karlsson Date: Mon, 2 Jul 2018 19:52:17 +0200 Subject: [PATCH] Render gathering descriptions --- index.js | 21 ++++++++++++++++++++- render.js | 16 ++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/index.js b/index.js index 9dfd719..79140be 100644 --- a/index.js +++ b/index.js @@ -137,6 +137,7 @@ exports.init = function (sbot, config) { paramap(addFollowAbout, 8), paramap(addVoteMessage, 8), paramap(addGitLinks, 8), + paramap(addGatheringAbout, 8), render(), toPull(res, function (err) { if (err) console.error('[viewer]', err) @@ -242,6 +243,7 @@ exports.init = function (sbot, config) { paramap(addFollowAbout, 8), paramap(addVoteMessage, 8), paramap(addGitLinks, 8), + paramap(addGatheringAbout, 8), pull(renderThread(feedOpts), wrapPage(name)), toPull(res, function (err) { if (err) console.error('[viewer]', err) @@ -268,7 +270,8 @@ exports.init = function (sbot, config) { pull.values(logs), paramap(addAuthorAbout, 8), paramap(addBlog, 8), - paramap(addVoteMessage, 8), + paramap(addVoteMessage, 8), + paramap(addGatheringAbout, 8), pull(renderThread(defaultOpts, '', renderShowAll(showAll, req.url)), wrapPage('#' + channelId)), toPull(res, function (err) { @@ -324,6 +327,7 @@ exports.init = function (sbot, config) { pull.values(sort(links)), paramap(addAuthorAbout, 8), paramap(addBlog, 8), + paramap(addGatheringAbout, 8), format, toPull(res, function (err) { if (err) console.error('[viewer]', err) @@ -392,6 +396,21 @@ exports.init = function (sbot, config) { }) } + function addGatheringAbout(msg, cb) { + if (msg.value && msg.value.content.type === 'gathering') { + console.log('adding gathering abouts. msg:', msg) + getAbout(msg.key, (err, about) => { + if (err) { return cb(err) } + + msg.value.content.about = about + console.log('about gathering', about) + cb(null, msg) + }) + } else { + cb(null, msg) + } + } + function addGitLinks(msg, cb) { if (msg.value.content.type == 'git-update') getMsg(msg.value.content.repo, function (err, gitRepo) { diff --git a/render.js b/render.js index 56951e3..d9b75da 100644 --- a/render.js +++ b/render.js @@ -523,9 +523,25 @@ function render(opts, id, c) { return [channel, h('h2', c.title), s]; } + else if (c.type === 'gathering') { + console.log('opts', opts) + console.log('c', c) + + return ['id: ' + id, + h('div', + ['this is a gathering boopadoop', + renderGathering(opts, id, c)] + ) + ] + } else return renderDefault(c); } +function renderGathering(opts, id, c) { + console.log('gathering content:', c) + return h('div', c.about.description) +} + function renderPost(opts, id, c) { opts.mentions = {}; if (Array.isArray(c.mentions)) {