fix deleteMany callback is not a function. Create async versions of functions

Author: NickOvt

lib/attachment-storage.js

@@ -52,6 +52,24 @@ class AttachmentStorage {
         return this.storage.update(ids, count, magic, callback);
     }
 
+    async deleteManyAsync(ids, magic) {
+        const deletePromises = ids.map(id => this.deleteAsync(id, magic));
+        await Promise.all(deletePromises);
+        return true;
+    }
+
+    async deleteAsync(id, magic) {
+        return new Promise((resolve, reject) => {
+            this.storage.delete(id, magic, (err, result) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    resolve(result);
+                }
+            });
+        });
+    }
+
     delete(id, magic, callback) {
         return this.storage.delete(id, magic, callback);
     }

lib/handlers/on-copy.js

@@ -289,7 +289,7 @@ async function copyHandler(server, messageHandler, connection, mailbox, update,
                                                     key => prepared.mimeTree.attachmentMap[key]
                                                 );
 
-                                                messageHandler.attachmentStorage.deleteMany(attachmentIds, maildata.magic);
+                                                messageHandler.attachmentStorage.deleteMany(attachmentIds, maildata.magic, () => {});
 
                                                 if (err) {
                                                     return reject(err);

lib/message-handler.js

@@ -310,7 +310,7 @@ class MessageHandler {
 
             // with err, with attachments
             try {
-                await this.attachmentStorage.deleteMany(attachmentIds, maildata.magic);
+                await this.attachmentStorage.deleteManyAsync(attachmentIds, maildata.magic);
             } catch {
                 // throw original error
                 throw err;
@@ -855,14 +855,7 @@ class MessageHandler {
 
             if (attachmentIds.length) {
                 try {
-                    await new Promise((resolve, reject) => {
-                        this.attachmentStorage.deleteMany(attachmentIds, messageData.magic, err => {
-                            if (err) {
-                                return reject(err);
-                            }
-                            resolve();
-                        });
-                    });
+                    await this.attachmentStorage.deleteManyAsync(attachmentIds, messageData.magic);
                 } catch (err) {
                     log.error('attachdel', err);
                 }
@@ -1277,7 +1270,7 @@ class MessageHandler {
                                                             return reject(err);
                                                         }
 
-                                                        await this.attachmentStorage.deleteMany(attachmentIds, maildata.magic);
+                                                        await this.attachmentStorage.deleteManyAsync(attachmentIds, maildata.magic);
                                                         return reject(err); // reject from inner promise
                                                     }