Don't treat messages with a `body` as affiliation change messages

src/headless/plugins/muc/muc.js

@@ -450,26 +450,41 @@ class MUC extends ModelWithVCard(ModelWithMessages(ColorAwareModel(ChatBoxBase))
     }
 
     /**
+     * If a user's affiliation has been changed, a <presence> stanza is sent
+     * out, but if the user is not in a room, a <message> stanza MAY be sent
+     * out. This handler handles such message stanzas. See "Example 176" in
+     * XEP-0045.
      * @param {Element} stanza
+     * @returns {void}
      */
     handleAffiliationChangedMessage (stanza) {
+        if (stanza.querySelector('body')) {
+            // If there's a body, we don't treat it as an affiliation change message.
+            return;
+        }
+
         const item = sizzle(`x[xmlns="${Strophe.NS.MUC_USER}"] item`, stanza).pop();
         if (item) {
             const from = stanza.getAttribute('from');
-            const type = stanza.getAttribute('type');
-            const affiliation = item.getAttribute('affiliation');
             const jid = item.getAttribute('jid');
             const data = {
                 from,
-                type,
-                affiliation,
-                'states': [],
-                'show': type == 'unavailable' ? 'offline' : 'online',
-                'role': item.getAttribute('role'),
-                'jid': Strophe.getBareJidFromJid(jid),
-                'resource': Strophe.getResourceFromJid(jid)
+                states: [],
+                jid: Strophe.getBareJidFromJid(jid),
+                resource: Strophe.getResourceFromJid(jid)
             };
-            const occupant = this.occupants.findOccupant({ 'jid': data.jid });
+
+            const affiliation = item.getAttribute('affiliation');
+            if (affiliation) {
+                data.affiliation = affiliation;
+            }
+
+            const role = item.getAttribute('role');
+            if (role) {
+                data.role = role;
+            }
+
+            const occupant = this.occupants.findOccupant({ jid: data.jid });
             if (occupant) {
                 occupant.save(data);
             } else {
@@ -2464,18 +2479,18 @@ class MUC extends ModelWithVCard(ModelWithMessages(ColorAwareModel(ChatBoxBase))
         const current_affiliation = occupant.get('affiliation');
         if (previous_affiliation === 'admin' && isInfoVisible(converse.AFFILIATION_CHANGES.EXADMIN)) {
             this.createMessage({
-                'type': 'info',
-                'message': __('%1$s is no longer an admin of this groupchat', occupant.get('nick')),
+                type: 'info',
+                message: __('%1$s is no longer an admin of this groupchat', occupant.get('nick')),
             });
         } else if (previous_affiliation === 'owner' && isInfoVisible(converse.AFFILIATION_CHANGES.EXOWNER)) {
             this.createMessage({
-                'type': 'info',
-                'message': __('%1$s is no longer an owner of this groupchat', occupant.get('nick')),
+                type: 'info',
+                message: __('%1$s is no longer an owner of this groupchat', occupant.get('nick')),
             });
         } else if (previous_affiliation === 'outcast' && isInfoVisible(converse.AFFILIATION_CHANGES.EXOUTCAST)) {
             this.createMessage({
-                'type': 'info',
-                'message': __('%1$s is no longer banned from this groupchat', occupant.get('nick')),
+                type: 'info',
+                message: __('%1$s is no longer banned from this groupchat', occupant.get('nick')),
             });
         }
 
@@ -2485,15 +2500,15 @@ class MUC extends ModelWithVCard(ModelWithMessages(ColorAwareModel(ChatBoxBase))
             isInfoVisible(converse.AFFILIATION_CHANGES.EXMEMBER)
         ) {
             this.createMessage({
-                'type': 'info',
-                'message': __('%1$s is no longer a member of this groupchat', occupant.get('nick')),
+                type: 'info',
+                message: __('%1$s is no longer a member of this groupchat', occupant.get('nick')),
             });
         }
 
         if (current_affiliation === 'member' && isInfoVisible(converse.AFFILIATION_CHANGES.MEMBER)) {
             this.createMessage({
-                'type': 'info',
-                'message': __('%1$s is now a member of this groupchat', occupant.get('nick')),
+                type: 'info',
+                message: __('%1$s is now a member of this groupchat', occupant.get('nick')),
             });
         } else if (
             (current_affiliation === 'admin' && isInfoVisible(converse.AFFILIATION_CHANGES.ADMIN)) ||
@@ -2501,8 +2516,8 @@ class MUC extends ModelWithVCard(ModelWithMessages(ColorAwareModel(ChatBoxBase))
         ) {
             // For example: AppleJack is now an (admin|owner) of this groupchat
             this.createMessage({
-                'type': 'info',
-                'message': __('%1$s is now an %2$s of this groupchat', occupant.get('nick'), current_affiliation),
+                type: 'info',
+                message: __('%1$s is now an %2$s of this groupchat', occupant.get('nick'), current_affiliation),
             });
         }
     }

src/headless/types/plugins/muc/muc.d.ts

@@ -383,7 +383,12 @@ declare class MUC extends MUC_base {
     occupants: any;
     fetchOccupants(): any;
     /**
+     * If a user's affiliation has been changed, a <presence> stanza is sent
+     * out, but if the user is not in a room, a <message> stanza MAY be sent
+     * out. This handler handles such message stanzas. See "Example 176" in
+     * XEP-0045.
      * @param {Element} stanza
+     * @returns {void}
      */
     handleAffiliationChangedMessage(stanza: Element): void;
     /**