Avoid duplicating entities
This commit is contained in:
parent
6126781d83
commit
5954cd8f29
8
dist/converse.js
vendored
8
dist/converse.js
vendored
@ -66487,10 +66487,16 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
|
||||
const jid = item.getAttribute('jid');
|
||||
|
||||
if (_.isUndefined(this.items.get(jid))) {
|
||||
const entity = _converse.disco_entities.get(jid);
|
||||
|
||||
if (entity) {
|
||||
this.items.add(entity);
|
||||
} else {
|
||||
this.items.create({
|
||||
'jid': jid
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
@ -66941,9 +66947,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
|
||||
* (String) entity_jid - The JID of the entity which might have the identity
|
||||
*/
|
||||
return new Promise((resolve, reject) => {
|
||||
_converse.api.waitUntil('discoInitialized').then(() => {
|
||||
_converse.api.disco.entities.get(entity_jid, true).then(entity => resolve(entity.getIdentity(category, type)));
|
||||
});
|
||||
}).catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL));
|
||||
}
|
||||
|
||||
|
@ -14,7 +14,11 @@
|
||||
|
||||
describe("Whenever converse.js queries a server for its features", function () {
|
||||
|
||||
it("stores the features it receives", mock.initConverseWithAsync(function (done, _converse) {
|
||||
it("stores the features it receives",
|
||||
mock.initConverseWithPromises(
|
||||
null, ['discoInitialized'], {},
|
||||
function (done, _converse) {
|
||||
|
||||
var IQ_stanzas = _converse.connection.IQ_stanzas;
|
||||
var IQ_ids = _converse.connection.IQ_ids;
|
||||
test_utils.waitUntil(function () {
|
||||
|
@ -138,8 +138,13 @@
|
||||
}
|
||||
const jid = item.getAttribute('jid');
|
||||
if (_.isUndefined(this.items.get(jid))) {
|
||||
const entity = _converse.disco_entities.get(jid);
|
||||
if (entity) {
|
||||
this.items.add(entity);
|
||||
} else {
|
||||
this.items.create({'jid': jid});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
@ -514,10 +519,8 @@
|
||||
* (String) entity_jid - The JID of the entity which might have the identity
|
||||
*/
|
||||
return new Promise((resolve, reject) => {
|
||||
_converse.api.waitUntil('discoInitialized').then(() => {
|
||||
_converse.api.disco.entities.get(entity_jid, true)
|
||||
.then((entity) => resolve(entity.getIdentity(category, type)));
|
||||
})
|
||||
}).catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL));
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user