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

Fix rendering of custom emoticons

Browse Source
This commit is contained in:
Tobias Fella
2022-11-15 15:59:12 +01:00
parent 0eeb7ffbc9
commit 29603313a5
2 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/qml/Component/Timeline/LinkPreviewDelegate.qml
View File

@@ -11,21 +11,11 @@ import org.kde.neochat 1.0
RowLayout { RowLayout {
id: row id: row
readonly property var customEmojiLinksRegex: /data-mx-emoticon="" src="(\bhttps?:\/\/[^\s\<\>\"\']*[^\s\<\>\"\'])/g
readonly property var customEmojiLinks: { property var links: model.display.match(/\bhttps?:\/\/[^\s\<\>\"\']+/g)
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 or custom emojis // don't show previews for room links or user mentions or custom emojis
.filter(link => !( .filter(link => !(
link.includes("https://matrix.to") || (customEmojiLinks && customEmojiLinks.includes(link)) link.includes("https://matrix.to") || link.includes("/_matrix/media/r0/download/")
)) ))
// remove ending fullstops and commas // remove ending fullstops and commas
.map(link => (link.length && [".", ","].includes(link[link.length-1])) ? link.substring(0, link.length-1) : link) .map(link => (link.length && [".", ","].includes(link[link.length-1])) ? link.substring(0, link.length-1) : link)

14
src/qml/Component/Timeline/RichLabel.qml
View File

@@ -16,22 +16,10 @@ TextEdit {
property bool isEmote: false 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 readonly property var linkRegex: /(href=["'])?(\b(https?):\/\/[^\s\<\>\"\'\\]+)/g
property string textMessage: model.display.includes("http") property string textMessage: model.display.includes("http")
? model.display.replace(linkRegex, function() { ? model.display.replace(linkRegex, function() {
if (customEmojiLinks && customEmojiLinks.includes(arguments[0])) { if (arguments[0].includes("/_matrix/media/r0/download/")) {
return arguments[0]; return arguments[0];
} }
if (arguments[1]) { if (arguments[1]) {