From 91155bf80332155b16b07f162e3ccd51bb9364cf Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Wed, 20 Jan 2021 17:44:11 -0500
Subject: [PATCH] Add commands to override Markdown setting
---
src/timeline/InputBar.cpp | 8 ++++++--
src/timeline/InputBar.h | 9 ++++++++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp
index 3cddd6136..49dd837b6 100644
--- a/src/timeline/InputBar.cpp
+++ b/src/timeline/InputBar.cpp
@@ -251,12 +251,12 @@ InputBar::openFileSelection()
}
void
-InputBar::message(QString msg)
+InputBar::message(QString msg, MarkdownOverride useMarkdown)
{
mtx::events::msg::Text text = {};
text.body = msg.trimmed().toStdString();
- if (ChatPage::instance()->userSettings()->markdown()) {
+ if ((ChatPage::instance()->userSettings()->markdown() && (useMarkdown != MarkdownOverride::OFF)) || (useMarkdown == MarkdownOverride::ON)) {
text.formatted_body = utils::markdownToHtml(msg).toStdString();
// Don't send formatted_body, when we don't need to
@@ -477,6 +477,10 @@ InputBar::command(QString command, QString args)
room->clearTimeline();
} else if (command == "rotate-megolm-session") {
cache::dropOutboundMegolmSession(room->roomId().toStdString());
+ } else if (command == "md") {
+ message(args, MarkdownOverride::ON);
+ } else if (command == "plain") {
+ message(args, MarkdownOverride::OFF);
}
}
diff --git a/src/timeline/InputBar.h b/src/timeline/InputBar.h
index c729a6fc5..75bcdc3a7 100644
--- a/src/timeline/InputBar.h
+++ b/src/timeline/InputBar.h
@@ -12,6 +12,13 @@ class QMimeData;
class QDropEvent;
class QStringList;
+enum class MarkdownOverride
+{
+ NONE, // no override set
+ ON,
+ OFF,
+};
+
class InputBar : public QObject
{
Q_OBJECT
@@ -41,7 +48,7 @@ public slots:
void updateState(int selectionStart, int selectionEnd, int cursorPosition, QString text);
void openFileSelection();
bool uploading() const { return uploading_; }
- void message(QString body);
+ void message(QString body, MarkdownOverride useMarkdown = MarkdownOverride::NONE);
QObject *completerFor(QString completerName);
--
GitLab