Always try to reserve nickname when entering room
Allows for simpler code, especially making `getReservedNick` easier to override
This commit is contained in:
parent
99f2cecbed
commit
04af3eb029
@ -246,7 +246,6 @@ converse.plugins.add('converse-muc', {
|
|||||||
this.occupants.fetchMembers();
|
this.occupants.fetchMembers();
|
||||||
|
|
||||||
if (_converse.auto_register_muc_nickname &&
|
if (_converse.auto_register_muc_nickname &&
|
||||||
!this.get('reserved_nick') &&
|
|
||||||
await _converse.api.disco.supports(Strophe.NS.MUC_REGISTER, this.get('jid'))) {
|
await _converse.api.disco.supports(Strophe.NS.MUC_REGISTER, this.get('jid'))) {
|
||||||
|
|
||||||
this.registerNickname()
|
this.registerNickname()
|
||||||
@ -897,19 +896,14 @@ converse.plugins.add('converse-muc', {
|
|||||||
* @returns { promise } A promise which resolves with the nickname
|
* @returns { promise } A promise which resolves with the nickname
|
||||||
*/
|
*/
|
||||||
async getAndPersistNickname (nick) {
|
async getAndPersistNickname (nick) {
|
||||||
nick = nick || this.get('nick');
|
nick = nick ||
|
||||||
const state = {'nick': nick};
|
this.get('nick') ||
|
||||||
if (!nick) {
|
await this.getReservedNick() ||
|
||||||
try {
|
_converse.getDefaultMUCNickname();
|
||||||
nick = await this.getReservedNick();
|
|
||||||
state['reserved_nick'] = nick;
|
if (nick) {
|
||||||
} catch (e) {
|
this.save({'nick': nick}, {'silent': true});
|
||||||
nick = _converse.getDefaultMUCNickname();
|
|
||||||
} finally {
|
|
||||||
state['nick'] = nick;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
this.save(state, {'silent': true});
|
|
||||||
return nick;
|
return nick;
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -922,16 +916,26 @@ converse.plugins.add('converse-muc', {
|
|||||||
* @returns { promise } A promise which resolves with the reserved nick or null
|
* @returns { promise } A promise which resolves with the reserved nick or null
|
||||||
*/
|
*/
|
||||||
async getReservedNick () {
|
async getReservedNick () {
|
||||||
const iq = await _converse.api.sendIQ(
|
let iq;
|
||||||
$iq({
|
try {
|
||||||
'to': this.get('jid'),
|
iq = await _converse.api.sendIQ(
|
||||||
'from': _converse.connection.jid,
|
$iq({
|
||||||
'type': "get"
|
'to': this.get('jid'),
|
||||||
}).c("query", {
|
'from': _converse.connection.jid,
|
||||||
'xmlns': Strophe.NS.DISCO_INFO,
|
'type': "get"
|
||||||
'node': 'x-roomuser-item'
|
}).c("query", {
|
||||||
})
|
'xmlns': Strophe.NS.DISCO_INFO,
|
||||||
);
|
'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');
|
const identity_el = iq.querySelector('query[node="x-roomuser-item"] identity');
|
||||||
return identity_el ? identity_el.getAttribute('name') : null;
|
return identity_el ? identity_el.getAttribute('name') : null;
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user