From fc800407c0f45352ee533769fe96a8c339501a34 Mon Sep 17 00:00:00 2001 From: cel Date: Mon, 1 Oct 2018 22:02:29 -1000 Subject: Decrypt message with unbox key query parameter --- lib/serve.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'lib/serve.js') diff --git a/lib/serve.js b/lib/serve.js index f825ed7..c51a331 100644 --- a/lib/serve.js +++ b/lib/serve.js @@ -3627,8 +3627,16 @@ Serve.prototype.getBuiltinEmojiLink = function (name) { } Serve.prototype.getMsgDecryptedMaybeOoo = function (key, cb) { - if (this.useOoo) this.app.getMsgDecryptedOoo(key, cb) - else this.app.getMsgDecrypted(key, cb) + var self = this + if (this.useOoo) this.app.getMsgDecryptedOoo(key, next) + else this.app.getMsgDecrypted(key, next) + function next(err, msg) { + if (err) return cb(err) + var c = msg && msg.value && msg.value.content + if (typeof c === 'string' && self.query.unbox) + self.app.unboxMsgWithKey(msg, String(self.query.unbox).replace(/ /g, '+'), cb) + else cb(null, msg) + } } Serve.prototype.emojis = function (path) { -- cgit v1.2.3