Merge commit 'c1b5c8d'

For About data, use most popular (d87029da1c)
instead of self-picked (dffd43f062)

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)
 		      })
@@ -177,6 +178,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)

lib/about.js

@@ -14,6 +14,7 @@ module.exports = function (sbot, id, cb) {
   pull(
     sbot.links({
       rel: 'about',
+      source: id,
       dest: id,
       values: true,
     }), 
@@ -24,6 +25,7 @@ module.exports = function (sbot, id, cb) {
       var feedAbout = aboutByFeed[author] || (aboutByFeed[author] = {})
       if (c.name) feedAbout.name = c.name.replace(/^@?/, '@')
       if (c.image) feedAbout.image = linkDest(c.image)
+      if (c.description) feedAbout.description = c.description
     }, function (err) {
       if (err) return cb(err)
       // Use whatever properties have the most counts.

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(
+      '<span class="top-tip">You are reading content from ' +
+        '<a href="https://www.scuttlebutt.nz">Scuttlebutt</a>' +
+      '</span>' +
+      '<main>' +
+      '<article><header><figure>' +
+      '<img src="' + opts.img_base + escape(about.image) + '" ' +
+            'height="200" width="200"><figcaption>' +
+	    'Feed of ' + about.name + '<br/>' +
+	    (about.description != undefined ? 
+	     marked(about.description, opts.marked) : '') +
+	    '</figcaption></figure></header></article>', 
+
+      '</main>' +
+      '<a class="call-to-action" href="https://www.scuttlebutt.nz">' +
+        'Join Scuttlebutt now' +
+      '</a>'
+    )
+  );
+}
+
 function renderThread(opts) {
   return pull(
     pull.map(renderMsg.bind(this, opts)),
@@ -391,7 +416,6 @@ function render(opts, c) {
     return '<span class="status">' +
       "Created a git issue" + (c.repoName != undefined ? " in repo " + c.repoName : "") + renderPost(opts, c) +
       '</span>';
-      //renderDefault(c);
   }
   else if (c.type == "git-update") {
     return '<span class="status">' +
@@ -408,9 +432,8 @@ function render(opts, c) {
   }
   else if (c.type == "pub") {
     return '<span class="status">' +
-      "Connected to a pub" +
-      '</span>' +
-      renderDefault(c);
+      "Connected to the pub " + c.address.host +
+      '</span>'
   }
   else if (c.type == "channel" && c.subscribed)
     return '<span class="status">' +