Handle empty tune events (stopped listening to music)

[socialXMPP.git] / scripts / basic.js

diff --git a/scripts/basic.js b/scripts/basic.js
index 984b0cc383236f0d9850ccae0af96d241afcdc42..086729bfdaef66d4d60e754c7562298d197f66cb 100644 (file)
--- a/scripts/basic.js
+++ b/scripts/basic.js
@@ -97,6 +97,10 @@ function _cbRoster(e) {
        }
        addFriend(entries[item].getAttribute('jid'), nick);
     }
+    connection.addHandler(_cbPEP, NS_PEP, 'message');
+    var initialPresence = $pres().c('c', {xmlns: NS_CAPS, hash: 'sha-1', node: 'http://jabber.babelmonkeys.de', ver: genCaps()}).up();
+    connection.send(initialPresence.tree());
+
     return false;
 }
 
@@ -138,24 +142,33 @@ function genCaps() {
 
 function _cbPEP(e) {
     var from = e.getAttribute('from');
+    if (Strophe.getBareJidFromJid(from) == Strophe.getBareJidFromJid(connection.jid)) {
+       return true; // Drop own PEP events
+    }
     var items = e.getElementsByTagName('items')[0];
     // Handle Tune
     if (items.getAttribute('node') == NS_TUNE) {
        var tune = new Tune();
-       tune.artist = Strophe.getText(items.getElementsByTagName('artist')[0]);
-       tune.length= Strophe.getText(items.getElementsByTagName('length')[0]);
-       tune.rating= Strophe.getText(items.getElementsByTagName('rating')[0]);
-       tune.source= Strophe.getText(items.getElementsByTagName('source')[0]);
-       tune.title= Strophe.getText(items.getElementsByTagName('title')[0]);
-       tune.track= Strophe.getText(items.getElementsByTagName('track')[0]);
-       tune.uri= Strophe.getText(items.getElementsByTagName('uri')[0]);
-       roster[jid2id(from)].tune = tune;
-       if ( $('#'+jid2id(from)+' .tune').length > 0 ) {
-           $('#'+jid2id(from)+' .tune').empty();
-           $('#'+jid2id(from)+' .tune').append(Strophe.xmlTextNode('Listening to '+ tune.title + ' by ' + tune.artist + ' from ' + tune.source));
+       if (items.getElementsByTagName('tune')[0].childNodes.length > 0) {
+           tune.artist = Strophe.getText(items.getElementsByTagName('artist')[0]);
+           tune.length= Strophe.getText(items.getElementsByTagName('length')[0]);
+           tune.rating= Strophe.getText(items.getElementsByTagName('rating')[0]);
+           tune.source= Strophe.getText(items.getElementsByTagName('source')[0]);
+           tune.title= Strophe.getText(items.getElementsByTagName('title')[0]);
+           tune.track= Strophe.getText(items.getElementsByTagName('track')[0]);
+           tune.uri= Strophe.getText(items.getElementsByTagName('uri')[0]);
+           if ( $('#'+jid2id(from)+' .tune').length > 0 ) {
+               $('#'+jid2id(from)+' .tune').empty();
+               $('#'+jid2id(from)+' .tune').append(Strophe.xmlTextNode('Listening to '+ tune.title + ' by ' + tune.artist + ' from ' + tune.source));
+           } else {
+               $('#'+jid2id(from)).append('<br /><span class="tune">Listening to '+ tune.title + ' by ' + tune.artist + ' from ' + tune.source + '</span>');
+           }
        } else {
-           $('#'+jid2id(from)).append('<br /><span class="tune">Listening to '+ tune.title + ' by ' + tune.artist + ' from ' + tune.source + '</span>');
+           if ( $('#'+jid2id(from)+' .tune').length > 0 ) {
+               $('#'+jid2id(from)+' .tune').empty();
+           }
        }
+       roster[jid2id(from)].tune = tune;
     }
     return true;
 }
@@ -176,10 +189,7 @@ function onConnect(status) {
     } else if (status == Strophe.Status.CONNECTED) {
        log('Strophe is connected.');
        getRoster();
-       connection.addHandler(_cbPEP, NS_PEP, 'message');
        connection.addHandler(_cbDisco, Strophe.NS.DISCO_INFO, 'iq', 'get');
-       var initialPresence = $pres().c('c', {xmlns: NS_CAPS, hash: 'sha-1', node: 'http://jabber.babelmonkeys.de', ver: genCaps()}).up();
-       connection.send(initialPresence.tree());
     }
 }