From e026242a62aad2036e9f72c6f0048811e3dc1a2b Mon Sep 17 00:00:00 2001 From: Loren Burkholder Date: Sat, 1 Apr 2023 15:40:58 -0400 Subject: [PATCH] Don't bother with rainbow rain --- src/CommandCompleter.cpp | 6 ------ src/CommandCompleter.h | 1 - src/timeline/InputBar.cpp | 9 +++------ src/timeline/InputBar.h | 2 +- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/CommandCompleter.cpp b/src/CommandCompleter.cpp index c4674315..8123b8e6 100644 --- a/src/CommandCompleter.cpp +++ b/src/CommandCompleter.cpp @@ -89,8 +89,6 @@ CommandCompleter::data(const QModelIndex &index, int role) const return QStringLiteral("/rainbowconfetti "); case Rainfall: return QStringLiteral("/rainfall "); - case RainbowRain: - return QStringLiteral("/rainbowrain "); case Msgtype: return QStringLiteral("/msgtype "); case Goto: @@ -164,8 +162,6 @@ CommandCompleter::data(const QModelIndex &index, int role) const return tr("/rainbowconfetti [message]"); case Rainfall: return tr("/rainfall [message]"); - case RainbowRain: - return tr("/rainbowrain [message]"); case Msgtype: return tr("/msgtype [message]"); case Goto: @@ -239,8 +235,6 @@ CommandCompleter::data(const QModelIndex &index, int role) const return tr("Send a message in rainbow colors with confetti."); case Rainfall: return tr("Send a message with rain."); - case RainbowRain: - return tr("Send a message in rainbow colors with rain."); case Msgtype: return tr("Send a message with a custom message type."); case Goto: diff --git a/src/CommandCompleter.h b/src/CommandCompleter.h index dda3bb55..4f27fe29 100644 --- a/src/CommandCompleter.h +++ b/src/CommandCompleter.h @@ -47,7 +47,6 @@ public: Confetti, RainbowConfetti, Rainfall, - RainbowRain, Msgtype, Goto, ConvertToDm, diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp index 3a14790c..d3810cf8 100644 --- a/src/timeline/InputBar.cpp +++ b/src/timeline/InputBar.cpp @@ -282,7 +282,6 @@ InputBar::updateTextContentProperties(const QString &t) QStringLiteral("confetti"), QStringLiteral("rainbowconfetti"), QStringLiteral("rainfall"), - QStringLiteral("rainbowrain"), QStringLiteral("msgtype"), QStringLiteral("goto"), QStringLiteral("converttodm"), @@ -627,9 +626,9 @@ InputBar::confetti(const QString &body, bool rainbowify) } void -InputBar::rainfall(const QString &body, bool rainbowify) +InputBar::rainfall(const QString &body) { - auto html = utils::markdownToHtml(body, rainbowify); + auto html = utils::markdownToHtml(body); mtx::events::msg::Unknown rain; rain.msgtype = "io.element.effect.rainfall"; @@ -942,9 +941,7 @@ InputBar::command(const QString &command, QString args) } else if (command == QLatin1String("rainbowconfetti")) { confetti(args, true); } else if (command == QLatin1String("rainfall")) { - rainfall(args, false); - } else if (command == QLatin1String("rainbowrain")) { - rainfall(args, true); + rainfall(args); } else if (command == QLatin1String("msgtype")) { customMsgtype(args.section(' ', 0, 0), args.section(' ', 1, -1)); } else if (command == QLatin1String("goto")) { diff --git a/src/timeline/InputBar.h b/src/timeline/InputBar.h index 4d836375..b2db377f 100644 --- a/src/timeline/InputBar.h +++ b/src/timeline/InputBar.h @@ -242,7 +242,7 @@ private: void emote(const QString &body, bool rainbowify); void notice(const QString &body, bool rainbowify); void confetti(const QString &body, bool rainbowify); - void rainfall(const QString &body, bool rainbowify); + void rainfall(const QString &body); void customMsgtype(const QString &msgtype, const QString &body); bool command(const QString &name, QString args); void image(const QString &filename,