Refactor incoming subscription handling code into its own method

converse.js

@@ -1903,7 +1903,7 @@
                     'unavailable': __('This contact is unavailable'),
                     'xa': __('This contact is away for an extended period'),
                     'away': __('This contact is away')
-                }
+                };
                 var classes_to_remove = [
                     'current-xmpp-contact',
                     'pending-xmpp-contact',
@@ -2147,40 +2147,10 @@
                 }, this);
             },
 
-            presenceHandler: function (presence) {
-                var $presence = $(presence),
-                    presence_type = $presence.attr('type');
-                if (presence_type === 'error') {
-                    // TODO
-                    // error presence stanzas don't necessarily have a 'from' attr.
-                    return true;
-                }
-                var jid = $presence.attr('from'),
-                    bare_jid = Strophe.getBareJidFromJid(jid),
-                    resource = Strophe.getResourceFromJid(jid),
-                    $show = $presence.find('show'),
-                    chat_status = $show.text() || 'online',
-                    status_message = $presence.find('status'),
-                    item;
+            handleIncomingSubscription: function (jid) {
+                var bare_jid = Strophe.getBareJidFromJid(jid);
+                var item = this.getItem(bare_jid);
 
-                if (this.isSelf(bare_jid)) {
-                    if ((converse.connection.jid !== jid)&&(presence_type !== 'unavailable')) {
-                        // Another resource has changed it's status, we'll update ours as well.
-                        // FIXME: We should ideally differentiate between converse.js using
-                        // resources and other resources (i.e Pidgin etc.)
-                        converse.xmppstatus.save({'status': chat_status});
-                    }
-                    return true;
-                } else if (($presence.find('x').attr('xmlns') || '').indexOf(Strophe.NS.MUC) === 0) {
-                    return true; // Ignore MUC
-                }
-                item = this.getItem(bare_jid);
-                if (item && (status_message.text() != item.get('status'))) {
-                    item.save({'status': status_message.text()});
-                }
-                if ((presence_type === 'subscribed') || (presence_type === 'unsubscribe')) {
-                    return true;
-                } else if (presence_type === 'subscribe') {
                 if (!converse.allow_contact_requests) {
                     converse.connection.roster.unauthorize(bare_jid);
                     return true;
@@ -2215,6 +2185,8 @@
                                 }, this),
                                 $.proxy(function (jid, fullname, img, img_type, url) {
                                     converse.log("Error while retrieving vcard");
+                                    // XXX: Should vcard_updated be set here as
+                                    // well?
                                     this.add({jid: bare_jid, subscription: 'none', ask: 'request', fullname: jid, is_last: true});
                                 }, this)
                             );
@@ -2223,6 +2195,44 @@
                         }
                     }
                 }
+                return true;
+            },
+
+            presenceHandler: function (presence) {
+                var $presence = $(presence),
+                    presence_type = $presence.attr('type');
+                if (presence_type === 'error') {
+                    // TODO
+                    // error presence stanzas don't necessarily have a 'from' attr.
+                    return true;
+                }
+                var jid = $presence.attr('from'),
+                    bare_jid = Strophe.getBareJidFromJid(jid),
+                    resource = Strophe.getResourceFromJid(jid),
+                    $show = $presence.find('show'),
+                    chat_status = $show.text() || 'online',
+                    status_message = $presence.find('status'),
+                    item;
+
+                if (this.isSelf(bare_jid)) {
+                    if ((converse.connection.jid !== jid)&&(presence_type !== 'unavailable')) {
+                        // Another resource has changed it's status, we'll update ours as well.
+                        // FIXME: We should ideally differentiate between converse.js using
+                        // resources and other resources (i.e Pidgin etc.)
+                        converse.xmppstatus.save({'status': chat_status});
+                    }
+                    return true;
+                } else if (($presence.find('x').attr('xmlns') || '').indexOf(Strophe.NS.MUC) === 0) {
+                    return true; // Ignore MUC
+                }
+                item = this.getItem(bare_jid);
+                if (item && (status_message.text() != item.get('status'))) {
+                    item.save({'status': status_message.text()});
+                }
+                if ((presence_type === 'subscribed') || (presence_type === 'unsubscribe')) {
+                    return true;
+                } else if (presence_type === 'subscribe') {
+                    return this.handleIncomingSubscription(jid);
                 } else if (presence_type === 'unsubscribed') {
                     this.unsubscribe(bare_jid);
                 } else if (presence_type === 'unavailable') {