Check if there is a nick specified or not

[socialXMPP.git] / scripts / basic.js

diff --git a/scripts/basic.js b/scripts/basic.js
index 6620d4940790dc7333f95742d413221e43ed65a3..35719aca0b88d1bf72480e73d3d83251f0d66033 100644 (file)
--- a/scripts/basic.js
+++ b/scripts/basic.js
@@ -18,24 +18,25 @@ function rawOutput(data) {
 }
 
 function jid2id(jid) {
-    return jid.split('@')[0] + "-" + jid.split('@')[1];
+    return jid.split('@').join('-').split('.').join('-');
 }
 
 function _cbVCard(e) {
     var jid = e.getAttribute('from');
     var avatar = e.getElementsByTagName('PHOTO')[0];
-    var mime = Strophe.getText(avatar.getElementsByTagName('TYPE')[0]);
-    var binval = Strophe.getText(avatar.getElementsByTagName('BINVAL')[0]);
+    if (avatar) {
+       var mime = Strophe.getText(avatar.getElementsByTagName('TYPE')[0]);
+       var binval = Strophe.getText(avatar.getElementsByTagName('BINVAL')[0]);
 
-    $("#"+jid2id(jid)+" img").attr('src', 'data:'+mime+';base64,'+binval);
+       $("#"+jid2id(jid)+" img").attr('src', 'data:'+mime+';base64,'+binval);
+    }
 
     return false;
 }
 
 function getAvatar(jid) {
-    var id = 'getvCard'+jid;
-    var vCardiq = $iq({'from':connection.jid+"/"+connection.resource,
-                       'to':jid,
+    var id = 'getvCard'+jid2id(jid);
+    var vCardiq = $iq({'to':jid,
                        'id':id,
                        'type':'get'}
        ).c('vCard', {'xmlns':NS_VCARD});
@@ -45,7 +46,7 @@ function getAvatar(jid) {
 }
 
 function addFriend(jid, nick) {
-    $('#friends').append('<div id="'+jid2id(jid)+'"><img src="imgs/none.png" /><br /><span class="nick">'+nick+'</span></div>');
+    $('#friends').append('<div class="friend" id="'+jid2id(jid)+'"><img src="imgs/none.png" /><br /><span class="nick">'+nick+'</span></div>');
     $('#'+jid2id(jid)).click(function() {
        getAvatar(jid);
     });
@@ -55,7 +56,11 @@ function _cbRoster(e) {
     var query = e.getElementsByTagName('query')[0];
     var entries = query.getElementsByTagName('item');
     for (var item=0; item<entries.length; item++) {
-       addFriend(entries[item].getAttribute('jid'), entries[item].getAttribute('name'));
+       nick = entries[item].getAttribute('name');
+       if (!nick) {
+           nick = entries[item].getAttribute('jid').split('@')[0];
+       }
+       addFriend(entries[item].getAttribute('jid'), nick);
     }
     return false;
 }
@@ -63,8 +68,7 @@ function _cbRoster(e) {
 function getRoster() {
     var id = 'getRoster';
 
-    var rosteriq = $iq({'from':connection.jid+"/"+connection.resource,
-                       'id':id,
+    var rosteriq = $iq({'id':id,
                        'type':'get'}
        ).c('query', {'xmlns':Strophe.NS.ROSTER});