summary refs log tree commit diff
path: root/src/timeline
diff options
context:
space:
mode:
authorLoren Burkholder <computersemiexpert@outlook.com>2021-02-13 18:18:08 -0500
committerNicolas Werner <nicolas.werner@hotmail.de>2021-03-17 19:17:13 +0100
commitc74e68c945d61b0ea1cb25f012949255b3d6c9e7 (patch)
tree28e66adcec450bb15c15b38fbce76c44ca1f22c7 /src/timeline
parentFormat markdown as HTML in notifications (diff)
downloadnheko-c74e68c945d61b0ea1cb25f012949255b3d6c9e7.tar.xz
Parse markdown overrides during replies
I apparently missed this when I originally added the overrides.
Diffstat (limited to 'src/timeline')
-rw-r--r--src/timeline/InputBar.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp
index 20a3fe10..c5168db3 100644
--- a/src/timeline/InputBar.cpp
+++ b/src/timeline/InputBar.cpp
@@ -302,7 +302,9 @@ InputBar::message(QString msg, MarkdownOverride useMarkdown)
 
                 // NOTE(Nico): rich replies always need a formatted_body!
                 text.format = "org.matrix.custom.html";
-                if (ChatPage::instance()->userSettings()->markdown())
+                if ((ChatPage::instance()->userSettings()->markdown() &&
+                        useMarkdown == MarkdownOverride::NOT_SPECIFIED) ||
+                       useMarkdown == MarkdownOverride::ON)
                         text.formatted_body =
                           utils::getFormattedQuoteBody(related, utils::markdownToHtml(msg))
                             .toStdString();