From 370c4c84d9c6de56e4f4c2485c3acffc5c193387 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Wed, 13 Feb 2019 15:49:51 +0100
Subject: [PATCH] Use async/await instead of explicit promises

---
 dist/converse.js               | 21 +++++++--------------
 src/headless/converse-disco.js | 19 +++++--------------
 2 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/dist/converse.js b/dist/converse.js
index 6bd052509..d86968b78 100644
--- a/dist/converse.js
+++ b/dist/converse.js
@@ -64494,27 +64494,20 @@ _converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins.add('converse-dis
         });
       },
 
-      hasFeature(feature) {
+      async hasFeature(feature) {
         /* Returns a Promise which resolves with a map indicating
          * whether a given feature is supported.
          *
          * Parameters:
          *    (String) feature - The feature that might be supported.
          */
-        const entity = this;
-        return new Promise((resolve, reject) => {
-          function fulfillPromise() {
-            if (entity.features.findWhere({
-              'var': feature
-            })) {
-              resolve(entity);
-            } else {
-              resolve();
-            }
-          }
+        await this.waitUntilFeaturesDiscovered;
 
-          entity.waitUntilFeaturesDiscovered.then(fulfillPromise).catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL));
-        });
+        if (this.features.findWhere({
+          'var': feature
+        })) {
+          return this;
+        }
       },
 
       onFeatureAdded(feature) {
diff --git a/src/headless/converse-disco.js b/src/headless/converse-disco.js
index 132eac8b4..460503269 100644
--- a/src/headless/converse-disco.js
+++ b/src/headless/converse-disco.js
@@ -79,26 +79,17 @@ converse.plugins.add('converse-disco', {
                 });
             },
 
-            hasFeature (feature) {
+            async hasFeature (feature) {
                 /* Returns a Promise which resolves with a map indicating
                  * whether a given feature is supported.
                  *
                  * Parameters:
                  *    (String) feature - The feature that might be supported.
                  */
-                const entity = this;
-                return new Promise((resolve, reject) => {
-                    function fulfillPromise () {
-                        if (entity.features.findWhere({'var': feature})) {
-                            resolve(entity);
-                        } else {
-                            resolve();
-                        }
-                    }
-                    entity.waitUntilFeaturesDiscovered
-                        .then(fulfillPromise)
-                        .catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL));
-                });
+                await this.waitUntilFeaturesDiscovered
+                if (this.features.findWhere({'var': feature})) {
+                    return this;
+                }
             },
 
             onFeatureAdded (feature) {