From bc7454fa1db558e89c8e8069d527c7b74a4ce60a Mon Sep 17 00:00:00 2001 From: cel Date: Mon, 8 Jan 2018 15:48:04 -1000 Subject: Use readTreeFull and pull-catch --- lib/serve.js | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) (limited to 'lib/serve.js') diff --git a/lib/serve.js b/lib/serve.js index 7c42d0c..eb8610c 100644 --- a/lib/serve.js +++ b/lib/serve.js @@ -22,6 +22,7 @@ var ph = require('pull-hyperscript') var emojis = require('emoji-named-characters') var jpeg = require('jpeg-autorotate') var unzip = require('unzip') +var Catch = require('pull-catch') module.exports = Serve @@ -1788,7 +1789,12 @@ Serve.prototype.gitCommit = function (rev) { : file.mode ? 'mode changed' : JSON.stringify(file)) ]) - }) + }), + Catch(function (err) { + if (err && err.name === 'ObjectNotFoundError') return + if (err && err.name === 'BlobNotFoundError') return self.askWantBlobsForm(err.links) + return false + }) )) ] ]), @@ -1909,23 +1915,8 @@ Serve.prototype.gitTree = function (rev) { ]), missingBlobs ? self.askWantBlobsForm(missingBlobs) : ph('table', [ pull( - self.app.git.readTree(obj), - paramap(function (file, cb) { - self.app.git.getObjectMsg({ - obj: file.hash, - headMsgId: obj.msg.key, - }, function (err, msg) { - if (err && err.name === 'ObjectNotFoundError') return cb(null, file) - if (err && err.name === 'BlobNotFoundError') return cb(null, {missingBlobs: err.links}) - if (err) return cb(err) - file.msg = msg - cb(null, file) - }) - }, 8), + self.app.git.readTreeFull(obj), pull.map(function (item) { - if (item.missingBlobs) { - return self.askWantBlobsForm(item.missingBlobs) - } if (!item.msg) return ph('tr', [ ph('td', u.escapeHTML(item.name) + (item.type === 'tree' ? '/' : '')), @@ -1950,7 +1941,12 @@ Serve.prototype.gitTree = function (rev) { }, htime(fileDate)) ), ]) - }) + }), + Catch(function (err) { + if (err && err.name === 'ObjectNotFoundError') return + if (err && err.name === 'BlobNotFoundError') return self.askWantBlobsForm(err.links) + return false + }) ) ]), ]), -- cgit v1.2.3 From 27f1966a6512bd07a9fe91717a46d1a95281da32 Mon Sep 17 00:00:00 2001 From: cel Date: Mon, 8 Jan 2018 16:10:21 -1000 Subject: Render markdown files in git repos --- lib/serve.js | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'lib/serve.js') diff --git a/lib/serve.js b/lib/serve.js index eb8610c..f146c49 100644 --- a/lib/serve.js +++ b/lib/serve.js @@ -2332,6 +2332,16 @@ Serve.prototype.wrapBinary = function (opts) { src: opts.rawUrl }) } + if (type === 'text/markdown') { + // TODO: rewrite links to files/images to be correct + return ph('blockquote', u.readNext(function (cb) { + pull.collect(function (err, bufs) { + if (err) return cb(pull.error(err)) + var text = Buffer.concat(bufs).toString('utf8') + return cb(null, pull.once(self.app.render.markdown(text))) + })(read) + })) + } return ph('pre', pull.map(function (buf) { return self.app.render.highlight(buf.toString('utf8'), ext) })(read)) -- cgit v1.2.3 From f752c762185f7493a5420f461bc8e766db84fc60 Mon Sep 17 00:00:00 2001 From: cel Date: Mon, 8 Jan 2018 17:17:18 -1000 Subject: Render git diffs --- lib/serve.js | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++++- package-lock.json | 4 ++ package.json | 1 + static/styles.css | 3 + 4 files changed, 187 insertions(+), 2 deletions(-) (limited to 'lib/serve.js') diff --git a/lib/serve.js b/lib/serve.js index f146c49..de2757e 100644 --- a/lib/serve.js +++ b/lib/serve.js @@ -23,6 +23,7 @@ var emojis = require('emoji-named-characters') var jpeg = require('jpeg-autorotate') var unzip = require('unzip') var Catch = require('pull-catch') +var Diff = require('diff') module.exports = Serve @@ -1648,6 +1649,7 @@ Serve.prototype.git = function (url) { case 'tree': return this.gitTree(m[2]) case 'blob': return this.gitBlob(m[2]) case 'raw': return this.gitRaw(m[2]) + case 'diff': return this.gitDiff(m[2]) default: return this.respond(404, 'Not found') } } @@ -1782,10 +1784,14 @@ Serve.prototype.gitCommit = function (rev) { 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.hash ? + ph('a', {href: + self.app.render.toUrl('/git/diff/' + + file.hash[0] + '..' + file.hash[1] + + '?msg=' + encodeURIComponent(obj.msg.key)) + }, 'changed') : file.mode ? 'mode changed' : JSON.stringify(file)) ]) @@ -2016,6 +2022,177 @@ Serve.prototype.gitBlob = function (rev) { }) } +Serve.prototype.gitDiff = function (revs) { + var self = this + var parts = revs.split('..') + if (parts.length !== 2) return pull( + ph('div.error', 'revs should be ..'), + self.wrapPage('git diff'), + self.respondSink(400) + ) + var rev1 = parts[0] + var rev2 = parts[1] + if (!/[0-9a-f]{24}/.test(rev1)) return pull( + ph('div.error', 'rev 1 is not a git object id'), + self.wrapPage('git diff'), + self.respondSink(400) + ) + if (!/[0-9a-f]{24}/.test(rev2)) return pull( + ph('div.error', 'rev 2 is not a git object id'), + self.wrapPage('git diff'), + self.respondSink(400) + ) + + if (!u.isRef(self.query.msg)) return pull( + ph('div.error', 'missing message id'), + self.wrapPage('git diff'), + self.respondSink(400) + ) + + var done = multicb({pluck: 1, spread: true}) + // the msg qs param should point to the message for rev2 object. the msg for + // rev1 object we will have to look up. + self.app.git.getObjectMsg({ + obj: rev1, + headMsgId: self.query.msg, + type: 'blob', + }, done()) + self.getMsgDecryptedMaybeOoo(self.query.msg, done()) + done(function (err, msg1, msg2) { + if (err) return pull( + pull.once(u.renderError(err).outerHTML), + self.wrapPage('git diff ' + revs), + self.respondSink(400) + ) + var msg1Date = new Date(msg1.value.timestamp) + var msg2Date = new Date(msg2.value.timestamp) + var revsShort = rev1.substr(0, 8) + '..' + rev2.substr(0, 8) + pull( + ph('section', [ + ph('h3', ph('a', {href: ''}, revsShort)), + ph('div', [ + ph('a', { + href: self.app.render.toUrl('/git/blob/' + rev1 + '?msg=' + encodeURIComponent(msg1.key)) + }, rev1), ' ', + self.phIdLink(msg1.value.author), ' ', + ph('a', { + href: self.app.render.toUrl(msg1.key), + title: msg1Date.toLocaleString(), + }, htime(msg1Date)) + ]), + ph('div', [ + ph('a', { + href: self.app.render.toUrl('/git/blob/' + rev2 + '?msg=' + encodeURIComponent(msg2.key)) + }, rev2), ' ', + self.phIdLink(msg2.value.author), ' ', + ph('a', { + href: self.app.render.toUrl(msg2.key), + title: msg2Date.toLocaleString(), + }, htime(msg2Date)) + ]), + u.readNext(function (cb) { + var done = multicb({pluck: 1, spread: true}) + self.app.git.openObject({ + obj: rev1, + msg: msg1.key, + }, done()) + self.app.git.openObject({ + obj: rev2, + msg: msg2.key, + }, done()) + done(function (err, obj1, obj2) { + if (err && err.name === 'BlobNotFoundError') + return cb(null, self.askWantBlobsForm(err.links)) + if (err) return cb(err) + + var done = multicb({pluck: 1, spread: true}) + pull.collect(done())(self.app.git.readObject(obj1)) + pull.collect(done())(self.app.git.readObject(obj2)) + done(function (err, bufs1, bufs2) { + if (err) return cb(err) + var str1 = Buffer.concat(bufs1, obj1.length).toString('utf8') + var str2 = Buffer.concat(bufs2, obj2.length).toString('utf8') + var diff = Diff.structuredPatch('', '', str1, str2) + cb(null, self.gitDiffTable(diff)) + }) + }) + }) + ]), + self.wrapPage('git diff'), + self.respondSink(200) + ) + }) +} + +Serve.prototype.gitDiffTable = function (diff) { + var self = this + return pull( + ph('table', [ + ph('tr', [ + ]), + pull( + pull.values(diff.hunks), + pull.map(function (hunk) { + var oldLine = hunk.oldStart + var newLine = hunk.newStart + return [ + ph('tr', [ + ph('td', {colspan: 2}), + ph('td', ph('pre', + '@@ -' + oldLine + ',' + hunk.oldLines + ' ' + + '+' + newLine + ',' + hunk.newLines + ' @@')) + ]), + pull( + pull.values(hunk.lines), + pull.map(function (line) { + var s = line[0] + if (s == '\\') return + var html = self.app.render.highlight(line) + var lineNums = [s == '+' ? '' : oldLine++, s == '-' ? '' : newLine++] + // var id = [filename].concat(lineNums).join('-') + var newLineNum = lineNums[lineNums.length-1] + return ph('tr', { + class: s == '+' ? 'diff-new' : s == '-' ? 'diff-old' : '' + }, [ + lineNums.map(function (num, i) { + return ph('td', String(num)) + // TODO: allow linking to comments + /* + var idEnc = encodeURIComponent(id) + return '' + + (num ? '' + + num + '' + + (updateId && i === lineNums.length-1 && s !== '-' ? + ' …' + : '') + : '') + '' + } + */ + }), + ph('td', ph('pre', u.escapeHTML(html))) + ]) + + // TODO: line-comments + /* + (lineCommentThreads[newLineNum] ? + '' + + lineCommentThreads[newLineNum] + + '' + : commit && query.comment === id ? + '' + + forms.lineComment(req, repo, updateId, commit, filename, newLineNum) + + '' + : '') + */ + }) + ) + ] + }) + ) + ]) + ) +} + Serve.prototype.gitObjectLinks = function (headMsgId, type) { var self = this return paramap(function (id, cb) { diff --git a/package-lock.json b/package-lock.json index 8d381d4..3a9bf62 100644 --- a/package-lock.json +++ b/package-lock.json @@ -180,6 +180,10 @@ "streamsearch": "0.1.2" } }, + "diff": { + "version": "3.3.1", + "resolved": "http://localhost:8989/blobs/get/&+6G9mvp4Q/5bujMKlbFdbrub2IXMPleXIqTqyyvY5Ww=.sha256" + }, "ed2curve": { "version": "0.1.4", "resolved": "http://localhost:8989/blobs/get/&X6VtEiGqSVFiIHAZAXFZXB5q9iUd3gULIU9c0xyynNo=.sha256", diff --git a/package.json b/package.json index 62ec8d9..65ae820 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "asyncmemo": "^1.1.0", "base64-url": "^2.0.0", "busboy": "^0.2.14", + "diff": "^3.3.1", "emoji-named-characters": "^1.0.2", "emoji-server": "^1.0.0", "hashlru": "^2.1.0", diff --git a/static/styles.css b/static/styles.css index c26cf59..b22074f 100644 --- a/static/styles.css +++ b/static/styles.css @@ -193,3 +193,6 @@ table.ssb-object td { .chess-square-dark { background-color: #ccc; } + +.diff-old { background-color: #ffe2dd; } +.diff-new { background-color: #d1ffd6; } -- cgit v1.2.3 From 498eaa3edf1241abdc6180410db97254c70e2185 Mon Sep 17 00:00:00 2001 From: cel Date: Mon, 8 Jan 2018 17:26:36 -1000 Subject: Linkify newly created git blobs --- lib/serve.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib/serve.js') diff --git a/lib/serve.js b/lib/serve.js index de2757e..fb57bf7 100644 --- a/lib/serve.js +++ b/lib/serve.js @@ -1785,7 +1785,12 @@ Serve.prototype.gitCommit = function (rev) { return ph('tr', [ ph('td', ph('code', u.escapeHTML(file.name))), ph('td', file.deleted ? 'deleted' - : file.created ? 'created' + : file.created ? + ph('a', {href: + self.app.render.toUrl('/git/blob/' + + file.hash[0] + + '?msg=' + encodeURIComponent(obj.msg.key)) + }, 'created') : file.hash ? ph('a', {href: self.app.render.toUrl('/git/diff/' -- cgit v1.2.3 From cbf9a1d87eb43eaea73e6c019e7b4a2dca3bbaa6 Mon Sep 17 00:00:00 2001 From: cel Date: Mon, 8 Jan 2018 19:11:15 -1000 Subject: Render line-comment messages --- lib/app.js | 2 +- lib/render-msg.js | 36 ++++++++++++++++++++++++++++++++++++ lib/serve.js | 1 + 3 files changed, 38 insertions(+), 1 deletion(-) (limited to 'lib/serve.js') diff --git a/lib/app.js b/lib/app.js index 1d9b80f..21f45a4 100644 --- a/lib/app.js +++ b/lib/app.js @@ -101,7 +101,7 @@ App.prototype.error = console.error.bind(console, logPrefix) App.prototype.unboxMsg = function (msg, cb) { var self = this - var c = msg.value && msg.value.content + var c = msg && msg.value && msg.value.content if (typeof c !== 'string') cb(null, msg) else self.unboxContent(c, function (err, content) { if (err) { diff --git a/lib/render-msg.js b/lib/render-msg.js index d4ad670..0835fee 100644 --- a/lib/render-msg.js +++ b/lib/render-msg.js @@ -10,6 +10,7 @@ function RenderMsg(render, app, msg, opts) { this.render = render this.app = app this.msg = msg + this.serve = opts.serve this.value = msg && msg.value || {} var content = this.value.content this.c = content || {} @@ -20,6 +21,13 @@ function RenderMsg(render, app, msg, opts) { this.shouldWrap = this.opts.wrap !== false } +RenderMsg.prototype.getMsg = function (id, cb) { + if (!id) return cb() + return this.serve + ? this.serve.getMsgDecryptedMaybeOoo(id, cb) + : this.app.getMsgDecryptedOoo(id, cb) +} + RenderMsg.prototype.toUrl = function (href) { return this.render.toUrl(href) } @@ -287,6 +295,7 @@ RenderMsg.prototype.message = function (cb) { case 'talenet-idea-comment': case 'talenet-idea-comment_reply': return this.ideaComment(cb) case 'about-resource': return this.aboutResource(cb) + case 'line-comment': return this.lineComment(cb) default: return this.object(cb) } } @@ -1638,3 +1647,30 @@ RenderMsg.prototype.aboutResource = function (cb) { h('blockquote', {innerHTML: self.render.markdown(self.c.description)}) ), cb) } + +RenderMsg.prototype.lineComment = function (cb) { + var self = this + var done = multicb({pluck: 1, spread: true}) + self.link(self.c.repo, done()) + self.getMsg(self.c.updateId, done()) + done(function (err, repoLink, updateMsg) { + if (err) return cb(err) + return self.wrap(h('div', + h('div', h('small', '> ', + repoLink, ' ', + h('a', { + href: self.toUrl(self.c.updateId) + }, + updateMsg + ? htime(new Date(updateMsg.value.timestamp)) + : String(self.c.updateId) + ), ' ', + h('a', { + href: self.toUrl('/git/commit/' + self.c.commitId + '?msg=' + encodeURIComponent(self.c.updateId)) + }, String(self.c.commitId).substr(0, 8)), ' ', + h('code', self.c.filePath + ':' + self.c.line) + )), + self.c.text ? + h('div', {innerHTML: self.render.markdown(self.c.text)}) : ''), cb) + }) +} diff --git a/lib/serve.js b/lib/serve.js index fb57bf7..f191b77 100644 --- a/lib/serve.js +++ b/lib/serve.js @@ -1276,6 +1276,7 @@ Serve.prototype.renderThread = function (opts) { msgId: opts && opts.msgId, filter: this.query.filter, limit: Number(this.query.limit), + serve: this, }), pull.map(u.toHTML) ) -- cgit v1.2.3 From 09cf04663fe2a772d5a06bbcf86b9014dc4f5228 Mon Sep 17 00:00:00 2001 From: cel Date: Mon, 8 Jan 2018 22:03:51 -1000 Subject: Render line comments on diffs --- lib/app.js | 75 ++++++++++++++++++++++++++++++ lib/render-msg.js | 5 +- lib/serve.js | 133 ++++++++++++++++++++++++++++++++++++++---------------- 3 files changed, 174 insertions(+), 39 deletions(-) (limited to 'lib/serve.js') diff --git a/lib/app.js b/lib/app.js index 21f45a4..9166eb2 100644 --- a/lib/app.js +++ b/lib/app.js @@ -905,3 +905,78 @@ App.prototype.expandOoo = function (opts, cb) { } } } + +App.prototype.getLineComments = function (opts, cb) { + // get line comments for a git-update message and git object id. + // line comments include message id, commit id and path + // but we have message id and git object hash. + // look up the git object hash for each line-comment + // to verify that it is for the git object file we want + var updateId = opts.obj.msg.key + var objId = opts.hash + var self = this + var lineComments = {} + pull( + self.sbot.backlinks ? self.sbot.backlinks.read({ + query: [ + {$filter: { + dest: updateId, + value: { + content: { + type: 'line-comment', + updateId: updateId, + } + } + }} + ] + }) : pull( + self.sbot.links({ + dest: updateId, + rel: 'updateId', + values: true + }), + pull.filter(function (msg) { + var c = msg && msg.value && msg.value.content + return c && c.type === 'line-comment' + && c.updateId === updateId + }) + ), + paramap(function (msg, cb) { + var c = msg.value.content + self.git.getObjectAtPath({ + msg: updateId, + obj: c.commitId, + path: c.filePath, + }, function (err, info) { + if (err) return cb(err) + cb(null, { + obj: info.obj, + hash: info.hash, + msg: msg, + }) + }) + }, 4), + pull.filter(function (info) { + return info.hash === objId + }), + pull.drain(function (info) { + lineComments[info.msg.value.content.line] = info + }, function (err) { + cb(err, lineComments) + }) + ) +} + +App.prototype.getThread = function (msg) { + return cat([ + pull.once(msg), + this.sbot.backlinks ? this.sbot.backlinks.read({ + query: [ + {$filter: {dest: msg.key}} + ] + }) : this.sbot.links({ + dest: msg.key, + values: true + }) + ]) +} diff --git a/lib/render-msg.js b/lib/render-msg.js index 0835fee..78c7d5c 100644 --- a/lib/render-msg.js +++ b/lib/render-msg.js @@ -1668,7 +1668,10 @@ RenderMsg.prototype.lineComment = function (cb) { h('a', { href: self.toUrl('/git/commit/' + self.c.commitId + '?msg=' + encodeURIComponent(self.c.updateId)) }, String(self.c.commitId).substr(0, 8)), ' ', - h('code', self.c.filePath + ':' + self.c.line) + h('a', { + href: self.toUrl('/git/line-comment/' + + encodeURIComponent(self.msg.key)) + }, h('code', self.c.filePath + ':' + self.c.line)) )), self.c.text ? h('div', {innerHTML: self.render.markdown(self.c.text)}) : ''), cb) diff --git a/lib/serve.js b/lib/serve.js index f191b77..78ff104 100644 --- a/lib/serve.js +++ b/lib/serve.js @@ -1651,6 +1651,7 @@ Serve.prototype.git = function (url) { case 'blob': return this.gitBlob(m[2]) case 'raw': return this.gitRaw(m[2]) case 'diff': return this.gitDiff(m[2]) + case 'line-comment': return this.gitLineComment(m[2]) default: return this.respond(404, 'Not found') } } @@ -2114,12 +2115,16 @@ Serve.prototype.gitDiff = function (revs) { var done = multicb({pluck: 1, spread: true}) pull.collect(done())(self.app.git.readObject(obj1)) pull.collect(done())(self.app.git.readObject(obj2)) - done(function (err, bufs1, bufs2) { + self.app.getLineComments({obj: obj2, hash: rev2}, done()) + done(function (err, bufs1, bufs2, lineComments) { if (err) return cb(err) var str1 = Buffer.concat(bufs1, obj1.length).toString('utf8') var str2 = Buffer.concat(bufs2, obj2.length).toString('utf8') var diff = Diff.structuredPatch('', '', str1, str2) - cb(null, self.gitDiffTable(diff)) + cb(null, self.gitDiffTable(diff, lineComments, { + obj: obj2, + hash: rev2, + })) }) }) }) @@ -2130,12 +2135,10 @@ Serve.prototype.gitDiff = function (revs) { }) } -Serve.prototype.gitDiffTable = function (diff) { +Serve.prototype.gitDiffTable = function (diff, lineComments, lineCommentInfo) { var self = this return pull( ph('table', [ - ph('tr', [ - ]), pull( pull.values(diff.hunks), pull.map(function (hunk) { @@ -2157,39 +2160,42 @@ Serve.prototype.gitDiffTable = function (diff) { var lineNums = [s == '+' ? '' : oldLine++, s == '-' ? '' : newLine++] // var id = [filename].concat(lineNums).join('-') var newLineNum = lineNums[lineNums.length-1] - return ph('tr', { - class: s == '+' ? 'diff-new' : s == '-' ? 'diff-old' : '' - }, [ - lineNums.map(function (num, i) { - return ph('td', String(num)) - // TODO: allow linking to comments - /* - var idEnc = encodeURIComponent(id) - return '' + - (num ? '' + - num + '' + - (updateId && i === lineNums.length-1 && s !== '-' ? - ' …' - : '') - : '') + '' - } - */ - }), - ph('td', ph('pre', u.escapeHTML(html))) - ]) - - // TODO: line-comments - /* - (lineCommentThreads[newLineNum] ? - '' + - lineCommentThreads[newLineNum] + - '' - : commit && query.comment === id ? - '' + - forms.lineComment(req, repo, updateId, commit, filename, newLineNum) + - '' - : '') - */ + return [ + ph('tr', { + class: s == '+' ? 'diff-new' : s == '-' ? 'diff-old' : '' + }, [ + lineNums.map(function (num, i) { + return ph('td', String(num)) + // TODO: allow linking to comments + /* + var idEnc = encodeURIComponent(id) + return '' + + (num ? '' + + num + '' + + (updateId && i === lineNums.length-1 && s !== '-' ? + ' …' + : '') + : '') + '' + } + */ + }), + ph('td', ph('pre', u.escapeHTML(html))) + ]), + (lineComments[newLineNum] ? + ph('tr', + ph('td', {colspan: 4}, + self.renderLineCommentThread(lineComments[newLineNum]) + ) + ) + : /*commit && query.comment === id ? + ph('tr', + ph('td', {colspan: 4}, + // self.renderLineCommentForm(req, repo, updateId, commit, filename, newLineNum) + self.renderLineCommentForm(lineCommentInfo) + ) + ) + :*/ '') + ] }) ) ] @@ -2199,6 +2205,57 @@ Serve.prototype.gitDiffTable = function (diff) { ) } +Serve.prototype.renderLineCommentThread = function (lineComment) { + var self = this + return ph('table', {class: 'ssb-msgs'}, pull( + this.app.getThread(lineComment.msg), + self.renderThread() + )) +} + +Serve.prototype.renderLineCommentForm = function (info) { + var obj = info.obj + var hash = info.hash + return ph('pre', JSON.stringify(info, 0, 2)) +} + +Serve.prototype.gitLineComment = function (path) { + var self = this + var id = decodeURIComponent(String(path)) + self.getMsgDecryptedMaybeOoo(id, function (err, msg) { + if (err) return pull( + pull.once(u.renderError(err).outerHTML), + self.respondSink(400, {'Content-Type': ctype('html')}) + ) + var c = msg && msg.value && msg.value.content + if (!c) return pull( + pull.once('Missing message ' + id), + self.respondSink(500, {'Content-Type': ctype('html')}) + ) + self.app.git.getObjectAtPath({ + msg: c.updateId, + obj: c.commitId, + path: c.filePath, + }, function (err, obj) { + if (err && err.name === 'BlobNotFoundError') + return self.askWantBlobs(err.links) + if (err) return pull( + pull.once(err.stack), + self.respondSink(400, {'Content-Type': 'text/plain'}) + ) + + self.redirect(self.app.render.toUrl(publishedMsg.key)) + + /* + pull( + ph('pre', JSON.stringify(obj, 0, 2)), + self.respondSink(200) + ) + */ + }) + }) +} + Serve.prototype.gitObjectLinks = function (headMsgId, type) { var self = this return paramap(function (id, cb) { -- cgit v1.2.3 From 095093482e485e936b29ec0e42f5e51ca9545ac6 Mon Sep 17 00:00:00 2001 From: cel Date: Tue, 9 Jan 2018 10:35:28 -1000 Subject: whitespace --- lib/serve.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/serve.js') diff --git a/lib/serve.js b/lib/serve.js index 78ff104..6c8941c 100644 --- a/lib/serve.js +++ b/lib/serve.js @@ -1803,11 +1803,11 @@ Serve.prototype.gitCommit = function (rev) { : JSON.stringify(file)) ]) }), - Catch(function (err) { - if (err && err.name === 'ObjectNotFoundError') return - if (err && err.name === 'BlobNotFoundError') return self.askWantBlobsForm(err.links) - return false - }) + Catch(function (err) { + if (err && err.name === 'ObjectNotFoundError') return + if (err && err.name === 'BlobNotFoundError') return self.askWantBlobsForm(err.links) + return false + }) )) ] ]), -- cgit v1.2.3 From 3c8e69899bcd403ed82bee2599bdd592150e5956 Mon Sep 17 00:00:00 2001 From: cel Date: Tue, 9 Jan 2018 19:04:39 -1000 Subject: Render line-comments and diffs better --- lib/render-msg.js | 2 +- lib/serve.js | 145 +++++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 106 insertions(+), 41 deletions(-) (limited to 'lib/serve.js') diff --git a/lib/render-msg.js b/lib/render-msg.js index 78c7d5c..1603d24 100644 --- a/lib/render-msg.js +++ b/lib/render-msg.js @@ -1670,7 +1670,7 @@ RenderMsg.prototype.lineComment = function (cb) { }, String(self.c.commitId).substr(0, 8)), ' ', h('a', { href: self.toUrl('/git/line-comment/' + - encodeURIComponent(self.msg.key)) + encodeURIComponent(self.msg.key || JSON.stringify(self.msg))) }, h('code', self.c.filePath + ':' + self.c.line)) )), self.c.text ? diff --git a/lib/serve.js b/lib/serve.js index 6c8941c..6e3b451 100644 --- a/lib/serve.js +++ b/lib/serve.js @@ -1790,7 +1790,7 @@ Serve.prototype.gitCommit = function (rev) { : file.created ? ph('a', {href: self.app.render.toUrl('/git/blob/' - + file.hash[0] + + (file.hash[1] || file.hash[0]) + '?msg=' + encodeURIComponent(obj.msg.key)) }, 'created') : file.hash ? @@ -1798,6 +1798,8 @@ Serve.prototype.gitCommit = function (rev) { self.app.render.toUrl('/git/diff/' + file.hash[0] + '..' + file.hash[1] + '?msg=' + encodeURIComponent(obj.msg.key)) + + '&commit=' + rev + + '&path=' + encodeURIComponent(file.name) }, 'changed') : file.mode ? 'mode changed' : JSON.stringify(file)) @@ -2107,7 +2109,13 @@ Serve.prototype.gitDiff = function (revs) { obj: rev2, msg: msg2.key, }, done()) - done(function (err, obj1, obj2) { + /* + self.app.git.guessCommitAndPath({ + obj: rev2, + msg: msg2.key, + }, done()) + */ + done(function (err, obj1, obj2/*, info2*/) { if (err && err.name === 'BlobNotFoundError') return cb(null, self.askWantBlobsForm(err.links)) if (err) return cb(err) @@ -2124,6 +2132,8 @@ Serve.prototype.gitDiff = function (revs) { cb(null, self.gitDiffTable(diff, lineComments, { obj: obj2, hash: rev2, + commit: self.query.commit, // info2.commit, + path: self.query.path, // info2.path, })) }) }) @@ -2136,6 +2146,7 @@ Serve.prototype.gitDiff = function (revs) { } Serve.prototype.gitDiffTable = function (diff, lineComments, lineCommentInfo) { + var updateMsg = lineCommentInfo.obj.msg var self = this return pull( ph('table', [ @@ -2146,7 +2157,7 @@ Serve.prototype.gitDiffTable = function (diff, lineComments, lineCommentInfo) { var newLine = hunk.newStart return [ ph('tr', [ - ph('td', {colspan: 2}), + ph('td', {colspan: 3}), ph('td', ph('pre', '@@ -' + oldLine + ',' + hunk.oldLines + ' ' + '+' + newLine + ',' + hunk.newLines + ' @@')) @@ -2158,27 +2169,34 @@ Serve.prototype.gitDiffTable = function (diff, lineComments, lineCommentInfo) { if (s == '\\') return var html = self.app.render.highlight(line) var lineNums = [s == '+' ? '' : oldLine++, s == '-' ? '' : newLine++] - // var id = [filename].concat(lineNums).join('-') + var hash = lineCommentInfo.hash var newLineNum = lineNums[lineNums.length-1] + var id = hash + '-' + (newLineNum || (lineNums[0] + '-')) + var idEnc = encodeURIComponent(id) + var allowComment = s !== '-' + && self.query.commit && self.query.path return [ ph('tr', { class: s == '+' ? 'diff-new' : s == '-' ? 'diff-old' : '' }, [ lineNums.map(function (num, i) { - return ph('td', String(num)) - // TODO: allow linking to comments - /* - var idEnc = encodeURIComponent(id) - return '' + - (num ? '' + - num + '' + - (updateId && i === lineNums.length-1 && s !== '-' ? - ' …' - : '') - : '') + '' - } - */ + return ph('td', [ + ph('a', { + name: i === 0 ? idEnc : undefined, + href: '#' + idEnc + }, String(num)) + ]) }), + ph('td', + allowComment ? ph('a', { + href: '?msg=' + + encodeURIComponent(self.query.msg) + + '&comment=' + idEnc + + '&commit=' + encodeURIComponent(self.query.commit) + + '&path=' + encodeURIComponent(self.query.path) + + '#' + idEnc + }, '…') : '' + ), ph('td', ph('pre', u.escapeHTML(html))) ]), (lineComments[newLineNum] ? @@ -2187,14 +2205,20 @@ Serve.prototype.gitDiffTable = function (diff, lineComments, lineCommentInfo) { self.renderLineCommentThread(lineComments[newLineNum]) ) ) - : /*commit && query.comment === id ? + : newLineNum && lineCommentInfo && self.query.comment === id ? ph('tr', ph('td', {colspan: 4}, - // self.renderLineCommentForm(req, repo, updateId, commit, filename, newLineNum) - self.renderLineCommentForm(lineCommentInfo) + self.renderLineCommentForm({ + id: id, + line: newLineNum, + updateId: updateMsg.key, + repoId: updateMsg.value.content.repo, + commitId: lineCommentInfo.commit, + filePath: lineCommentInfo.path, + }) ) ) - :*/ '') + : '') ] }) ) @@ -2213,16 +2237,42 @@ Serve.prototype.renderLineCommentThread = function (lineComment) { )) } -Serve.prototype.renderLineCommentForm = function (info) { - var obj = info.obj - var hash = info.hash - return ph('pre', JSON.stringify(info, 0, 2)) +Serve.prototype.renderLineCommentForm = function (opts) { + return [ + this.phComposer({ + placeholder: 'comment on this line', + id: opts.id, + lineComment: opts + }) + ] +} + +// return a composer, pull-hyperscript style +Serve.prototype.phComposer = function (opts) { + var self = this + return u.readNext(function (cb) { + self.composer(opts, function (err, composer) { + if (err) return cb(err) + cb(null, pull.once(composer.outerHTML)) + }) + }) } Serve.prototype.gitLineComment = function (path) { var self = this - var id = decodeURIComponent(String(path)) - self.getMsgDecryptedMaybeOoo(id, function (err, msg) { + var id + try { + id = decodeURIComponent(String(path)) + if (id[0] === '%') { + return self.getMsgDecryptedMaybeOoo(id, gotMsg) + } else { + msg = JSON.parse(id) + } + } catch(e) { + return gotMsg(e) + } + gotMsg(null, msg) + function gotMsg(err, msg) { if (err) return pull( pull.once(u.renderError(err).outerHTML), self.respondSink(400, {'Content-Type': ctype('html')}) @@ -2232,28 +2282,35 @@ Serve.prototype.gitLineComment = function (path) { pull.once('Missing message ' + id), self.respondSink(500, {'Content-Type': ctype('html')}) ) - self.app.git.getObjectAtPath({ + self.app.git.diffFile({ msg: c.updateId, - obj: c.commitId, + commit: c.commitId, path: c.filePath, - }, function (err, obj) { + }, function (err, file) { if (err && err.name === 'BlobNotFoundError') return self.askWantBlobs(err.links) if (err) return pull( pull.once(err.stack), self.respondSink(400, {'Content-Type': 'text/plain'}) ) - - self.redirect(self.app.render.toUrl(publishedMsg.key)) - - /* - pull( - ph('pre', JSON.stringify(obj, 0, 2)), - self.respondSink(200) - ) - */ + var path + if (file.created) { + path = '/git/blob/' + file.hash[1] + + '?msg=' + encodeURIComponent(c.updateId) + + '&commit=' + c.commitId + + '&path=' + encodeURIComponent(c.filePath) + + '#' + file.hash[1] + '-' + c.line + } else { + path = '/git/diff/' + file.hash[0] + '..' + file.hash[1] + + '?msg=' + encodeURIComponent(c.updateId) + + '&commit=' + c.commitId + + '&path=' + encodeURIComponent(c.filePath) + + '#' + file.hash[1] + '-' + c.line + } + var url = self.app.render.toUrl(path) + self.redirect(url) }) - }) + } } Serve.prototype.gitObjectLinks = function (headMsgId, type) { @@ -2958,6 +3015,14 @@ Serve.prototype.composer = function (opts, cb) { type: 'post', text: String(data.text).replace(/\r\n/g, '\n'), } + if (opts.lineComment) { + content.type = 'line-comment' + content.updateId = opts.lineComment.updateId + content.repo = opts.lineComment.repoId + content.commitId = opts.lineComment.commitId + content.filePath = opts.lineComment.filePath + content.line = opts.lineComment.line + } var mentions = ssbMentions(data.text, {bareFeedNames: true, emoji: true}) .filter(function (mention) { if (mention.emoji) { -- cgit v1.2.3 From 074639bcbf2859a2973d0d3857eafe2fe9dd45a0 Mon Sep 17 00:00:00 2001 From: cel Date: Tue, 9 Jan 2018 19:47:33 -1000 Subject: Include composer in line comment threads --- lib/serve.js | 130 ++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 76 insertions(+), 54 deletions(-) (limited to 'lib/serve.js') diff --git a/lib/serve.js b/lib/serve.js index 6e3b451..aaf558f 100644 --- a/lib/serve.js +++ b/lib/serve.js @@ -1016,57 +1016,71 @@ function threadHeads(msgs, rootId) { })) } -Serve.prototype.id = function (id, path) { +Serve.prototype.streamThreadWithComposer = function (opts) { var self = this - if (self.query.raw != null) return self.rawId(id) - - this.getMsgDecryptedMaybeOoo(id, function (err, rootMsg) { - if (err && err.name === 'NotFoundError') err = null, rootMsg = { - key: id, value: {content: false}} - if (err) return self.respond(500, err.stack || err) - var rootContent = rootMsg && rootMsg.value && rootMsg.value.content - var recps = rootContent && rootContent.recps - || (rootMsg.value.private - ? [rootMsg.value.author, self.app.sbot.id].filter(uniques()) - : undefined) - var threadRootId = rootContent && rootContent.root || id - var channel + var id = opts.root + return ph('table', {class: 'ssb-msgs'}, u.readNext(next)) + function next(cb) { + self.getMsgDecryptedMaybeOoo(id, function (err, rootMsg) { + if (err && err.name === 'NotFoundError') err = null, rootMsg = { + key: id, value: {content: false}} + if (err) return cb(new Error(err.stack)) + if (!rootMsg) { + console.log('id', id, 'opts', opts) + } + var rootContent = rootMsg && rootMsg.value && rootMsg.value.content + var recps = rootContent && rootContent.recps + || (rootMsg.value.private + ? [rootMsg.value.author, self.app.sbot.id].filter(uniques()) + : undefined) + var threadRootId = rootContent && rootContent.root || id + var channel = opts.channel - pull( - cat([pull.once(rootMsg), self.app.sbot.links({dest: id, values: true})]), - pull.unique('key'), - self.app.unboxMessages(), - pull.through(function (msg) { - var c = msg && msg.value.content - if (!channel && c.channel) channel = c.channel - }), - pull.collect(function (err, links) { - if (err) return gotLinks(err) - if (!self.useOoo) return gotLinks(null, links) - self.app.expandOoo({msgs: links, dest: id}, gotLinks) - }) - ) - function gotLinks(err, links) { - if (err) return self.respond(500, err.stack || err) pull( - pull.values(sort(links)), - self.renderThread({ - msgId: id, - }), - self.wrapMessages(), - self.wrapThread({ - recps: recps, - root: threadRootId, - post: id, - branches: threadHeads(links, threadRootId), - postBranches: threadRootId !== id && threadHeads(links, id), - channel: channel, + cat([pull.once(rootMsg), self.app.sbot.links({dest: id, values: true})]), + pull.unique('key'), + self.app.unboxMessages(), + pull.through(function (msg) { + var c = msg && msg.value.content + if (!channel && c.channel) channel = c.channel }), - self.wrapPage(id), - self.respondSink(200) + pull.collect(function (err, links) { + if (err) return gotLinks(err) + if (!self.useOoo) return gotLinks(null, links) + self.app.expandOoo({msgs: links, dest: id}, gotLinks) + }) ) - } - }) + function gotLinks(err, links) { + if (err) return cb(new Error(err.stack)) + cb(null, pull( + pull.values(sort(links)), + self.renderThread({ + msgId: id, + }), + self.wrapMessages(), + self.wrapThread({ + recps: recps, + root: threadRootId, + post: id, + branches: threadHeads(links, threadRootId), + postBranches: threadRootId !== id && threadHeads(links, id), + placeholder: opts.placeholder, + channel: channel, + }) + )) + } + }) + } +} + +Serve.prototype.id = function (id, path) { + var self = this + if (self.query.raw != null) return self.rawId(id) + pull( + self.streamThreadWithComposer({root: id}), + self.wrapPage(id), + self.respondSink(200) + ) } Serve.prototype.userFeed = function (id, path) { @@ -2202,7 +2216,7 @@ Serve.prototype.gitDiffTable = function (diff, lineComments, lineCommentInfo) { (lineComments[newLineNum] ? ph('tr', ph('td', {colspan: 4}, - self.renderLineCommentThread(lineComments[newLineNum]) + self.renderLineCommentThread(lineComments[newLineNum], id) ) ) : newLineNum && lineCommentInfo && self.query.comment === id ? @@ -2229,12 +2243,12 @@ Serve.prototype.gitDiffTable = function (diff, lineComments, lineCommentInfo) { ) } -Serve.prototype.renderLineCommentThread = function (lineComment) { - var self = this - return ph('table', {class: 'ssb-msgs'}, pull( - this.app.getThread(lineComment.msg), - self.renderThread() - )) +Serve.prototype.renderLineCommentThread = function (lineComment, id) { + return this.streamThreadWithComposer({ + root: lineComment.msg.key, + id: id, + placeholder: 'reply to line comment thread' + }) } Serve.prototype.renderLineCommentForm = function (opts) { @@ -2308,6 +2322,13 @@ Serve.prototype.gitLineComment = function (path) { + '#' + file.hash[1] + '-' + c.line } var url = self.app.render.toUrl(path) + /* + return pull( + ph('a', {href: url}, path), + self.wrapPage(id), + self.respondSink(200) + ) + */ self.redirect(url) }) } @@ -2712,7 +2733,8 @@ Serve.prototype.wrapThread = function (opts) { self.app.render.prepareLinks(opts.recps, function (err, recps) { if (err) return cb(er) self.composer({ - placeholder: recps ? 'private reply' : 'reply', + placeholder: opts.placeholder + || (recps ? 'private reply' : 'reply'), id: 'reply', root: opts.root, post: opts.post, -- cgit v1.2.3 From 52170b13bd7c8d5b248761354e13846f204df04a Mon Sep 17 00:00:00 2001 From: cel Date: Tue, 9 Jan 2018 20:38:46 -1000 Subject: Support line comments on blobs as well as diffs --- lib/serve.js | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- package-lock.json | 20 ++++++++++++++-- package.json | 2 ++ 3 files changed, 87 insertions(+), 5 deletions(-) (limited to 'lib/serve.js') diff --git a/lib/serve.js b/lib/serve.js index aaf558f..4923667 100644 --- a/lib/serve.js +++ b/lib/serve.js @@ -24,6 +24,8 @@ var jpeg = require('jpeg-autorotate') var unzip = require('unzip') var Catch = require('pull-catch') var Diff = require('diff') +var split = require('pull-split') +var utf8 = require('pull-utf8-decoder') module.exports = Serve @@ -2032,6 +2034,7 @@ Serve.prototype.gitBlob = function (rev) { missingBlobs ? self.askWantBlobsForm(missingBlobs) : pull( self.app.git.readObject(obj), self.wrapBinary({ + obj: obj, rawUrl: self.app.render.toUrl('/git/raw/' + rev + '?msg=' + encodeURIComponent(msg.key)), ext: self.query.ext @@ -2624,6 +2627,7 @@ Serve.prototype.zip = function (url) { Serve.prototype.wrapBinary = function (opts) { var self = this var ext = opts.ext + var hash = opts.obj.hash return function (read) { var readRendered, type read = ident(function (_ext) { @@ -2660,9 +2664,69 @@ Serve.prototype.wrapBinary = function (opts) { })(read) })) } - return ph('pre', pull.map(function (buf) { - return self.app.render.highlight(buf.toString('utf8'), ext) - })(read)) + var i = 0 + var updateMsg = opts.obj.msg + var commitId = self.query.commit + var filePath = self.query.path + var lineComments = opts.lineComments || {} + return u.readNext(function (cb) { + if (commitId && filePath) { + self.app.getLineComments({ + obj: opts.obj, + hash: hash, + }, gotLineComments) + } else { + gotLineComments(null, {}) + } + function gotLineComments(err, lineComments) { + if (err) return cb(err) + cb(null, ph('table', + pull( + read, + utf8(), + split(), + pull.map(function (line) { + var lineNum = i++ + var id = hash + '-' + lineNum + var idEnc = encodeURIComponent(id) + return [ + ph('tr', [ + ph('td', ph('a', { + name: id, + href: '?msg=' + encodeURIComponent(self.query.msg) + + '&commit=' + encodeURIComponent(self.query.commit) + + '&path=' + encodeURIComponent(self.query.path) + + '&comment=' + idEnc + + '#' + idEnc + }, String(lineNum))), + ph('td', ph('pre', self.app.render.highlight(line, ext))) + ]), + (lineComments[lineNum] ? + ph('tr', + ph('td', {colspan: 4}, + self.renderLineCommentThread(lineComments[lineNum], id) + ) + ) + : self.query.comment === id ? + ph('tr', + ph('td', {colspan: 4}, + self.renderLineCommentForm({ + id: id, + line: lineNum, + updateId: updateMsg.key, + repoId: updateMsg.value.content.repo, + commitId: commitId, + filePath: filePath, + }) + ) + ) + : '') + ] + }) + ) + )) + } + }) } } diff --git a/package-lock.json b/package-lock.json index 3a9bf62..905c326 100644 --- a/package-lock.json +++ b/package-lock.json @@ -182,7 +182,8 @@ }, "diff": { "version": "3.3.1", - "resolved": "http://localhost:8989/blobs/get/&+6G9mvp4Q/5bujMKlbFdbrub2IXMPleXIqTqyyvY5Ww=.sha256" + "resolved": "http://localhost:8989/blobs/get/&+6G9mvp4Q/5bujMKlbFdbrub2IXMPleXIqTqyyvY5Ww=.sha256", + "integrity": "sha1-qoVnpu7QPFMfyJ0/cRzQ5SWd7HU=" }, "ed2curve": { "version": "0.1.4", @@ -879,6 +880,14 @@ "resolved": "http://localhost:8989/blobs/get/&fFOPAd5Js7mJkEU4XHeJ6vE6H7nsTOegHpjY0hpTu00=.sha256", "integrity": "sha256-fFOPAd5Js7mJkEU4XHeJ6vE6H7nsTOegHpjY0hpTu00=" }, + "pull-split": { + "version": "0.2.0", + "resolved": "http://localhost:8989/blobs/get/&OWAh7XbI03yih8UH5Vu0qrYM6TGx0q8uah06dm22CJo=.sha256", + "integrity": "sha256-OWAh7XbI03yih8UH5Vu0qrYM6TGx0q8uah06dm22CJo=", + "requires": { + "pull-through": "1.0.18" + } + }, "pull-stream": { "version": "3.6.1", "resolved": "http://localhost:8989/blobs/get/&xEhoJll+9Z5EYr7s7MUgCbBhdF1nekcqnIdIKV4z2SU=.sha256", @@ -899,6 +908,11 @@ } } }, + "pull-utf8-decoder": { + "version": "1.0.2", + "resolved": "http://localhost:8989/blobs/get/&JHBdLm6x7Rsu08/eLVWYKq+YpGna4xnvqM44ucX2tpk=.sha256", + "integrity": "sha256-JHBdLm6x7Rsu08/eLVWYKq+YpGna4xnvqM44ucX2tpk=" + }, "pull-ws": { "version": "3.3.0", "resolved": "http://localhost:8989/blobs/get/&xe26a32xW10OFqKs+xdyUTSobJPCAGdnv7yIAjoqmlk=.sha256", @@ -1213,11 +1227,13 @@ "dependencies": { "is-valid-domain": { "version": "0.0.2", - "resolved": "http://localhost:8989/blobs/get/&phjiap+k1lGC5LPVba/w4Caomw5o0NQp2Hol+u/YAzE=.sha256" + "resolved": "http://localhost:8989/blobs/get/&phjiap+k1lGC5LPVba/w4Caomw5o0NQp2Hol+u/YAzE=.sha256", + "integrity": "sha1-PnqUI/98Oy/hFmOvvW04N6JR+3c=" }, "ssb-ref": { "version": "2.7.1", "resolved": "http://localhost:8989/blobs/get/&wLimOD3785KVj7kBIAbjN6GH8EMhKRkcZSPrEMhdhks=.sha256", + "integrity": "sha1-XU7/xUXsD/1/wVuieCmmQLiir7o=", "requires": { "ip": "1.1.5", "is-valid-domain": "0.0.2" diff --git a/package.json b/package.json index 65ae820..37d3ca4 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,9 @@ "pull-paginate": "^1.0.0", "pull-paramap": "^1.2.1", "pull-reader": "^1.2.9", + "pull-split": "^0.2.0", "pull-stream": "^3.5.0", + "pull-utf8-decoder": "^1.0.2", "ssb-client": "http://localhost:8989/blobs/get/&EAaUpI+wrJM5/ly1RqZW0GAEF4PmCAmABBj7e6UIrL0=.sha256", "ssb-contact": "^1.2.0", "ssb-git": "^0.6.0", -- cgit v1.2.3 From 2cea6dd8bfa1230c2c7aa48fab6a48af6c148a30 Mon Sep 17 00:00:00 2001 From: cel Date: Tue, 9 Jan 2018 20:44:01 -1000 Subject: Handle multiple line comment thread composers --- lib/serve.js | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) (limited to 'lib/serve.js') diff --git a/lib/serve.js b/lib/serve.js index 4923667..7df2da9 100644 --- a/lib/serve.js +++ b/lib/serve.js @@ -2701,26 +2701,23 @@ Serve.prototype.wrapBinary = function (opts) { }, String(lineNum))), ph('td', ph('pre', self.app.render.highlight(line, ext))) ]), - (lineComments[lineNum] ? - ph('tr', - ph('td', {colspan: 4}, - self.renderLineCommentThread(lineComments[lineNum], id) - ) + lineComments[lineNum] ? ph('tr', + ph('td', {colspan: 4}, + self.renderLineCommentThread(lineComments[lineNum], id) ) - : self.query.comment === id ? - ph('tr', - ph('td', {colspan: 4}, - self.renderLineCommentForm({ - id: id, - line: lineNum, - updateId: updateMsg.key, - repoId: updateMsg.value.content.repo, - commitId: commitId, - filePath: filePath, - }) - ) + ) : '', + self.query.comment === id ? ph('tr', + ph('td', {colspan: 4}, + self.renderLineCommentForm({ + id: id, + line: lineNum, + updateId: updateMsg.key, + repoId: updateMsg.value.content.repo, + commitId: commitId, + filePath: filePath, + }) ) - : '') + ) : '' ] }) ) @@ -2941,6 +2938,11 @@ Serve.prototype.composer = function (opts, cb) { var data = self.data var myId = self.app.sbot.id + if (opts.id && data.composer_id && opts.id !== data.composer_id) { + // don't share data between multiple composers + data = {} + } + if (!data.text && self.query.text) data.text = self.query.text if (!data.action && self.query.action) data.action = self.query.action @@ -3034,6 +3036,7 @@ Serve.prototype.composer = function (opts, cb) { enctype: 'multipart/form-data'}, h('input', {type: 'hidden', name: 'blobs', value: JSON.stringify(blobs)}), + h('input', {type: 'hidden', name: 'composer_id', value: opts.id}), opts.recps ? self.app.render.privateLine(opts.recps, done()) : opts.private ? h('div', h('input.recps-input', {name: 'recps', value: data.recps || '', placeholder: 'recipient ids'})) : '', -- cgit v1.2.3 From ebe6b4c381e0ff7ae283f5abeadb2c6b5c2685fc Mon Sep 17 00:00:00 2001 From: cel Date: Tue, 9 Jan 2018 20:51:33 -1000 Subject: whitespace --- lib/serve.js | 172 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 86 insertions(+), 86 deletions(-) (limited to 'lib/serve.js') diff --git a/lib/serve.js b/lib/serve.js index 7df2da9..2fa6c6d 100644 --- a/lib/serve.js +++ b/lib/serve.js @@ -81,7 +81,7 @@ Serve.prototype.go = function () { if (auth) { var a = auth.split(' ') if (a[0] == 'Basic') { - tok = Buffer.from(a[1],'base64').toString('ascii') + tok = Buffer.from(a[1],'base64').toString('ascii') } } if (tok != authtok) { @@ -542,7 +542,7 @@ Serve.prototype.advsearch = function (ext) { ph('td', ['#', ph('input', {name: 'channel', placeholder: 'channel', class: 'id-input', value: q.channel || ''}) - ]) + ]) ]), ph('tr', [ ph('td', {colspan: 2}, [ @@ -555,8 +555,8 @@ Serve.prototype.advsearch = function (ext) { hasQuery && pull( self.app.advancedSearch(q), self.renderThread({ - feed: q.source, - }), + feed: q.source, + }), self.wrapMessages() ) ]), @@ -582,7 +582,7 @@ Serve.prototype.live = function (ext) { self.app.sbot.createLogStream(opts), self.app.render.renderFeeds({ withGt: true, - filter: q.filter, + filter: q.filter, }), pull.map(u.toHTML) )), @@ -1028,7 +1028,7 @@ Serve.prototype.streamThreadWithComposer = function (opts) { key: id, value: {content: false}} if (err) return cb(new Error(err.stack)) if (!rootMsg) { - console.log('id', id, 'opts', opts) + console.log('id', id, 'opts', opts) } var rootContent = rootMsg && rootMsg.value && rootMsg.value.content var recps = rootContent && rootContent.recps @@ -1053,7 +1053,7 @@ Serve.prototype.streamThreadWithComposer = function (opts) { }) ) function gotLinks(err, links) { - if (err) return cb(new Error(err.stack)) + if (err) return cb(new Error(err.stack)) cb(null, pull( pull.values(sort(links)), self.renderThread({ @@ -1319,7 +1319,7 @@ Serve.prototype.renderThreadPaginated = function (opts, feedId, q) { function onFirst(msg, cb) { var num = feedId ? msg.value.sequence : opts.sortByTimestamp ? msg.value.timestamp : - msg.timestamp || msg.ts + msg.timestamp || msg.ts if (q.forwards) { cb(null, links({ lt: num, @@ -1347,7 +1347,7 @@ Serve.prototype.renderThreadPaginated = function (opts, feedId, q) { function onLast(msg, cb) { var num = feedId ? msg.value.sequence : opts.sortByTimestamp ? msg.value.timestamp : - msg.timestamp || msg.ts + msg.timestamp || msg.ts if (q.forwards) { cb(null, links({ lt: null, @@ -1590,8 +1590,8 @@ Serve.prototype.friendInfo = function (id, myId) { this.app.render.friendsList(), pull.map(function (html) { if (!first) { - first = true - return 'followed by your friends: ' + html + first = true + return 'followed by your friends: ' + html } return html }) @@ -1643,15 +1643,15 @@ Serve.prototype.wrapUserFeed = function (isScrolled, id) { ) ]), isScrolled || id === myId ? '' : [ - ph('tr', [ - ph('td'), - ph('td', {class: 'follow-info'}, self.followInfo(id, myId)) - ]), - ph('tr', [ - ph('td'), - ph('td', self.friendInfo(id, myId)) - ]) - ] + ph('tr', [ + ph('td'), + ph('td', {class: 'follow-info'}, self.followInfo(id, myId)) + ]), + ph('tr', [ + ph('td'), + ph('td', self.friendInfo(id, myId)) + ]) + ] ])), thread ]) @@ -1973,11 +1973,11 @@ Serve.prototype.gitTree = function (rev) { ), ]) }), - Catch(function (err) { - if (err && err.name === 'ObjectNotFoundError') return - if (err && err.name === 'BlobNotFoundError') return self.askWantBlobsForm(err.links) - return false - }) + Catch(function (err) { + if (err && err.name === 'ObjectNotFoundError') return + if (err && err.name === 'BlobNotFoundError') return self.askWantBlobsForm(err.links) + return false + }) ) ]), ]), @@ -2034,7 +2034,7 @@ Serve.prototype.gitBlob = function (rev) { missingBlobs ? self.askWantBlobsForm(missingBlobs) : pull( self.app.git.readObject(obj), self.wrapBinary({ - obj: obj, + obj: obj, rawUrl: self.app.render.toUrl('/git/raw/' + rev + '?msg=' + encodeURIComponent(msg.key)), ext: self.query.ext @@ -2671,57 +2671,57 @@ Serve.prototype.wrapBinary = function (opts) { var lineComments = opts.lineComments || {} return u.readNext(function (cb) { if (commitId && filePath) { - self.app.getLineComments({ - obj: opts.obj, - hash: hash, - }, gotLineComments) + self.app.getLineComments({ + obj: opts.obj, + hash: hash, + }, gotLineComments) } else { - gotLineComments(null, {}) + gotLineComments(null, {}) } function gotLineComments(err, lineComments) { - if (err) return cb(err) - cb(null, ph('table', - pull( - read, - utf8(), - split(), - pull.map(function (line) { - var lineNum = i++ - var id = hash + '-' + lineNum - var idEnc = encodeURIComponent(id) - return [ - ph('tr', [ - ph('td', ph('a', { - name: id, - href: '?msg=' + encodeURIComponent(self.query.msg) - + '&commit=' + encodeURIComponent(self.query.commit) - + '&path=' + encodeURIComponent(self.query.path) - + '&comment=' + idEnc - + '#' + idEnc - }, String(lineNum))), - ph('td', ph('pre', self.app.render.highlight(line, ext))) - ]), - lineComments[lineNum] ? ph('tr', - ph('td', {colspan: 4}, - self.renderLineCommentThread(lineComments[lineNum], id) - ) - ) : '', - self.query.comment === id ? ph('tr', - ph('td', {colspan: 4}, - self.renderLineCommentForm({ - id: id, - line: lineNum, - updateId: updateMsg.key, - repoId: updateMsg.value.content.repo, - commitId: commitId, - filePath: filePath, - }) - ) - ) : '' - ] - }) - ) - )) + if (err) return cb(err) + cb(null, ph('table', + pull( + read, + utf8(), + split(), + pull.map(function (line) { + var lineNum = i++ + var id = hash + '-' + lineNum + var idEnc = encodeURIComponent(id) + return [ + ph('tr', [ + ph('td', ph('a', { + name: id, + href: '?msg=' + encodeURIComponent(self.query.msg) + + '&commit=' + encodeURIComponent(self.query.commit) + + '&path=' + encodeURIComponent(self.query.path) + + '&comment=' + idEnc + + '#' + idEnc + }, String(lineNum))), + ph('td', ph('pre', self.app.render.highlight(line, ext))) + ]), + lineComments[lineNum] ? ph('tr', + ph('td', {colspan: 4}, + self.renderLineCommentThread(lineComments[lineNum], id) + ) + ) : '', + self.query.comment === id ? ph('tr', + ph('td', {colspan: 4}, + self.renderLineCommentForm({ + id: id, + line: lineNum, + updateId: updateMsg.key, + repoId: updateMsg.value.content.repo, + commitId: commitId, + filePath: filePath, + }) + ) + ) : '' + ] + }) + ) + )) } }) } @@ -3215,15 +3215,15 @@ Serve.prototype.composer = function (opts, cb) { }) var draftMsg = { - key: '%0000000000000000000000000000000000000000000=.sha256', - value: { - previous: '%0000000000000000000000000000000000000000000=.sha256', - author: '@0000000000000000000000000000000000000000000=.ed25519', - sequence: 1000, - timestamp: 1000000000000, - hash: 'sha256', - content: content - } + key: '%0000000000000000000000000000000000000000000=.sha256', + value: { + previous: '%0000000000000000000000000000000000000000000=.sha256', + author: '@0000000000000000000000000000000000000000000=.ed25519', + sequence: 1000, + timestamp: 1000000000000, + hash: 'sha256', + content: content + } } var estSize = JSON.stringify(draftMsg, null, 2).length sizeEl.innerHTML = self.app.render.formatSize(estSize) @@ -3238,9 +3238,9 @@ Serve.prototype.composer = function (opts, cb) { pull.once(msg), self.app.unboxMessages(), self.app.render.renderFeeds({ - raw: raw, - filter: self.query.filter, - }), + raw: raw, + filter: self.query.filter, + }), pull.drain(function (el) { msgContainer.appendChild(h('tbody', el)) }, cb) -- cgit v1.2.3