From 2bd53f19b1b2434b60a89fe7ec5c85a66b2b3723 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Wed, 1 Jan 2020 15:40:49 +0800 Subject: [PATCH] Fix eventToString. --- src/spectralroom.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/spectralroom.cpp b/src/spectralroom.cpp index 4906ca0b4..ff2e3c6a4 100644 --- a/src/spectralroom.cpp +++ b/src/spectralroom.cpp @@ -236,6 +236,7 @@ QString SpectralRoom::eventToString(const RoomEvent& evt, [prettyPrint, removeReply](const RoomMessageEvent& e) { using namespace MessageEventContent; + // 1. prettyPrint/HTML if (prettyPrint && e.hasTextContent() && e.mimeType().name() != "text/plain") { auto htmlBody = static_cast(e.content())->body; @@ -260,10 +261,11 @@ QString SpectralRoom::eventToString(const RoomEvent& evt, return !fileCaption.isEmpty() ? fileCaption : tr("a file"); } + // 2. prettyPrint/text 3. plainText/HTML 4. plainText/text QString plainBody; - if (e.hasTextContent() && e.content()) { + if (e.hasTextContent() && e.content() && e.mimeType().name() == "text/plain") { // 2/4 plainBody = static_cast(e.content())->body; - } else { + } else { // 3 plainBody = e.plainBody(); }