From 57c80659bb02d029c077c0658b1353cfcbe41e30 Mon Sep 17 00:00:00 2001 From: cel Date: Sat, 8 Apr 2017 18:29:52 -0700 Subject: Improve message title compuation Prefer About info for non-textual messages --- lib/app.js | 1 + lib/render-msg.js | 10 ++++------ 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/app.js b/lib/app.js index 6314284..b3cd1b1 100644 --- a/lib/app.js +++ b/lib/app.js @@ -146,6 +146,7 @@ App.prototype.getReverseNameSync = function (name) { } function getMsgWithValue(sbot, id, cb) { + if (!id) return cb() sbot.get(id, function (err, value) { if (err) return cb(err) cb(null, {key: id, value: value}) diff --git a/lib/render-msg.js b/lib/render-msg.js index d2d2c9a..380d451 100644 --- a/lib/render-msg.js +++ b/lib/render-msg.js @@ -298,13 +298,11 @@ RenderMsg.prototype.title = function (cb) { if (self.c.type === 'post') cb(null, title(self.c.text)) else - cb(null, self.c.type + ':' + (self.c.title || title(self.c.text))) - } else if (self.c.type === 'git-repo') { - self.getAboutName(self.msg.key, cb) + cb(null, '%' + self.c.type + ': ' + (self.c.title || title(self.c.text))) } else { - self.getAboutName(self.msg.key, function (err, name) { + self.app.getAbout(self.msg.key, function (err, about) { if (err) return cb(err) - if (name) return cb(null, name) + if (about.name) return cb(null, about.name) self.message(false, function (err, el) { if (err) return cb(err) cb(null, '%' + title(h('div', el).textContent)) @@ -315,7 +313,7 @@ RenderMsg.prototype.title = function (cb) { RenderMsg.prototype.getAboutName = function (id, cb) { this.app.getAbout(id, function (err, about) { - cb(err, about && about.name) + cb(err, about && about.name || String(id).substr(1, 8) + '…') }) } -- cgit v1.2.3