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

Always try to reserve nickname when entering room

Browse Source 
Allows for simpler code, especially making `getReservedNick` easier to override
This commit is contained in:
JC Brand 2019-05-23 16:03:09 +02:00
parent 99f2cecbed
commit 04af3eb029
1 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/headless/converse-muc.js
View File

@ -246,7 +246,6 @@ converse.plugins.add('converse-muc', {
this.occupants.fetchMembers();
if (_converse.auto_register_muc_nickname &&
!this.get('reserved_nick') &&
await _converse.api.disco.supports(Strophe.NS.MUC_REGISTER, this.get('jid'))) {
this.registerNickname()
@ -897,19 +896,14 @@ converse.plugins.add('converse-muc', {
* @returns { promise } A promise which resolves with the nickname
*/
async getAndPersistNickname (nick) {
nick = nick || this.get('nick');
const state = {'nick': nick};
if (!nick) {
try {
nick = await this.getReservedNick();
state['reserved_nick'] = nick;
} catch (e) {
nick = _converse.getDefaultMUCNickname();
} finally {
state['nick'] = nick;
nick = nick ||
this.get('nick') ||
await this.getReservedNick() ||
_converse.getDefaultMUCNickname();
if (nick) {
this.save({'nick': nick}, {'silent': true});
}
}
this.save(state, {'silent': true});
return nick;
},
@ -922,7 +916,9 @@ converse.plugins.add('converse-muc', {
* @returns { promise } A promise which resolves with the reserved nick or null
*/
async getReservedNick () {
const iq = await _converse.api.sendIQ(
let iq;
try {
iq = await _converse.api.sendIQ(
$iq({
'to': this.get('jid'),
'from': _converse.connection.jid,
@ -932,6 +928,14 @@ converse.plugins.add('converse-muc', {
'node': 'x-roomuser-item'
})
);
} catch (e) {
if (_.isElement(e)) {
// IQ stanza of type 'error'
return;
} else {
throw e;
}
}
const identity_el = iq.querySelector('query[node="x-roomuser-item"] identity');
return identity_el ? identity_el.getAttribute('name') : null;
},