Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

See below.

Browse Source 
Refactor out the code for sending an IQ to add a roster contact.
And then call that from acceptRequest.
This commit is contained in:
JC Brand 2015-04-06 13:43:27 +02:00
parent 5b0a88ccdb
commit 7f8da77133
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
converse.js
View File

@ -3666,11 +3666,13 @@
acceptRequest: function (ev) { acceptRequest: function (ev) {
if (ev && ev.preventDefault) { ev.preventDefault(); } if (ev && ev.preventDefault) { ev.preventDefault(); }
var jid = this.model.get('jid');
this.model.authorize(); this.model.authorize();
converse.connection.roster.add(jid, this.model.get('fullname'), [], function (iq) { converse.roster.sendContactAddIQ(
converse.roster.subscribe(jid, null, converse.xmppstatus.get('fullname')); this.model.get('jid'),
}); this.model.get('fullname'),
[],
function (iq) { this.model.subscribe(); }.bind(this)
);
}, },
declineRequest: function (ev) { declineRequest: function (ev) {
@ -3733,9 +3735,26 @@
}); });
}, },
sendContactAddIQ: function (jid, name, groups, callback, errback) {
/* Send an IQ stanza to the XMPP server to add a new roster contact.
* Parameters:
* (String) jid - The Jabber ID of the user being added
* (String) name - The name of that user
* (Array of Strings) groups - Any roster groups the user might belong to
* (Function) callback - A function to call once the VCard is returned
* (Function) errback - A function to call if an error occured
*/
name = _.isEmpty(name)? jid: name;
var iq = $iq({type: 'set'})
.c('query', {xmlns: Strophe.NS.ROSTER})
.c('item', { jid: jid, name: name });
_.map(groups, function (group) { iq.c('group').t(group).up(); });
converse.connection.sendIQ(iq, callback, errback);
},
addContact: function (jid, name, groups, attributes) { addContact: function (jid, name, groups, attributes) {
/* Adds a roster contact. /* Adds a RosterContact instance to converse.roster and
* A RosterContact model will be created and added to converse.roster. * registers the contact on the XMPP server.
* Returns a promise which is resolved once the XMPP server has * Returns a promise which is resolved once the XMPP server has
* responded. * responded.
* Parameters: * Parameters:
@ -3747,9 +3766,7 @@
var deferred = new $.Deferred(); var deferred = new $.Deferred();
groups = groups || []; groups = groups || [];
name = _.isEmpty(name)? jid: name; name = _.isEmpty(name)? jid: name;
var iq = $iq({type: 'set'}).c('query', {xmlns: Strophe.NS.ROSTER}).c('item', { jid: jid, name: name }); this.sendContactAddIQ(jid, name, groups,
_.map(groups, function (group) { iq.c('group').t(group).up(); });
converse.connection.sendIQ(iq,
function (iq) { function (iq) {
var contact = this.create(_.extend({ var contact = this.create(_.extend({
ask: undefined, ask: undefined,