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

Bugfix. Properly escape | character in mentioned nicknames

Browse Source
This commit is contained in:
JC Brand 2021-05-19 14:47:20 +02:00
parent 06f03fc884
commit 994e528b45
3 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/headless/plugins/muc/muc.js
View File

@ -892,9 +892,10 @@ const ChatRoomMixin = {
}, },
getAllKnownNicknamesRegex () { getAllKnownNicknamesRegex () {
const longNickString = this.getAllKnownNicknames().join('|'); const longNickString = this.getAllKnownNicknames()
const escapedLongNickString = p.escapeRegexString(longNickString); .map(n => p.escapeRegexString(n))
return RegExp(`(?:\\p{P}|\\p{Z}|^)@(${escapedLongNickString})(?![\\w@-])`, 'uig'); .join('|');
return RegExp(`(?:\\p{P}|\\p{Z}|^)@(${longNickString})(?![\\w@-])`, 'uig');
}, },
getOccupantByJID (jid) { getOccupantByJID (jid) {

2
src/headless/utils/parse-helpers.js
View File

@ -11,7 +11,7 @@ const escapeRegexChars = (string, char) => string.replace(RegExp('\\' + char, 'i
helpers.escapeCharacters = characters => string => helpers.escapeCharacters = characters => string =>
characters.split('').reduce(escapeRegexChars, string); characters.split('').reduce(escapeRegexChars, string);
helpers.escapeRegexString = helpers.escapeCharacters('[\\^$.?*+(){}'); helpers.escapeRegexString = helpers.escapeCharacters('[\\^$.?*+(){}|');
// `for` is ~25% faster than using `Array.find()` // `for` is ~25% faster than using `Array.find()`
helpers.findFirstMatchInArray = array => text => { helpers.findFirstMatchInArray = array => text => {

49
src/plugins/muc-views/tests/mentions.js
View File

@ -82,6 +82,55 @@ describe("An incoming groupchat message", function () {
done(); done();
})); }));
it("properly renders mentions that contain the pipe character",
mock.initConverse([], {}, async function (done, _converse) {
const muc_jid = 'lounge@montague.lit';
const nick = 'romeo';
await mock.openAndEnterChatRoom(_converse, muc_jid, nick);
const view = _converse.api.chatviews.get(muc_jid);
_converse.connection._dataRecv(mock.createRequest(
$pres({
'to': 'romeo@montague.lit/resource',
'from': `lounge@montague.lit/ThUnD3r|Gr33n`
})
.c('x', {xmlns: Strophe.NS.MUC_USER})
.c('item', {
'affiliation': 'none',
'jid': `${nick}@montague.lit/resource`,
'role': 'participant'
}))
);
const textarea = await u.waitUntil(() => view.querySelector('.chat-textarea'));
textarea.value = 'hello @ThUnD3r|Gr33n'
const enter_event = {
'target': textarea,
'preventDefault': function preventDefault () {},
'stopPropagation': function stopPropagation () {},
'keyCode': 13 // Enter
}
const bottom_panel = view.querySelector('converse-muc-bottom-panel');
bottom_panel.onKeyDown(enter_event);
await u.waitUntil(() => view.querySelectorAll('.chat-msg__text').length);
await u.waitUntil(() => view.querySelectorAll('.chat-msg__text').length);
const sent_stanzas = _converse.connection.sent_stanzas;
const msg = await u.waitUntil(() => sent_stanzas.filter(s => s.nodeName.toLowerCase() === 'message').pop());
expect(Strophe.serialize(msg))
.toBe(`<message from="romeo@montague.lit/orchard" id="${msg.getAttribute("id")}" `+
`to="lounge@montague.lit" type="groupchat" `+
`xmlns="jabber:client">`+
`<body>hello ThUnD3r|Gr33n</body>`+
`<active xmlns="http://jabber.org/protocol/chatstates"/>`+
`<reference begin="6" end="19" type="mention" uri="xmpp:lounge@montague.lit/ThUnD3r%7CGr33n" xmlns="urn:xmpp:reference:0"/>`+
`<origin-id id="${msg.querySelector('origin-id').getAttribute("id")}" xmlns="urn:xmpp:sid:0"/>`+
`</message>`);
const message = await u.waitUntil(() => view.querySelector('.chat-msg__text'));
expect(message.innerHTML.replace(/<!-.*?->/g, '')).toBe('hello <span class="mention">ThUnD3r|Gr33n</span>');
done();
}));
it("highlights all users mentioned via XEP-0372 references in a quoted message", it("highlights all users mentioned via XEP-0372 references in a quoted message",
mock.initConverse([], {}, async function (done, _converse) { mock.initConverse([], {}, async function (done, _converse) {