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

Styling: Use only "local" offset for mentions

Browse Source
This commit is contained in:
JC Brand 2020-12-09 17:49:19 +01:00
parent af2df84fc1
commit 9174be8ff3
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/shared/message/text.js
View File

@ -126,11 +126,12 @@ export class MessageText extends String {
* Look for mentions included as XEP-0372 references and add templates for
* rendering them.
* @param { String } text
* @param { Integer } offset - The index of the passed in text relative to
* the start of the MessageText.
* @param { Integer } local_offset - The index of the passed in text relative to
* the start of this MessageText instance (which is not necessarily the same as the
* offset from the start of the original message stanza's body text).
*/
addMentions (text, offset) {
offset += this.offset;
addMentions (text, local_offset) {
const full_offset = local_offset+this.offset;
if (!this.model.collection) {
// This model doesn't belong to a collection anymore, so it must be
// have been removed in the meantime and can be ignored.
@ -139,16 +140,24 @@ export class MessageText extends String {
}
const nick = this.model.collection.chatbox.get('nick');
this.model.get('references')?.forEach(ref => {
const begin = Number(ref.begin)-offset;
if (begin < 0 || begin >= offset+text.length) {
const begin = Number(ref.begin)-full_offset;
if (begin < 0 || begin >= full_offset+text.length) {
return;
}
const end = Number(ref.end)-offset;
const end = Number(ref.end)-full_offset;
const mention = text.slice(begin, end);
if (mention === nick) {
this.addTemplateResult(begin+offset, end+offset, tpl_mention_with_nick({mention}));
this.addTemplateResult(
begin+local_offset,
end+local_offset,
tpl_mention_with_nick({mention})
);
} else {
this.addTemplateResult(begin+offset, end+offset, tpl_mention({mention}));
this.addTemplateResult(
begin+local_offset,
end+local_offset,
tpl_mention({mention})
);
}
});
}