From e042fb79339f605bb9bea4d8d2e0c4db84d8ec89 Mon Sep 17 00:00:00 2001
From: Anders Rune Jensen <arj03@protonmail.ch>
Date: Thu, 8 Jun 2017 20:34:36 +0200
Subject: [PATCH] Move show all html stuff to render

---
 index.js  | 15 +++++++++------
 render.js |  8 ++++++++
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/index.js b/index.js
index 7a6c38d..6db10b7 100644
--- a/index.js
+++ b/index.js
@@ -16,7 +16,8 @@ var {
     formatMsgs,
     wrapPage,
     renderThread,
-    renderAbout
+    renderAbout,
+    renderShowAll
 } = require('./render');
 
 var appHash = hash([fs.readFileSync(__filename)])
@@ -93,8 +94,7 @@ exports.init = function (sbot, config) {
   function serveFeed(req, res, feedId) {
       console.log("serving feed: " + feedId)
 
-      var showAll = req.url.endsWith("?showAll")
-      var showAllHTML = showAll ? '' : '<br/><a href="' + req.url + '?showAll">Show whole feed</a>'
+      var showAll = req.url.endsWith("?showAll");
 
       getAbout(feedId, function (err, about) {
           if (err) return respond(res, 500, err.stack || err)
@@ -112,7 +112,9 @@ exports.init = function (sbot, config) {
 		      paramap(addFollowAbout, 8),
 		      paramap(addVoteMessage, 8),
 		      paramap(addGitLinks, 8),
-		      pull(renderAbout(defaultOpts, about, showAllHTML), wrapPage(about.name)),
+		      pull(renderAbout(defaultOpts, about,
+				       renderShowAll(showAll, req.url)),
+			   wrapPage(about.name)),
 		      toPull(res, function (err) {
 			  if (err) console.error('[viewer]', err)
 		      })
@@ -196,7 +198,6 @@ exports.init = function (sbot, config) {
       console.log("serving channel: " + channelId)
 
       var showAll = req.url.endsWith("?showAll")
-      var showAllHTML = showAll ? '' : '<br/><a href="' + req.url + '?showAll">Show whole feed</a>'
       
       pull(
 	  sbot.query.read({ limit: showAll ? 300 : 10, reverse: true, query: [{$filter: { value: { content: { channel: channelId }}}}]}),
@@ -209,7 +210,9 @@ exports.init = function (sbot, config) {
 		  pull.values(logs),
 		  paramap(addAuthorAbout, 8),
 		  paramap(addVoteMessage, 8),
-		  pull(renderThread(defaultOpts, showAllHTML), wrapPage('#' + channelId)),
+		  pull(renderThread(defaultOpts,
+				    renderShowAll(showAll, req.url)),
+		       wrapPage('#' + channelId)),
 		  toPull(res, function (err) {
 		      if (err) console.error('[viewer]', err)
 		  })
diff --git a/render.js b/render.js
index c3edca8..ca4a466 100644
--- a/render.js
+++ b/render.js
@@ -14,6 +14,7 @@ exports.renderEmoji = renderEmoji;
 exports.formatMsgs = formatMsgs;
 exports.renderThread = renderThread;
 exports.renderAbout = renderAbout;
+exports.renderShowAll = renderShowAll;
 
 function MdRenderer(opts) {
   marked.Renderer.call(this, {});
@@ -445,3 +446,10 @@ function renderPost(opts, c) {
 function renderDefault(c) {
   return h('pre', JSON.stringify(c, 0, 2));
 }
+
+function renderShowAll(showAll, url) {
+    if (showAll)
+	return '';
+    else
+	return '<br>' + h('a', { href : url + '?showAll' }, 'Show whole feed').outerHTML;
+}