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

Fix eventToString.

Browse Source
This commit is contained in:
Black Hat
2020-01-01 15:40:49 +08:00
parent 5a154eab04
commit 2bd53f19b1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/spectralroom.cpp
View File

@@ -236,6 +236,7 @@ QString SpectralRoom::eventToString(const RoomEvent& evt,
[prettyPrint, removeReply](const RoomMessageEvent& e) { [prettyPrint, removeReply](const RoomMessageEvent& e) {
using namespace MessageEventContent; using namespace MessageEventContent;
// 1. prettyPrint/HTML
if (prettyPrint && e.hasTextContent() && if (prettyPrint && e.hasTextContent() &&
e.mimeType().name() != "text/plain") { e.mimeType().name() != "text/plain") {
auto htmlBody = static_cast<const TextContent*>(e.content())->body; auto htmlBody = static_cast<const TextContent*>(e.content())->body;
@@ -260,10 +261,11 @@ QString SpectralRoom::eventToString(const RoomEvent& evt,
return !fileCaption.isEmpty() ? fileCaption : tr("a file"); return !fileCaption.isEmpty() ? fileCaption : tr("a file");
} }
// 2. prettyPrint/text 3. plainText/HTML 4. plainText/text
QString plainBody; QString plainBody;
if (e.hasTextContent() && e.content()) { if (e.hasTextContent() && e.content() && e.mimeType().name() == "text/plain") { // 2/4
plainBody = static_cast<const TextContent*>(e.content())->body; plainBody = static_cast<const TextContent*>(e.content())->body;
} else { } else { // 3
plainBody = e.plainBody(); plainBody = e.plainBody();
} }