Refactor room auto-configuration

dist/converse.js

@@ -67514,26 +67514,21 @@ _converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins.add('converse-muc
         });
       },
 
-      autoConfigureChatRoom() {
-        /* Automatically configure groupchat based on this model's
-         * 'roomconfig' data.
-         *
-         * Returns a promise which resolves once a response IQ has
-         * been received.
+      /**
+       * Given a <field> element, return a copy with a <value> child if
+       * we can find a value for it in this rooms config.
+       * @private
+       * @method _converse.ChatRoom#autoConfigureChatRoom
+       * @returns { Element }
        */
-        return new Promise((resolve, reject) => {
-          this.fetchRoomConfiguration().then(stanza => {
-            const configArray = [],
-                  fields = stanza.querySelectorAll('field'),
-                  config = this.get('roomconfig');
-            let count = fields.length;
-
-            _.each(fields, field => {
-              const fieldname = field.getAttribute('var').replace('muc#roomconfig_', ''),
-                    type = field.getAttribute('type');
-              let value;
+      addFieldValue(field) {
+        const type = field.getAttribute('type');
+        const fieldname = field.getAttribute('var').replace('muc#roomconfig_', '');
+        const config = this.get('roomconfig');
 
         if (fieldname in config) {
+          let value;
+
           switch (type) {
             case 'boolean':
               value = config[fieldname] ? 1 : 0;
@@ -67551,14 +67546,28 @@ _converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins.add('converse-muc
           field.innerHTML = $build('value').t(value);
         }
 
-              configArray.push(field);
+        return field;
+      },
 
-              if (! --count) {
+      /**
+       * Automatically configure the groupchat based on this model's
+       * 'roomconfig' data.
+       * @private
+       * @method _converse.ChatRoom#autoConfigureChatRoom
+       * @returns { promise }
+       * Returns a promise which resolves once a response IQ has
+       * been received.
+       */
+      autoConfigureChatRoom() {
+        return new Promise(async (resolve, reject) => {
+          const stanza = await this.fetchRoomConfiguration();
+          const fields = sizzle('field', stanza);
+          const configArray = fields.map(f => this.addFieldValue(f));
+
+          if (configArray.length) {
             this.sendConfiguration(configArray, resolve, reject);
           }
         });
-          });
-        });
       },
 
       fetchRoomConfiguration() {

src/headless/converse-muc.js

@@ -644,25 +644,19 @@ converse.plugins.add('converse-muc', {
                 });
             },
 
-            autoConfigureChatRoom () {
-                /* Automatically configure groupchat based on this model's
-                 * 'roomconfig' data.
-                 *
-                 * Returns a promise which resolves once a response IQ has
-                 * been received.
+            /**
+             * Given a <field> element, return a copy with a <value> child if
+             * we can find a value for it in this rooms config.
+             * @private
+             * @method _converse.ChatRoom#autoConfigureChatRoom
+             * @returns { Element }
              */
-                return new Promise((resolve, reject) => {
-                    this.fetchRoomConfiguration().then((stanza) => {
-                        const configArray = [],
-                            fields = stanza.querySelectorAll('field'),
-                            config = this.get('roomconfig');
-                        let count = fields.length;
-
-                        _.each(fields, (field) => {
-                            const fieldname = field.getAttribute('var').replace('muc#roomconfig_', ''),
-                                type = field.getAttribute('type');
-                            let value;
+            addFieldValue (field) {
+                const type = field.getAttribute('type');
+                const fieldname = field.getAttribute('var').replace('muc#roomconfig_', '');
+                const config = this.get('roomconfig');
                 if (fieldname in config) {
+                    let value;
                     switch (type) {
                         case 'boolean':
                             value = config[fieldname] ? 1 : 0;
@@ -676,13 +670,27 @@ converse.plugins.add('converse-muc', {
                     }
                     field.innerHTML = $build('value').t(value);
                 }
-                            configArray.push(field);
-                            if (!--count) {
+                return field;
+            },
+
+            /**
+             * Automatically configure the groupchat based on this model's
+             * 'roomconfig' data.
+             * @private
+             * @method _converse.ChatRoom#autoConfigureChatRoom
+             * @returns { promise }
+             * Returns a promise which resolves once a response IQ has
+             * been received.
+             */
+            autoConfigureChatRoom () {
+                return new Promise(async (resolve, reject) => {
+                    const stanza = await this.fetchRoomConfiguration();
+                    const fields = sizzle('field', stanza);
+                    const configArray = fields.map(f => this.addFieldValue(f))
+                    if (configArray.length) {
                         this.sendConfiguration(configArray, resolve, reject);
                     }
                 });
-                    });
-                });
             },
 
             fetchRoomConfiguration () {

src/headless/dist/converse-headless.js

@@ -45762,26 +45762,21 @@ _converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins.add('converse-muc
         });
       },
 
-      autoConfigureChatRoom() {
-        /* Automatically configure groupchat based on this model's
-         * 'roomconfig' data.
-         *
-         * Returns a promise which resolves once a response IQ has
-         * been received.
+      /**
+       * Given a <field> element, return a copy with a <value> child if
+       * we can find a value for it in this rooms config.
+       * @private
+       * @method _converse.ChatRoom#autoConfigureChatRoom
+       * @returns { Element }
        */
-        return new Promise((resolve, reject) => {
-          this.fetchRoomConfiguration().then(stanza => {
-            const configArray = [],
-                  fields = stanza.querySelectorAll('field'),
-                  config = this.get('roomconfig');
-            let count = fields.length;
-
-            _.each(fields, field => {
-              const fieldname = field.getAttribute('var').replace('muc#roomconfig_', ''),
-                    type = field.getAttribute('type');
-              let value;
+      addFieldValue(field) {
+        const type = field.getAttribute('type');
+        const fieldname = field.getAttribute('var').replace('muc#roomconfig_', '');
+        const config = this.get('roomconfig');
 
         if (fieldname in config) {
+          let value;
+
           switch (type) {
             case 'boolean':
               value = config[fieldname] ? 1 : 0;
@@ -45799,14 +45794,28 @@ _converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins.add('converse-muc
           field.innerHTML = $build('value').t(value);
         }
 
-              configArray.push(field);
+        return field;
+      },
 
-              if (! --count) {
+      /**
+       * Automatically configure the groupchat based on this model's
+       * 'roomconfig' data.
+       * @private
+       * @method _converse.ChatRoom#autoConfigureChatRoom
+       * @returns { promise }
+       * Returns a promise which resolves once a response IQ has
+       * been received.
+       */
+      autoConfigureChatRoom() {
+        return new Promise(async (resolve, reject) => {
+          const stanza = await this.fetchRoomConfiguration();
+          const fields = sizzle('field', stanza);
+          const configArray = fields.map(f => this.addFieldValue(f));
+
+          if (configArray.length) {
             this.sendConfiguration(configArray, resolve, reject);
           }
         });
-          });
-        });
       },
 
       fetchRoomConfiguration() {