From 1f38a992a53b71c62077803767473d1bc8a74c58 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sun, 16 Apr 2017 22:47:48 +0300 Subject: Make sure message body is treated as plain text The previous code deviated from the spec, trying to guess on the content type of body as if there could be HTML in some cases. The spec openly states that 'body' value should always be in plain text. --- events/roommessageevent.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/events/roommessageevent.cpp b/events/roommessageevent.cpp index 34315363..f5dcb7d0 100644 --- a/events/roommessageevent.cpp +++ b/events/roommessageevent.cpp @@ -155,9 +155,10 @@ TextContent::TextContent(const QJsonObject& json) mimeType = db.mimeTypeForName("text/html"); body = json["formatted_body"].toString(); } else { - // Best-guessing from the content + // Falling back to plain text, as there's no standard way to describe + // rich text in messages. body = json["body"].toString(); - mimeType = db.mimeTypeForData(body.toUtf8()); + mimeType = db.mimeTypeForName("text/plain"); } } -- cgit v1.2.3