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

Fix crash in media url

Browse Source
This commit is contained in:
Tobias Fella
2023-05-07 09:40:11 +02:00
parent 8d45d4404e
commit a12a44b722
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/models/messageeventmodel.cpp
View File

@@ -1115,12 +1115,16 @@ QVariantMap MessageEventModel::getMediaInfoFromFileInfo(const EventContent::File
// Get the mxc URL for the media. // Get the mxc URL for the media.
#ifdef QUOTIENT_07 #ifdef QUOTIENT_07
QUrl source = m_currentRoom->makeMediaUrl(eventId, fileInfo->url()); if (!fileInfo->url().isValid() || eventId.isEmpty()) {
if (source.isValid() && source.scheme() == QStringLiteral("mxc")) {
mediaInfo["source"] = source;
} else {
mediaInfo["source"] = QUrl(); mediaInfo["source"] = QUrl();
} else {
QUrl source = m_currentRoom->makeMediaUrl(eventId, fileInfo->url());
if (source.isValid() && source.scheme() == QStringLiteral("mxc")) {
mediaInfo["source"] = source;
} else {
mediaInfo["source"] = QUrl();
}
} }
#else #else
auto url = QUrl(m_currentRoom->connection()->homeserver().toString() + "/_matrix/media/r0/download/" + fileInfo->url.toString().remove("mxc://")); auto url = QUrl(m_currentRoom->connection()->homeserver().toString() + "/_matrix/media/r0/download/" + fileInfo->url.toString().remove("mxc://"));