ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix custom emojis

Browse Source 
Don't turn them into a tags, and don't generate previews of them.

BUG: 460178

BUG: 460179
This commit is contained in:
Bharadwaj Raju
2022-10-11 18:31:06 +00:00
committed by Tobias Fella
parent 9398c5004c
commit 61f1e2481b
2 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
imports/NeoChat/Component/Timeline/LinkPreviewDelegate.qml
View File

@@ -11,9 +11,22 @@ import org.kde.neochat 1.0
RowLayout {
id: row
readonly property var customEmojiLinksRegex: /data-mx-emoticon="" src="(\bhttps?:\/\/[^\s\<\>\"\']*[^\s\<\>\"\'])/g
readonly property var customEmojiLinks: {
let links = [];
// we need all this because QML JS doesn't support String.matchAll introduced in ECMAScript 2020
let match = customEmojiLinksRegex.exec(model.display);
while (match !== null) {
links.push(match[1])
match = customEmojiLinksRegex.exec(model.display);
}
return links;
}
property var links: model.display.match(/(\bhttps?:\/\/[^\s\<\>\"\']*[^\s\<\>\"\'])/g)
// don't show previews for room links or user mentions
.filter(link => !link.includes("https://matrix.to"))
// don't show previews for room links or user mentions or custom emojis
.filter(link => !(
link.includes("https://matrix.to") || (customEmojiLinks && customEmojiLinks.includes(link))
))
// remove ending fullstops and commas
.map(link => (link.length && [".", ","].includes(link[link.length-1])) ? link.substring(0, link.length-1) : link)
LinkPreviewer {

31
imports/NeoChat/Component/Timeline/RichLabel.qml
View File

@@ -17,20 +17,33 @@ TextEdit {
property bool isEmote: false
/* Turn all links which aren't already in <a> tags into <a> hyperlinks */
readonly property var customEmojiLinksRegex: /data-mx-emoticon="" src="(\bhttps?:\/\/[^\s\<\>\"\']*[^\s\<\>\"\'])/g
readonly property var customEmojiLinks: {
let links = [];
// we need all this because QML JS doesn't support String.matchAll introduced in ECMAScript 2020
let match = customEmojiLinksRegex.exec(model.display);
while (match !== null) {
links.push(match[1])
match = customEmojiLinksRegex.exec(model.display);
}
return links;
}
readonly property var linkRegex: /(href=["'])?(\b(https?):\/\/[^\s\<\>\"\'\\]+)/g
property string textMessage: model.display.includes("http")
? model.display.replace(linkRegex, function() {
if (customEmojiLinks && customEmojiLinks.includes(arguments[0])) {
return arguments[0];
}
if (arguments[1]) {
return arguments[0];
} else {
var l = arguments[2];
if ([".", ","].includes(l[l.length-1])) {
var link = l.substring(0, l.length-1);
var leftover = l[l.length-1];
return "<a href=\"" + link + "\">" + link + "</a>" + leftover;
}
return "<a href=\"" + l + "\">" + l + "</a>";
}
}
const l = arguments[2];
if ([".", ","].includes(l[l.length-1])) {
const link = l.substring(0, l.length-1);
const leftover = l[l.length-1];
return `<a href="${link}">${link}</a>${leftover}`;
}
return `<a href="${l}">${l}</a>`;
})
: model.display
property bool spoilerRevealed: !hasSpoiler.test(textMessage)