[#391] Many small fixes:

- reverse $.extend in handleError to avoid clobbering {command}.
- rename {name} to {room} in room selection menu.
- destructure Error object in fromError.
- return the promise chain in /admin.
- fix the /admin arg parser.
- fix the /create promise chain.
- return true after showing a server announcement, to keep the handler.
- [].each -> [].forEach.
- Use instanceof instead of .constructor, which is null/undefined safe.

Author: cburschka

RELEASE-NOTES

@@ -1,5 +1,5 @@
-1.12.0dev - Trixie
-==================
+2.0dev - Tantabus
+=================
 
 This version is under development.
 

VERSION

@@ -1 +1 @@
-VERSION=1.12.0dev
+VERSION=2.0dev

js/core/chat.js

@@ -49,7 +49,10 @@ var Cadence = {
     }
 
     static fromError(error) {
-      if (error instanceof Error) return new Cadence.Error(strings.error.javascript, error);
+      if (error instanceof Error) {
+        const {name, message, stack} = error;
+        return new Cadence.Error(strings.error.javascript, {name, message, stack});
+      }
       // Catch whatever crazy stuff has been thrown at us.
       return new Cadence.Error(strings.error.unknown, {error: JSON.stringify(error)});
     }
@@ -104,7 +107,7 @@ var Cadence = {
     if (!(error instanceof Cadence.Error)) {
       error = Cadence.Error.fromError(error);
     }
-    error.data = $.extend(error.data, {command});
+    error.data = $.extend({command}, error.data);
     error.output();
   },
 

js/core/commands.js

@@ -19,8 +19,7 @@ Cadence.addCommand('admin', arg => {
 
   let sessionid;
 
-  xmpp.command(command)
-  .then((stanza) => {
+  const process = stanza => {
     sessionid = $('command', stanza).attr('sessionid');
     return new Promise((resolve, reject) => {
       if (interactive) {
@@ -39,32 +38,33 @@ Cadence.addCommand('admin', arg => {
         resolve(args);
       }
     });
-  })
-  .then((data) => {
-    return xmpp.commandSubmit(command, sessionid, data);
-  })
-  .then((stanza) => {
+  };
+
+  const submit = data => xmpp.commandSubmit(command, sessionid, data);
+
+  const result = (stanza) => {
     const result = [];
     $('field[type!="hidden"]', stanza).each(function() {
       const label = $(this).attr('label');
       const value = $(this).text();
       result.push($('<strong>').text(value + ':'), ' ', value, $('<br>'));
-    });
-
+    })
     ui.messageInfo(strings.info.admin[result.length ? 'result' : 'completed'], {command, result});
-  })
+  };
+
+  return xmpp.command(command).then(process).then(submit).then(result)
   .catch(error => {
     switch (error.condition) {
       case 'forbidden':
         throw new Cadence.Error(strings.error.admin.forbidden, {command});
       case 'service-unavailable':
         throw new Cadence.Error(strings.error.admin.badCommand, {command});
     }
-    throw new Cadence.Error(strings.error.admin.unknown, {command});
+    throw error;
   });
 })
 .parse(string => {
-  const m = Cadence.parseArgs(string);
+  const arg = Cadence.parseArgs(string);
 
   // Make single-argument commands more convenient:
   const defaultArgs = {
@@ -75,11 +75,11 @@ Cadence.addCommand('admin', arg => {
   }
 
   // Use first positional argument as command.
-  if (m[0].length) m.cmd = m[0][0];
   // If there is more, use the remaining text as an argument.
-  if (m[0].length > 1 && m.cmd in defaultArgs)
-    m[defaultArgs[m.cmd]] = arg.substring(m[1][0][0]).trim();
-  return m;
+  if (arg[0].length) arg.cmd = arg[0][0];
+  if (arg[0].length > 1 && arg.cmd in defaultArgs)
+    arg[defaultArgs[arg.cmd]] = string.substring(arg[1][0][0]).trim();
+  return arg;
 })
 .require(Cadence.requirements.online);
 
@@ -96,7 +96,7 @@ Cadence.addCommand('affiliate', ({type, nick, jid}) => {
 
   // List users with a specific affiliation.
   if (!target) {
-    return xmpp.getUsers({affiliation: type}).then((stanza) => {
+    const list = stanza => {
       // Create a dictionary of non-occupant users:
       const users = {};
       $('item', stanza).map(function() {
@@ -118,8 +118,9 @@ Cadence.addCommand('affiliate', ({type, nick, jid}) => {
       for (let jid in users) users[jid] = visual.format.user(users[jid]);
 
       ui.messageInfo(strings.info.affiliations[type], {type, list: users});
-    })
-    .catch(error => {
+    };
+
+    return xmpp.getUsers({affiliation: type}).then(list).catch(error => {
       if (error.condition == 'forbidden')
         throw new Cadence.Error(strings.error.affiliations.forbidden, {type});
       throw error;
@@ -397,28 +398,30 @@ Cadence.addCommand('create', arg => {
     },
     error => {
       // Catch only an <item-not-found> error.
-      if (!$('item-not-found', error).length) throw error;
+      if (error.condition != 'item-not-found') throw error;
     }
   );
 
-  const create = () => {
+  const join = () => {
     ui.messageInfo(strings.info.creating, {
       room,
       user: {nick: xmpp.nick.target, jid: xmpp.jid}
     });
     return xmpp.joinRoom({room: name});
   };
 
-  const configure = () => xmpp.roomConfig(name).then(processForm);
-  const processForm = form => fillForm(form).then(submit, cancel);
+  const getForm = () => xmpp.roomConfig(name);
   const fillForm = form => {
     // Use command-line arguments or just set the room title.
-    if (!interactive) return Cadence.roomConf(arg) || {'muc#roomconfig_roomname': title};
+    if (!interactive) {
+      const conf = Cadence.roomConf(arg) || {'muc#roomconfig_roomname': title};
+      return Promise.resolve(conf);
+    }
 
     // Unlike /configure, this form is in the promise chain. It can only be submitted once.
     return new Promise((resolve, reject) => {
-      const form = ui.dataForm(conf, resolve);
-      return ui.formDialog(form, {cancel: reject, apply: false});
+      const htmlForm = ui.dataForm(form, resolve);
+      return ui.formDialog(htmlForm, {cancel: reject, apply: false});
     });
   };
   const submit = data => xmpp.roomConfigSubmit(name, data);
@@ -427,6 +430,9 @@ Cadence.addCommand('create', arg => {
     throw error || new Cadence.Error(strings.error.roomCreateCancel);
   };
 
+  const processForm = form => fillForm(form).then(submit).catch(cancel);
+  const configure = () => getForm().then(processForm);
+
   const success = () => {
     xmpp.setRoom(name);
     Cadence.setSetting('xmpp.room', name);
@@ -442,14 +448,16 @@ Cadence.addCommand('create', arg => {
     throw error;
   };
 
-  return checkExists.then(create).then(configure).then(success, error);
+  const create = () => join().then(configure).then(success, error);
+
+  return checkExists.then(create);
 })
 .parse(string => {
   const arg = Cadence.parseArgs(string);
   // Use --name or positional args or --title as name.
   const name = arg.name || arg[0].join(' ') || arg.title;
   // Use --title or --name as title.
-  arg.title = arg.title || arg.name;
+  arg.title = arg.title || name;
   // The name must be lowercase.
   arg.name = name.toLowerCase();
   return arg;

js/core/ui.js

@@ -234,7 +234,7 @@ var ui = {
     // The room selection menu listens for changes.
     this.dom.roomSelection.change(function() {
       if (this.value != xmpp.room.current) {
-        if (this.value) Cadence.tryCommand('join', {name: this.value});
+        if (this.value) Cadence.tryCommand('join', {room: this.value});
         else Cadence.tryCommand('part');
       }
     });

js/core/xmpp.js

@@ -502,7 +502,7 @@ var xmpp = {
     $.each(data, (name, values) => {
       if (values !== undefined) {
         form.c('field', {'var': name});
-        if (!values || values.constructor != Array) values = [values];
+        if (!(values instanceof Array)) values = [values];
         values.forEach(value => form.c('value', {}, String(value)));
         form.up();
       }
@@ -586,8 +586,8 @@ var xmpp = {
     $.each(data, (name, values) => {
       if (values !== undefined) {
         form.c('field', {'var': name});
-        if (!values || values.constructor != Array) values = [values];
-        values.each(value => form.c('value', {}, String(value)));
+        if (!values || !(values instanceof Array)) values = [values];
+        values.forEach(value => form.c('value', {}, String(value)));
         form.up();
       }
     });
@@ -958,8 +958,10 @@ var xmpp = {
       const time = delay.attr('stamp') || (new Date()).toISOString();
 
       // Message of the Day.
-      if (!from.node && !from.resource)
-        return ui.messageError(strings.info.motd, {domain: from.domain, text: body});
+      if (!from.node && !from.resource) {
+        ui.messageError(strings.info.motd, {domain: from.domain, text: body});
+        return true;
+      }
 
       if (muc) {
         const codes = $.makeArray($('x status', stanza).map(function() {
@@ -1154,7 +1156,7 @@ var xmpp = {
         query.attrs({type: typeof val});
         if (val !== undefined) query.t(String(val));
       }
-      else if (val.constructor === Array) {
+      else if (val instanceof Array) {
         query.attrs({type: 'array'});
         encodeArray(val);
       }