Improve rendering issue updates

1 files changed, 8 insertions, 8 deletions

diff --git a/lib/render-msg.js b/lib/render-msg.js
index b150522..017e8f6 100644
--- a/lib/render-msg.js
+++ b/lib/render-msg.js
@@ -106,8 +106,7 @@ RenderMsg.prototype.wrap = function (content, cb) {
         }, htime(date)), ' ',
         h('code', h('a.ssb-id',
           {href: this.toUrl(this.msg.key)}, this.msg.key)),
-        channel ? [' ', h('a', {href: this.toUrl(channel)}, channel)] : ''),
-        this.issues(done())),
+        channel ? [' ', h('a', {href: this.toUrl(channel)}, channel)] : '')),
     h('td.msg-right', this.msg.key ?
       h('form', {method: 'post', action: '/vote'},
         this.msg.rel ? [this.msg.rel, ' '] : '',
@@ -117,7 +116,9 @@ RenderMsg.prototype.wrap = function (content, cb) {
       this.msg.rel ? [this.msg.rel, ' '] : ''
     ])
   ), h('tr',
-    h('td.msg-content', {colspan: 2}, content)
+    h('td.msg-content', {colspan: 2},
+      this.issues(done()),
+      content)
   )])
   done(cb)
 }
@@ -138,6 +139,7 @@ RenderMsg.prototype.wrapMini = function (content, cb) {
         title: date.toLocaleString(),
         href: this.msg.key ? this.toUrl(this.msg.key) : undefined
       }, htime(date)), ' ',
+      this.issues(done()),
       content),
     h('td.msg-right', this.msg.key ?
       h('form', {method: 'post', action: '/vote'},
@@ -446,15 +448,13 @@ RenderMsg.prototype.issues = function (cb) {
       issue.label ? h('q', issue.label) : ''] : ''
     if (issue.merged === true)
       return h('div',
-        'merged ', self.link1(issue, done()),
-        commit ? [' in ', commit] : '')
+        'merged ', self.link1(issue, done()))
     if (issue.open === false)
       return h('div',
-        'closed ', self.link1(issue, done()),
-        commit ? [' in ', commit] : '')
+        'closed ', self.link1(issue, done()))
   })
   done(cb)
-  return els
+  return els.length > 0 ? [els, h('br')] : ''
 }
 
 RenderMsg.prototype.repost = function (cb) {