From 8ed0c80fb57b0eafbca1cf2624f30aa0cc5f52b1 Mon Sep 17 00:00:00 2001
From: Andris Reinman <andris@kreata.ee>
Date: Mon, 3 Sep 2018 08:51:32 +0300
Subject: [PATCH] fixed broken api method to delete messages

---
 examples/push-message.js | 3 +++
 lib/api/messages.js      | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/examples/push-message.js b/examples/push-message.js
index 4bd1867..1aaadfb 100644
--- a/examples/push-message.js
+++ b/examples/push-message.js
@@ -36,9 +36,12 @@ function send() {
             },
 
             headers: {
+                /*
+                // uncomment to send the messge to Junk
                 'X-Rspamd-Bar': '/',
                 'X-Rspamd-Report': 'R_PARTS_DIFFER(0.5) MIME_GOOD(-0.1) R_DKIM_ALLOW(-0.2) R_SPF_ALLOW(-0.2)',
                 'X-Rspamd-Score': '22.6'
+                */
             },
 
             from: 'Kärbes 🐧 <andris@kreata.ee>',
diff --git a/lib/api/messages.js b/lib/api/messages.js
index d1f2ea7..081aa04 100644
--- a/lib/api/messages.js
+++ b/lib/api/messages.js
@@ -1,5 +1,7 @@
 'use strict';
 
+// TODO: finish converting methods to async..await with ACL
+
 const config = require('wild-config');
 const log = require('npmlog');
 const Joi = require('../joi');
@@ -1810,7 +1812,7 @@ module.exports = (db, server, messageHandler) => {
             }
 
             if (moveTo) {
-                let result, info;
+                let info;
                 try {
                     let data = await moveMessage({
                         user,
@@ -1819,7 +1821,6 @@ module.exports = (db, server, messageHandler) => {
                         updates: result.value,
                         messageQuery
                     });
-                    result = data.result;
                     info = data.info;
                 } catch (err) {
                     res.json({