summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2021-04-01 17:51:10 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2021-04-01 17:51:30 +0200
commit8719d59e2228c9d966caa50b02aca09cb99a6ffb (patch)
tree9761e33014c3a50a4a99c51d4b58d8d23592594e /src
parentMerge pull request #540 from LorenDB/master (diff)
downloadnheko-8719d59e2228c9d966caa50b02aca09cb99a6ffb.tar.xz
Fix rainbow replies and add rainbowme
Diffstat (limited to 'src')
-rw-r--r--src/timeline/InputBar.cpp14
-rw-r--r--src/timeline/InputBar.h2
2 files changed, 9 insertions, 7 deletions
diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp

index 53296efd..38c08d1c 100644 --- a/src/timeline/InputBar.cpp +++ b/src/timeline/InputBar.cpp
@@ -306,9 +306,9 @@ InputBar::message(QString msg, MarkdownOverride useMarkdown, bool rainbowify) if ((ChatPage::instance()->userSettings()->markdown() && useMarkdown == MarkdownOverride::NOT_SPECIFIED) || useMarkdown == MarkdownOverride::ON) - text.formatted_body = - utils::getFormattedQuoteBody(related, utils::markdownToHtml(msg)) - .toStdString(); + text.formatted_body = utils::getFormattedQuoteBody( + related, utils::markdownToHtml(msg, rainbowify)) + .toStdString(); else text.formatted_body = utils::getFormattedQuoteBody(related, msg.toHtmlEscaped()).toStdString(); @@ -321,9 +321,9 @@ InputBar::message(QString msg, MarkdownOverride useMarkdown, bool rainbowify) } void -InputBar::emote(QString msg) +InputBar::emote(QString msg, bool rainbowify) { - auto html = utils::markdownToHtml(msg); + auto html = utils::markdownToHtml(msg, rainbowify); mtx::events::msg::Emote emote; emote.body = msg.trimmed().toStdString(); @@ -475,7 +475,7 @@ void InputBar::command(QString command, QString args) { if (command == "me") { - emote(args); + emote(args, false); } else if (command == "react") { auto eventId = room->reply(); if (!eventId.isEmpty()) @@ -529,6 +529,8 @@ InputBar::command(QString command, QString args) message(args, MarkdownOverride::OFF); } else if (command == "rainbow") { message(args, MarkdownOverride::ON, true); + } else if (command == "rainbowme") { + emote(args, true); } } diff --git a/src/timeline/InputBar.h b/src/timeline/InputBar.h
index f7a60488..613b5f9a 100644 --- a/src/timeline/InputBar.h +++ b/src/timeline/InputBar.h
@@ -67,7 +67,7 @@ signals: void uploadingChanged(bool value); private: - void emote(QString body); + void emote(QString body, bool rainbowify); void command(QString name, QString args); void image(const QString &filename, const std::optional<mtx::crypto::EncryptedFile> &file,