From 4f7d162bf1625d6dc4e8e518f55ee5d842d12bc2 Mon Sep 17 00:00:00 2001 From: Anders Rune Jensen Date: Thu, 11 May 2017 21:45:07 +0200 Subject: [PATCH] Refactor --- index.js | 52 +++++++++++++--------------------------------------- 1 file changed, 13 insertions(+), 39 deletions(-) diff --git a/index.js b/index.js index 34b5f8b..c634818 100644 --- a/index.js +++ b/index.js @@ -47,6 +47,19 @@ exports.init = function (sbot, config) { emoji_base: conf.emoji_base || (base + 'emoji/'), } + defaultOpts.marked = { + gfm: true, + mentions: true, + tables: true, + breaks: true, + pedantic: false, + sanitize: true, + smartLists: true, + smartypants: false, + emoji: renderEmoji, + renderer: new MdRenderer(defaultOpts) + } + var getMsg = memo({cache: lru(100)}, getMsgWithValue, sbot) var getAbout = memo({cache: lru(100)}, require('./lib/about'), sbot) @@ -81,19 +94,6 @@ exports.init = function (sbot, config) { var opts = defaultOpts - opts.marked = { - gfm: true, - mentions: true, - tables: true, - breaks: true, - pedantic: false, - sanitize: true, - smartLists: true, - smartypants: false, - emoji: renderEmoji, - renderer: new MdRenderer(opts) - } - getAbout(feedId, function (err, about) { if (err) return cb(err) @@ -162,19 +162,6 @@ exports.init = function (sbot, config) { function serveFeeds(req, res, following, channelSubscriptions, feedId, name) { var opts = defaultOpts - opts.marked = { - gfm: true, - mentions: true, - tables: true, - breaks: true, - pedantic: false, - sanitize: true, - smartLists: true, - smartypants: false, - emoji: renderEmoji, - renderer: new MdRenderer(opts) - } - pull( sbot.createLogStream({ reverse: true, limit: 2500 }), pull.filter((msg) => { @@ -208,19 +195,6 @@ exports.init = function (sbot, config) { var opts = defaultOpts - opts.marked = { - gfm: true, - mentions: true, - tables: true, - breaks: true, - pedantic: false, - sanitize: true, - smartLists: true, - smartypants: false, - emoji: renderEmoji, - renderer: new MdRenderer(opts) - } - pull( sbot.query.read({ limit: 500, reverse: true, query: [{$filter: { value: { content: { channel: channelId }}}}]}), pull.collect(function (err, logs) {