From e6bc3b037ac455d656641e9e03e1ccba0a440ea0 Mon Sep 17 00:00:00 2001 From: Anders Rune Jensen Date: Thu, 11 Jan 2018 16:20:07 +0100 Subject: [PATCH] Don't render channel subscribes in user-feed --- index.js | 10 ++++++++-- render.js | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index 95aa160..c8c183c 100644 --- a/index.js +++ b/index.js @@ -175,13 +175,19 @@ exports.init = function (sbot, config) { } }) - serveFeeds(req, res, following, channelSubscriptions, feedId, 'user feed ' + (about ? about.name : "")) + serveFeeds(req, res, following, channelSubscriptions, feedId, + 'user feed ' + (about ? about.name : "")) }) ) }) } function serveFeeds(req, res, following, channelSubscriptions, feedId, name) { + var feedOpts = Object.assign({}, defaultOpts, { + renderPrivate: false, + renderSubscribe: false + }) + pull( sbot.createLogStream({ reverse: true, limit: 5000 }), pull.filter((msg) => { @@ -201,7 +207,7 @@ exports.init = function (sbot, config) { paramap(addFollowAbout, 8), paramap(addVoteMessage, 8), paramap(addGitLinks, 8), - pull(renderThread(Object.assign({}, defaultOpts, { renderPrivate: false })), wrapPage(name)), + pull(renderThread(feedOpts), wrapPage(name)), toPull(res, function (err) { if (err) console.error('[viewer]', err) }) diff --git a/render.js b/render.js index 5749bcb..0eaac12 100644 --- a/render.js +++ b/render.js @@ -350,7 +350,9 @@ function docWrite(str) { function renderMsg(opts, id, msg) { if (opts.renderPrivate == false && typeof(msg.value.content) == 'string') return '' + if (opts.renderSubscribe == false && msg.value.content.type == "channel" && msg.value.content.subscribed != undefined) return '' if (msg.author.publicWebHosting === false) return h('article', 'User has chosen not to be hosted publicly').outerHTML; + var c = msg.value.content || {}; var name = encodeURIComponent(msg.key); return h('article#' + name,