Ignore own PEP events

[socialXMPP.git] / scripts / basic.js

diff --git a/scripts/basic.js b/scripts/basic.js
index 984b0cc383236f0d9850ccae0af96d241afcdc42..06ff778051d6701d4f2e4e1d78afdef3b1c73e77 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,6 +142,9 @@ 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) {
@@ -176,10 +183,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());
     }
 }