Merge branch 'master' into exif-rotation

1 files changed, 126 insertions, 38 deletions

diff --git a/lib/serve.js b/lib/serve.js
index 25969c9..9228335 100644
--- a/lib/serve.js
+++ b/lib/serve.js
@@ -286,6 +286,7 @@ Serve.prototype.path = function (url) {
     case '/live': return this.live(m[2])
     case '/compose': return this.compose(m[2])
     case '/emojis': return this.emojis(m[2])
+    case '/votes': return this.votes(m[2])
   }
   m = /^(\/?[^\/]*)(\/.*)?$/.exec(url)
   switch (m[1]) {
@@ -528,6 +529,90 @@ Serve.prototype.compose = function (ext) {
   })
 }
 
+Serve.prototype.votes = function (path) {
+  if (path) return pull(
+    pull.once(u.renderError(new Error('Not implemented')).outerHTML),
+    this.wrapPage('#' + channel),
+    this.respondSink(404, {'Content-Type': ctype('html')})
+  )
+
+  var self = this
+  var q = self.query
+  var opts = {
+    reverse: !q.forwards,
+    limit: Number(q.limit) || 50,
+  }
+  var gt = Number(q.gt)
+  if (gt) opts.gt = gt
+  var lt = Number(q.lt)
+  if (lt) opts.lt = lt
+
+  self.app.getVoted(opts, function (err, voted) {
+    if (err) return pull(
+      pull.once(u.renderError(err).outerHTML),
+      self.wrapPage('#' + channel),
+      self.respondSink(500, {'Content-Type': ctype('html')})
+    )
+
+    pull(
+      ph('table', [
+        ph('thead', [
+          ph('tr', [
+            ph('td', {colspan: 2}, self.syncPager({
+              first: voted.firstTimestamp,
+              last: voted.lastTimestamp,
+            }))
+          ])
+        ]),
+        ph('tbody', pull(
+          pull.values(voted.items),
+          paramap(function (item, cb) {
+            cb(null, ph('tr', [
+              ph('td', [String(item.value)]),
+              ph('td', [
+                self.phIdLink(item.id),
+                pull.once(' dug by '),
+                self.renderIdsList()(pull.values(item.feeds))
+              ])
+            ]))
+          }, 8)
+        )),
+        ph('tfoot', {}, []),
+      ]),
+      self.wrapPage('votes'),
+      self.respondSink(200, {
+        'Content-Type': ctype('html')
+      })
+    )
+  })
+}
+
+Serve.prototype.syncPager = function (opts) {
+  var q = this.query
+  var reverse = !q.forwards
+  var min = (reverse ? opts.last : opts.first) || Number(q.gt)
+  var max = (reverse ? opts.first : opts.last) || Number(q.lt)
+  var minDate = new Date(min)
+  var maxDate = new Date(max)
+  var qOlder = mergeOpts(q, {lt: min, gt: undefined, forwards: undefined})
+  var qNewer = mergeOpts(q, {gt: max, lt: undefined, forwards: 1})
+  var atNewest = reverse ? !q.lt : !max
+  var atOldest = reverse ? !min : !q.gt
+  if (atNewest && !reverse) qOlder.lt++
+  if (atOldest && reverse) qNewer.gt--
+  return h('div',
+    atOldest ? 'oldest' : [
+      h('a', {href: '?' + qs.stringify(qOlder)}, '<<'), ' ',
+      h('span', {title: minDate.toString()}, htime(minDate)), ' ',
+    ],
+    ' - ',
+    atNewest ? 'now' : [
+      h('span', {title: maxDate.toString()}, htime(maxDate)), ' ',
+      h('a', {href: '?' + qs.stringify(qNewer)}, '>>')
+    ]
+  ).outerHTML
+}
+
 Serve.prototype.peers = function (ext) {
   var self = this
   if (self.data.action === 'connect') {
@@ -622,14 +707,6 @@ Serve.prototype.channels = function (ext) {
   )
 }
 
-Serve.prototype.phIdLink = function (id) {
-  return pull(
-    pull.once(id),
-    pull.asyncMap(this.renderIdLink.bind(this)),
-    pull.map(u.toHTML)
-  )
-}
-
 Serve.prototype.contacts = function (path) {
   var self = this
   var id = String(path).substr(1)
@@ -949,14 +1026,13 @@ Serve.prototype.blob = function (id) {
   var self = this
   var blobs = self.app.sbot.blobs
   if (self.req.headers['if-none-match'] === id) return self.respond(304)
-  var done = multicb({pluck: 1, spread: true})
-  blobs.want(id, function (err, has) {
+  self.app.wantSizeBlob(id, function (err, size) {
     if (err) {
       if (/^invalid/.test(err.message)) return self.respond(400, err.message)
       else return self.respond(500, err.message || err)
     }
-    if (!has) return self.respond(404, 'Not found')
 
+    var done = multicb({pluck: 1, spread: true})
     var heresTheData = done()
     var heresTheType = done().bind(self, null)
 
@@ -1186,6 +1262,7 @@ Serve.prototype.wrapPage = function (title, searchQ) {
           h('a', {href: render.toUrl('/advsearch')}, 'search'), ' ',
           h('a', {href: render.toUrl('/live')}, 'live'), ' ',
           h('a', {href: render.toUrl('/compose')}, 'compose'), ' ',
+          h('a', {href: render.toUrl('/votes')}, 'votes'), ' ',
           h('a', {href: render.toUrl('/emojis')}, 'emojis'), ' ',
           render.idLink(self.app.sbot.id, done()), ' ',
           h('input.search-input', {name: 'q', value: searchQ,
@@ -1206,25 +1283,18 @@ Serve.prototype.wrapPage = function (title, searchQ) {
   )
 }
 
-Serve.prototype.renderIdLink = function (id, cb) {
-  var render = this.app.render
-  var el = render.idLink(id, function (err) {
-    if (err || !el) {
-      el = h('a', {href: render.toUrl(id)}, id)
-    }
-    cb(null, el)
-  })
+Serve.prototype.phIdLink = function (id) {
+  return pull(
+    pull.once(id),
+    this.renderIdsList()
+  )
 }
 
 Serve.prototype.friends = function (path) {
   var self = this
   pull(
     self.app.sbot.friends.createFriendStream({hops: 1}),
-    self.renderFriends(),
-    pull.map(function (el) {
-      return [el, ' ']
-    }),
-    pull.map(u.toHTML),
+    self.renderIdsList(),
     u.hyperwrap(function (items, cb) {
       cb(null, [
         h('section',
@@ -1240,14 +1310,17 @@ Serve.prototype.friends = function (path) {
   )
 }
 
-Serve.prototype.renderFriends = function () {
+Serve.prototype.renderIdsList = function () {
   var self = this
-  return paramap(function (id, cb) {
-    self.renderIdLink(id, function (err, el) {
-      if (err) el = u.renderError(err, ext)
-      cb(null, el)
-    })
-  }, 8)
+  return pull(
+    paramap(function (id, cb) {
+      self.app.render.getNameLink(id, cb)
+    }, 8),
+    pull.map(function (el) {
+      return [el, ' ']
+    }),
+    pull.map(u.toHTML)
+  )
 }
 
 var relationships = [
@@ -1461,7 +1534,23 @@ Serve.prototype.gitCommit = function (rev) {
               pull.once(commit.tree),
               self.gitObjectLinks(obj.msg.key, 'tree')
             )]) : '',
-            h('pre', self.app.render.linkify(commit.body)).outerHTML,
+            h('blockquote',
+               self.app.render.gitCommitBody(commit.body)).outerHTML,
+            ph('h4', 'files'),
+            ph('table', pull(
+              self.app.git.readCommitChanges(commit),
+              pull.map(function (file) {
+                return ph('tr', [
+                  ph('td', ph('code', u.escapeHTML(file.name))),
+                  // ph('td', ph('code', u.escapeHTML(JSON.stringify(file.msg)))),
+                  ph('td', file.deleted ? 'deleted'
+                         : file.created ? 'created'
+                         : file.hash ? 'changed'
+                         : file.mode ? 'mode changed'
+                         : JSON.stringify(file))
+                ])
+              })
+            ))
           ]
         ]),
         self.wrapPage('git commit ' + rev),
@@ -1594,20 +1683,19 @@ Serve.prototype.gitTree = function (rev) {
               })
             }, 8),
             pull.map(function (item) {
-              var type = item.mode === 0040000 ? 'tree' :
-                        item.mode === 0160000 ? 'commit' : 'blob'
               if (!item.msg) return ph('tr', [
                 ph('td',
-                  u.escapeHTML(item.name) + (type === 'tree' ? '/' : '')),
+                  u.escapeHTML(item.name) + (item.type === 'tree' ? '/' : '')),
+                ph('td', u.escapeHTML(item.hash)),
                 ph('td', 'missing')
               ])
-              var path = '/git/' + type + '/' + item.hash
+              var path = '/git/' + item.type + '/' + item.hash
                 + '?msg=' + encodeURIComponent(item.msg.key)
               var fileDate = new Date(item.msg.value.timestamp)
               return ph('tr', [
                 ph('td',
                   ph('a', {href: self.app.render.toUrl(path)},
-                    u.escapeHTML(item.name) + (type === 'tree' ? '/' : ''))),
+                    u.escapeHTML(item.name) + (item.type === 'tree' ? '/' : ''))),
                 ph('td',
                   self.phIdLink(item.msg.value.author)),
                 ph('td',
@@ -1770,7 +1858,7 @@ Serve.prototype.askWantBlobsForm = function (links) {
         if (!u.isRef(link.link)) return
         return ph('tr', [
           ph('td', ph('code', link.link)),
-          ph('td', self.app.render.formatSize(link.size)),
+          !isNaN(link.size) ? ph('td', self.app.render.formatSize(link.size)) : '',
         ])
       })),
       ph('input', {type: 'hidden', name: 'action', value: 'want-blobs'}),