parse and emit identity information in MUC_MEMBER_JOINED event (#724)

* remove unused 'show' field

* extract and emit identity information from presence

also replaces some uses of jquery

* combine eslint-disable lines

modules/xmpp/ChatRoom.js

@@ -390,28 +390,25 @@ export default class ChatRoom extends Listenable {
      */
     onPresence(pres) {
         const from = pres.getAttribute('from');
-
-        // Parse roles.
         const member = {};
+        const statusEl = pres.getElementsByTagName('status')[0];
 
-        member.show = $(pres).find('>show').text();
-        const $statusNode = $(pres).find('>status');
-        const hasStatus = $statusNode.length;
-
-        if (hasStatus) {
-            member.status = $statusNode.text();
+        if (statusEl) {
+            member.status = statusEl.textContent || '';
         }
         let hasStatusUpdate = false;
-
+        const xElement
+            = pres.getElementsByTagNameNS(
+                'http://jabber.org/protocol/muc#user', 'x')[0];
         const mucUserItem
-            = $(pres).find(
-                '>x[xmlns="http://jabber.org/protocol/muc#user"]>item');
+            = xElement && xElement.getElementsByTagName('item')[0];
 
-        member.affiliation = mucUserItem.attr('affiliation');
-        member.role = mucUserItem.attr('role');
+        member.affiliation
+            = mucUserItem && mucUserItem.getAttribute('affiliation');
+        member.role = mucUserItem && mucUserItem.getAttribute('role');
 
         // Focus recognition
-        const jid = mucUserItem.attr('jid');
+        const jid = mucUserItem && mucUserItem.getAttribute('jid');
 
         member.jid = jid;
         member.isFocus
@@ -421,7 +418,12 @@ export default class ChatRoom extends Listenable {
                 && this.options.hiddenDomain
                     === jid.substring(jid.indexOf('@') + 1, jid.indexOf('/'));
 
-        $(pres).find('>x').remove();
+        const xEl = pres.querySelectorAll('x')[0];
+
+        if (xEl) {
+            xEl.remove();
+        }
+
         const nodes = [];
 
         parser.packet2JSON(pres, nodes);
@@ -430,6 +432,29 @@ export default class ChatRoom extends Listenable {
 
         // process nodes to extract data needed for MUC_JOINED and
         // MUC_MEMBER_JOINED events
+        const extractIdentityInformation = node => {
+            const identity = {};
+            const userInfo = node.children.find(c => c.tagName === 'user');
+
+            if (userInfo) {
+                identity.user = {};
+                for (const tag of [ 'id', 'name', 'avatar' ]) {
+                    const child
+                        = userInfo.children.find(c => c.tagName === tag);
+
+                    if (child) {
+                        identity.user[tag] = child.value;
+                    }
+                }
+            }
+            const groupInfo = node.children.find(c => c.tagName === 'group');
+
+            if (groupInfo) {
+                identity.group = groupInfo.value;
+            }
+
+            return identity;
+        };
 
         for (let i = 0; i < nodes.length; i++) {
             const node = nodes[i];
@@ -444,6 +469,9 @@ export default class ChatRoom extends Listenable {
             case 'stats-id':
                 member.statsID = node.value;
                 break;
+            case 'identity':
+                member.identity = extractIdentityInformation(node);
+                break;
             }
         }
 
@@ -486,7 +514,8 @@ export default class ChatRoom extends Listenable {
                     member.role,
                     member.isHiddenDomain,
                     member.statsID,
-                    member.status);
+                    member.status,
+                    member.identity);
 
                 // we are reporting the status with the join
                 // so we do not want a second event about status update

modules/xmpp/ChatRoom.spec.js

@@ -1,9 +1,12 @@
-import { parser } from './ChatRoom';
+import ChatRoom, { parser } from './ChatRoom';
 import { $pres } from 'strophe.js';
+import XMPPEvents from '../../service/xmpp/XMPPEvents';
 
 // This rule makes creating the xml elements take up way more
 // space than necessary.
 /* eslint-disable newline-per-chained-call */
+// These rules makes the xml strings harder to read
+/* eslint-disable operator-linebreak, max-len */
 
 describe('ChatRoom', () => {
     describe('packet2JSON', () => {
@@ -126,4 +129,103 @@ describe('ChatRoom', () => {
             expect(identity.value).toBeFalsy();
         });
     });
+
+    describe('onPresence', () => {
+        let room;
+        let emitterSpy;
+
+        beforeEach(() => {
+            const xmpp = {
+                options: {}
+            };
+
+            room = new ChatRoom(
+                {} /* connection */,
+                'jid',
+                'password',
+                xmpp,
+                {} /* options */);
+            emitterSpy = spyOn(room.eventEmitter, 'emit');
+        });
+        it('parses status correctly', () => {
+            const presStr = '' +
+                '<presence to="tojid" from="fromjid">' +
+                    '<status>status-text</status>' +
+                '</presence>';
+            const pres = new DOMParser().parseFromString(presStr, 'text/xml').documentElement;
+
+            room.onPresence(pres);
+            expect(emitterSpy.calls.count()).toEqual(1);
+            expect(emitterSpy).toHaveBeenCalledWith(
+                XMPPEvents.MUC_MEMBER_JOINED,
+                'fromjid',
+                undefined, // nick
+                undefined, // role
+                undefined, // isHiddenDomain
+                undefined, // statsID
+                'status-text',
+                undefined);
+        });
+
+        it('parses muc user item correctly', () => {
+            const presStr = '' +
+                '<presence to="tojid" from="fromjid">' +
+                    '<x xmlns="http://jabber.org/protocol/muc#user">' +
+                        '<item jid="jid=attr" affiliation="affiliation-attr" role="role-attr"/>' +
+                    '</x>' +
+                '</presence>';
+            const pres = new DOMParser().parseFromString(presStr, 'text/xml').documentElement;
+
+            room.onPresence(pres);
+            expect(emitterSpy.calls.count()).toEqual(1);
+            expect(emitterSpy).toHaveBeenCalledWith(
+                XMPPEvents.MUC_MEMBER_JOINED,
+                'fromjid',
+                undefined, // nick
+                'role-attr', // role
+                jasmine.any(Boolean), // isHiddenDomain
+                undefined, // statsID
+                undefined,
+                undefined);
+        });
+
+        it('parses identity correctly', () => {
+            const presStr = '' +
+                '<presence to="tojid" from="fromjid">' +
+                    '<status>status-text</status>' +
+                    '<identity>' +
+                        '<user>' +
+                            '<id>id-text</id>' +
+                            '<name>name-text</name>' +
+                            '<avatar>avatar-text</avatar>' +
+                        '</user>' +
+                        '<group>group-text</group>' +
+                    '</identity>' +
+                '</presence>';
+            const pres = new DOMParser().parseFromString(presStr, 'text/xml').documentElement;
+
+            const expectedIdentity = {
+                user: {
+                    id: 'id-text',
+                    name: 'name-text',
+                    avatar: 'avatar-text'
+                },
+                group: 'group-text'
+            };
+
+            room.onPresence(pres);
+            expect(emitterSpy.calls.count()).toEqual(1);
+            expect(emitterSpy).toHaveBeenCalledWith(
+                XMPPEvents.MUC_MEMBER_JOINED,
+                'fromjid',
+                undefined, // nick
+                undefined, // role
+                undefined, // isHiddenDomain
+                undefined, // statsID
+                'status-text',
+                expectedIdentity);
+        });
+
+    });
 });
+