diff --git a/index.js b/index.js index e29f56b..eeabc4b 100644 --- a/index.js +++ b/index.js @@ -107,9 +107,6 @@ exports.init = function (sbot, config) { case 'rss': return pull( // formatMsgs(feedId, ext, defaultOpts) - pull.filter( (msg) => { - return !!renderRssContent(defaultOpts, msg.value.content || {}); - }), renderRssItem(defaultOpts), wrapRss(about.name, defaultOpts) ); default: diff --git a/render.js b/render.js index d2a20f8..5bdf045 100644 --- a/render.js +++ b/render.js @@ -15,7 +15,6 @@ exports.renderThread = renderThread; exports.renderAbout = renderAbout; exports.renderRssItem = renderRssItem; exports.wrapRss = wrapRss; -exports.renderRssContent = renderRssContent; function MdRenderer(opts) { marked.Renderer.call(this, {}); @@ -367,73 +366,11 @@ function renderMsg(opts, msg) { ); } -function renderRssContent(opts, c) { - var base = opts.base; - if (c.type === "post") { - return (c.channel ? `Posted in #${c.channel}:\n\n` : '') + c.text; - } else if (c.type == "vote" && c.vote.expression == "Dig") { - var linkedText = "a post"; - if (typeof c.vote.linkedText != "undefined") { - linkedText = c.vote.linkedText.substring(0, 75); - } - - return `Liked ${linkedText}`; - } else if (c.type == "vote") { - var linkedText = "a post"; - if (typeof c.vote.linkedText != "undefined") { - linkedText = c.vote.linkedText.substring(0, 75); - } - - return `Voted ${linkedText}`; - } else if (c.type == "contact" && c.following) { - var name = c.contact; - if (typeof c.contactAbout != "undefined") { - name = c.contactAbout.name; - } - - return `Followed ${name}`; - } else if (c.type == "contact" && !c.following) { - var name = c.contact; - if (typeof c.contactAbout != "undefined") { - name = c.contactAbout.name; - } - - return `Unfollowed ${name}`; - } else if (typeof c == "string") { - // Don't show private messages in RSS. - } - else if (c.type == "about") { - // Don't show about messages in RSS. - } - else if (c.type == "issue") { - return `Created a git issue ${(c.repoName != undefined ? " in repo " + c.repoName : "")}`; - } - else if (c.type == "git-update") { - return `Did a git update ${(c.repoName != undefined ? " in repo " + c.repoName : "")} - - ${(c.commits != undefined ? c.commits.map(com => { return "-" +com.title; }).join("\n") : "")} - `; - } - else if (c.type == "ssb-dns") { - // Don't show for RSS. - } - else if (c.type == "pub") { - return `Connected to the pub ${c.address.host}`; - } - else if (c.type == "channel" && c.subscribed) { - return `Subscribed to channel #${c.channel}`; - } - else if (c.type == "channel" && !c.subscribed) { - return `Unsubscribed from channel #${c.channel}`; - } - -} - function renderRss(opts, msg) { var c = msg.value.content || {}; var name = encodeURIComponent(msg.key); - let content = renderRssContent(opts, c); + let content = render(opts, c); if (!content) { return null; @@ -441,7 +378,7 @@ function renderRss(opts, msg) { return ( '' + - '' + msg.author.name + ' - ' + escape(content.substring(0, 25)) + '... ' + + '' + msg.author.name + ' | ' + c.type + '' + '' + '' + opts.base + escape(name) + '' + '' + new Date(msg.value.timestamp).toUTCString() + '' +