From 7f394d03949443d633bc5e40439fd356ee474e66 Mon Sep 17 00:00:00 2001 From: Anders Rune Jensen Date: Fri, 12 May 2017 21:00:13 +0200 Subject: [PATCH 1/4] Better connected to pub message --- render.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/render.js b/render.js index 56cf513..cd7acd2 100644 --- a/render.js +++ b/render.js @@ -391,7 +391,6 @@ function render(opts, c) { return '' + "Created a git issue" + (c.repoName != undefined ? " in repo " + c.repoName : "") + renderPost(opts, c) + ''; - //renderDefault(c); } else if (c.type == "git-update") { return '' + @@ -408,9 +407,8 @@ function render(opts, c) { } else if (c.type == "pub") { return '' + - "Connected to a pub" + - '' + - renderDefault(c); + "Connected to the pub " + c.address.host + + '' } else if (c.type == "channel" && c.subscribed) return '' + From f49493c61faed9bcaac665b3e01ce9e8b78ad47e Mon Sep 17 00:00:00 2001 From: Anders Rune Jensen Date: Fri, 12 May 2017 21:02:56 +0200 Subject: [PATCH 2/4] Add git messages to user feed as well --- index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/index.js b/index.js index c7aab4a..b32cc86 100644 --- a/index.js +++ b/index.js @@ -177,6 +177,7 @@ exports.init = function (sbot, config) { paramap(addAuthorAbout, 8), paramap(addFollowAbout, 8), paramap(addVoteMessage, 8), + paramap(addGitLinks, 8), pull(renderThread(defaultOpts), wrapPage(name)), toPull(res, function (err) { if (err) console.error('[viewer]', err) From dffd43f062a271d3a9be609e1129bf5ad153a4ff Mon Sep 17 00:00:00 2001 From: Anders Rune Jensen Date: Fri, 12 May 2017 22:06:54 +0200 Subject: [PATCH 3/4] Let people name themselves and support description in about --- lib/about.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/about.js b/lib/about.js index 553135c..3e5a0b6 100644 --- a/lib/about.js +++ b/lib/about.js @@ -6,11 +6,12 @@ function linkDest(val) { } function reduceAbout(about, msg) { - var c = msg.value.content - if (!c) return about - if (c.name) about.name = c.name.replace(/^@?/, '@') - if (c.image) about.image = linkDest(c.image) - return about + var c = msg.value.content + if (!c) return about + if (c.name) about.name = c.name.replace(/^@?/, '@') + if (c.image) about.image = linkDest(c.image) + if (c.description) about.description = c.description + return about } module.exports = function (sbot, id, cb) { @@ -18,6 +19,7 @@ module.exports = function (sbot, id, cb) { pull( sbot.links({ rel: 'about', + source: id, dest: id, values: true, }), From c1b5c8d3560b86c156450c93e8be1a9fe4205a20 Mon Sep 17 00:00:00 2001 From: Anders Rune Jensen Date: Fri, 12 May 2017 22:28:57 +0200 Subject: [PATCH 4/4] render feed with about description and larger image on top --- index.js | 5 +++-- render.js | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index b32cc86..b09aa2c 100644 --- a/index.js +++ b/index.js @@ -15,7 +15,8 @@ var { renderEmoji, formatMsgs, wrapPage, - renderThread + renderThread, + renderAbout } = require('./render'); var appHash = hash([fs.readFileSync(__filename)]) @@ -108,7 +109,7 @@ exports.init = function (sbot, config) { paramap(addFollowAbout, 8), paramap(addVoteMessage, 8), paramap(addGitLinks, 8), - pull(renderThread(defaultOpts), wrapPage(about.name)), + pull(renderAbout(defaultOpts, about), wrapPage(about.name)), toPull(res, function (err) { if (err) console.error('[viewer]', err) }) diff --git a/render.js b/render.js index cd7acd2..46a4398 100644 --- a/render.js +++ b/render.js @@ -12,6 +12,7 @@ exports.MdRenderer = MdRenderer; exports.renderEmoji = renderEmoji; exports.formatMsgs = formatMsgs; exports.renderThread = renderThread; +exports.renderAbout = renderAbout; function MdRenderer(opts) { marked.Renderer.call(this, {}); @@ -94,6 +95,30 @@ function wrap(before, after) { }; } +function renderAbout(opts, about) { + return pull( + pull.map(renderMsg.bind(this, opts)), + wrap( + 'You are reading content from ' + + 'Scuttlebutt' + + '' + + '
' + + '
' + + '
' + + 'Feed of ' + about.name + '
' + + (about.description != undefined ? + marked(about.description, opts.marked) : '') + + '
', + + '
' + + '' + + 'Join Scuttlebutt now' + + '' + ) + ); +} + function renderThread(opts) { return pull( pull.map(renderMsg.bind(this, opts)),