From 7742f12f3015bb2f155741083c2866f29b2992dc Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Mon, 27 Dec 2021 19:08:13 +0100 Subject: [PATCH] Use body in alt text of custom emoji --- resources/qml/Completer.qml | 2 +- src/CombinedImagePackModel.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/Completer.qml b/resources/qml/Completer.qml index c58cda14..abaee3df 100644 --- a/resources/qml/Completer.qml +++ b/resources/qml/Completer.qml @@ -69,7 +69,7 @@ Popup { onCompleterNameChanged: { if (completerName) { - completer = TimelineManager.completerFor(completerName, room.roomId); + completer = TimelineManager.completerFor(completerName, completerName == "room" ? "" : room.roomId); completer.setSearchString(""); } else { completer = undefined; diff --git a/src/CombinedImagePackModel.cpp b/src/CombinedImagePackModel.cpp index 2a8959c0..47cb76ec 100644 --- a/src/CombinedImagePackModel.cpp +++ b/src/CombinedImagePackModel.cpp @@ -58,7 +58,7 @@ CombinedImagePackModel::data(const QModelIndex &index, int role) const case CompletionModel::CompletionRole: return QString("\"%2\"") .arg(QString::fromStdString(images[index.row()].image.url).toHtmlEscaped(), - images[index.row()].shortcode); + QString::fromStdString(images[index.row()].image.body)); case Roles::Url: return QString::fromStdString(images[index.row()].image.url); case CompletionModel::SearchRole: