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

Fix Stickers

Browse Source 
Fix so that stickers are rendered and that the context menu works for them.
This commit is contained in:
James Graham
2022-09-22 19:03:06 +00:00
parent 37780c2e3b
commit ef40f5a747
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
imports/NeoChat/Component/Timeline/EventDelegate.qml
View File

@@ -42,9 +42,7 @@ DelegateChooser {
DelegateChoice { DelegateChoice {
roleValue: "sticker" roleValue: "sticker"
delegate: ImageDelegate { delegate: ImageDelegate {}
cardBackground: false
}
} }
DelegateChoice { DelegateChoice {

28
src/messageeventmodel.cpp
View File

@@ -542,12 +542,17 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
} }
if (role == MimeTypeRole) { if (role == MimeTypeRole) {
auto e = eventCast<const RoomMessageEvent>(&evt); if (auto e = eventCast<const RoomMessageEvent>(&evt)) {
if (!e || !e->hasFileContent()) { if (!e || !e->hasFileContent()) {
return QVariant(); return QVariant();
}
return e->content()->fileInfo()->mimeType.name();
} }
return e->content()->fileInfo()->mimeType.name(); if (auto e = eventCast<const StickerEvent>(&evt)) {
return e->image().mimeType.name();
}
} }
if (role == SpecialMarksRole) { if (role == SpecialMarksRole) {
@@ -788,7 +793,22 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
return m_currentRoom->makeMediaUrl(e->id(), e->content()->originalJson["url"].toString()); return m_currentRoom->makeMediaUrl(e->id(), e->content()->originalJson["url"].toString());
} }
} }
// Requires https://github.com/quotient-im/libQuotient/pull/570
// if (auto e = eventCast<const StickerEvent>(&evt)) {
// return m_currentRoom->makeMediaUrl(e->id(), e->url());
// }
#endif #endif
// Construct link in the same form as urlToDownload as that function doesn't work for stickers
if (auto e = eventCast<const StickerEvent>(&evt)) {
auto url = QUrl(m_currentRoom->connection()->homeserver().toString() + "/_matrix/media/r0/download/" + e->url().toString().remove("mxc://"));
QUrlQuery q(url.query());
q.addQueryItem("allow_remote", "true");
url.setQuery(q);
return url;
}
return m_currentRoom->urlToDownload(evt.id()); return m_currentRoom->urlToDownload(evt.id());
} }