2
0
Эх сурвалжийг харах

Create utils method `isSameBareJID`. Refs: #894

JC Brand 8 жил өмнө
parent
commit
1f82b7dfe4

+ 2 - 2
src/converse-core.js

@@ -1020,7 +1020,7 @@
             },
 
             isSelf: function (jid) {
-                return (Strophe.getBareJidFromJid(jid) === Strophe.getBareJidFromJid(_converse.connection.jid));
+                return utils.isSameBareJID(jid, _converse.connection.jid);
             },
 
             addAndSubscribe: function (jid, name, groups, message, attributes) {
@@ -1510,7 +1510,7 @@
                  */
                 // TODO: we can likely just reuse "onMessage" below
                 var from_jid =  Strophe.getBareJidFromJid(message.getAttribute('from'));
-                if (from_jid === _converse.bare_jid) {
+                if (utils.isSameBareJID(from_jid, _converse.bare_jid)) {
                     return true;
                 }
                 // Get chat box, but only create a new one when the message has a body.

+ 1 - 1
src/converse-muc.js

@@ -1717,7 +1717,7 @@
                     var item = sizzle('x[xmlns="'+Strophe.NS.MUC_USER+'"] item', pres).pop();
                     if (_.isNil(item)) { return; }
                     var jid = item.getAttribute('jid');
-                    if (Strophe.getBareJidFromJid(jid).toLowerCase() === _converse.bare_jid.toLowerCase()) {
+                    if (utils.isSameBareJID(jid, _converse.bare_jid)) {
                         var affiliation = item.getAttribute('affiliation');
                         var role = item.getAttribute('role');
                         if (affiliation) {

+ 5 - 0
src/utils.js

@@ -227,6 +227,11 @@
             }
         },
 
+        isSameBareJID: function (jid1, jid2) {
+            return Strophe.getBareJidFromJid(jid1).toLowerCase() ===
+                   Strophe.getBareJidFromJid(jid2).toLowerCase();
+        },
+
         isNewMessage: function (message) {
             /* Given a stanza, determine whether it's a new
              * message, i.e. not a MAM archived one.