From fa85fc71b98091b9843f3f92361fed7ef37956a3 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Fri, 22 Mar 2019 15:49:44 +0100
Subject: [PATCH] Use async/await

---
 dist/converse.js          | 58 ++++++++++++++++-----------------------
 src/converse-mam-views.js | 57 ++++++++++++++++----------------------
 2 files changed, 47 insertions(+), 68 deletions(-)

diff --git a/dist/converse.js b/dist/converse.js
index 73f2dc746..d094c4920 100644
--- a/dist/converse.js
+++ b/dist/converse.js
@@ -52439,7 +52439,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins
         });
       },
 
-      fetchArchivedMessages(options) {
+      async fetchArchivedMessages(options) {
         const _converse = this.__super__._converse;
 
         if (this.disable_mam) {
@@ -52457,42 +52457,32 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins
           message_handler = _converse.chatboxes.onMessage.bind(_converse.chatboxes);
         }
 
-        _converse.api.disco.supports(Strophe.NS.MAM, mam_jid).then(results => {
+        const supported = await _converse.api.disco.supports(Strophe.NS.MAM, mam_jid);
+
+        if (!supported.length) {
+          return;
+        }
+
+        this.addSpinner();
+
+        _converse.api.archive.query(_.extend({
+          'groupchat': is_groupchat,
+          'before': '',
+          // Page backwards from the most recent message
+          'max': _converse.archived_messages_page_size,
+          'with': this.model.get('jid')
+        }, options), messages => {
           // Success
-          if (!results.length) {
-            return;
-          }
-
-          this.addSpinner();
-
-          _converse.api.archive.query( // TODO: only query from the last message we have
-          // in our history
-          _.extend({
-            'groupchat': is_groupchat,
-            'before': '',
-            // Page backwards from the most recent message
-            'max': _converse.archived_messages_page_size,
-            'with': this.model.get('jid')
-          }, options), messages => {
-            // Success
-            this.clearSpinner();
-
-            _.each(messages, message_handler);
-          }, e => {
-            // Error
-            this.clearSpinner();
-
-            _converse.log("Error or timeout while trying to fetch " + "archived messages", Strophe.LogLevel.ERROR);
-
-            _converse.log(e, Strophe.LogLevel.ERROR);
-          });
-        }, () => {
-          // Error
-          _converse.log("Error or timeout while checking for MAM support", Strophe.LogLevel.ERROR);
-        }).catch(msg => {
           this.clearSpinner();
 
-          _converse.log(msg, Strophe.LogLevel.FATAL);
+          _.each(messages, message_handler);
+        }, e => {
+          // Error
+          this.clearSpinner();
+
+          _converse.log("Error or timeout while trying to fetch " + "archived messages", Strophe.LogLevel.ERROR);
+
+          _converse.log(e, Strophe.LogLevel.ERROR);
         });
       },
 
diff --git a/src/converse-mam-views.js b/src/converse-mam-views.js
index f6dc6df9f..e185020eb 100644
--- a/src/converse-mam-views.js
+++ b/src/converse-mam-views.js
@@ -80,7 +80,7 @@ converse.plugins.add('converse-mam-views', {
                 });
             },
 
-            fetchArchivedMessages (options) {
+            async fetchArchivedMessages (options) {
                 const { _converse } = this.__super__;
                 if (this.disable_mam) { return; }
 
@@ -95,42 +95,31 @@ converse.plugins.add('converse-mam-views', {
                     message_handler = _converse.chatboxes.onMessage.bind(_converse.chatboxes)
                 }
 
-                _converse.api.disco.supports(Strophe.NS.MAM, mam_jid).then(
-                    (results) => { // Success
-                        if (!results.length) { return; }
-                        this.addSpinner();
-                        _converse.api.archive.query(
-                            // TODO: only query from the last message we have
-                            // in our history
-                            _.extend({
-                                'groupchat': is_groupchat,
-                                'before': '', // Page backwards from the most recent message
-                                'max': _converse.archived_messages_page_size,
-                                'with': this.model.get('jid'),
-                            }, options),
-                            (messages) => { // Success
-                                this.clearSpinner();
-                                _.each(messages, message_handler);
-                            },
-                            e => { // Error
-                                this.clearSpinner();
-                                _converse.log(
-                                    "Error or timeout while trying to fetch "+
-                                    "archived messages", Strophe.LogLevel.ERROR);
-                                _converse.log(e, Strophe.LogLevel.ERROR);
-                            }
-                        );
+                const supported = await _converse.api.disco.supports(Strophe.NS.MAM, mam_jid);
+                if (!supported.length) {
+                    return;
+                }
+                this.addSpinner();
+                _converse.api.archive.query(
+                    _.extend({
+                        'groupchat': is_groupchat,
+                        'before': '', // Page backwards from the most recent message
+                        'max': _converse.archived_messages_page_size,
+                        'with': this.model.get('jid'),
+                    }, options),
+
+                    messages => { // Success
+                        this.clearSpinner();
+                        _.each(messages, message_handler);
                     },
-                    () => { // Error
+                    e => { // Error
+                        this.clearSpinner();
                         _converse.log(
-                            "Error or timeout while checking for MAM support",
-                            Strophe.LogLevel.ERROR
-                        );
+                            "Error or timeout while trying to fetch "+
+                            "archived messages", Strophe.LogLevel.ERROR);
+                        _converse.log(e, Strophe.LogLevel.ERROR);
                     }
-                ).catch((msg) => {
-                    this.clearSpinner();
-                    _converse.log(msg, Strophe.LogLevel.FATAL);
-                });
+                );
             },
 
             onScroll (ev) {