From e66cae5fd3e74c5839804e560332e5690709931a Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Tue, 10 Jul 2018 20:18:21 +0900 Subject: Room::postHtmlMessage() - a facility method to send HTML messages --- lib/events/roommessageevent.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'lib/events') diff --git a/lib/events/roommessageevent.cpp b/lib/events/roommessageevent.cpp index e07054a4..1c5cf058 100644 --- a/lib/events/roommessageevent.cpp +++ b/lib/events/roommessageevent.cpp @@ -164,7 +164,10 @@ bool RoomMessageEvent::hasThumbnail() const TextContent::TextContent(const QString& text, const QString& contentType) : mimeType(QMimeDatabase().mimeTypeForName(contentType)), body(text) -{ } +{ + if (contentType == "org.matrix.custom.html") + mimeType = QMimeDatabase().mimeTypeForName("text/html"); +} TextContent::TextContent(const QJsonObject& json) { @@ -189,9 +192,12 @@ TextContent::TextContent(const QJsonObject& json) void TextContent::fillJson(QJsonObject* json) const { Q_ASSERT(json); - json->insert(QStringLiteral("format"), - QStringLiteral("org.matrix.custom.html")); - json->insert(QStringLiteral("formatted_body"), body); + if (mimeType.inherits("text/html")) + { + json->insert(QStringLiteral("format"), + QStringLiteral("org.matrix.custom.html")); + json->insert(QStringLiteral("formatted_body"), body); + } } LocationContent::LocationContent(const QString& geoUri, const ImageInfo& thumbnail) -- cgit v1.2.3