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

MUC: Don't show duplicate subsequent info messages

Browse Source
This commit is contained in:
JC Brand 2019-11-15 18:15:41 +01:00
parent 3d4bad4b19
commit 99f539b3cb
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
spec/muc_messages.js
View File

@ -39,6 +39,32 @@
expect(u.hasClass('chat-msg--followup', messages[1])).toBe(false);
done();
}));
it("is not shown if its a duplicate",
mock.initConverse(
['rosterGroupsFetched', 'chatBoxesFetched'], {},
async function (done, _converse) {
const muc_jid = 'lounge@montague.lit';
await test_utils.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
const view = _converse.api.chatviews.get(muc_jid);
await u.waitUntil(() => view.el.querySelectorAll('.chat-info').length);
const presence = u.toStanza(`
<presence xmlns="jabber:client" to="${_converse.jid}" from="${muc_jid}/romeo">
<x xmlns="http://jabber.org/protocol/muc#user">
<status code="201"/>
<item role="moderator" affiliation="owner" jid="${_converse.jid}"/>
<status code="110"/>
</x>
</presence>
`);
_converse.connection._dataRecv(test_utils.createRequest(presence));
_converse.connection._dataRecv(test_utils.createRequest(presence));
await u.waitUntil(() => view.el.querySelectorAll('.chat-info').length > 1);
expect(view.el.querySelectorAll('.chat-info').length).toBe(2);
done();
}));
});

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

@ -1791,6 +1791,14 @@ converse.plugins.add('converse-muc', {
message = __(_converse.muc.new_nickname_messages[code], nick);
}
if (message) {
if (code === "201" && this.messages.findWhere({'type': 'info', message})) {
return;
} else if (code in _converse.muc.info_messages &&
this.messages.length &&
this.messages.pop().get('message') === message) {
// XXX: very naive duplication checking
return;
}
this.messages.create({'type': 'info', message});
}
});