From 0096226aebc6f3ab0ec122e92dab40be5a863ec9 Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Mon, 6 Mar 2023 19:21:23 -0500
Subject: [PATCH 01/12] Implement unknown msgtype functionality

---
 resources/qml/delegates/MessageDelegate.qml | 16 +++++++++++++++-
 src/Utils.cpp                               |  3 +++
 src/Utils.h                                 |  3 ++-
 src/timeline/TimelineModel.cpp              | 17 ++++++++++++++---
 src/timeline/TimelineModel.h                |  3 ++-
 5 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/resources/qml/delegates/MessageDelegate.qml b/resources/qml/delegates/MessageDelegate.qml
index d298fa4e..9126186e 100644
--- a/resources/qml/delegates/MessageDelegate.qml
+++ b/resources/qml/delegates/MessageDelegate.qml
@@ -51,7 +51,7 @@ Item {
         width: parent.width? parent.width: 0 // this should get rid of "cannot read property 'width' of null"
 
         DelegateChoice {
-            roleValue: MtxEvent.UnknownMessage
+            roleValue: MtxEvent.UnknownEvent
 
             Placeholder {
                 typeString: d.typeString
@@ -101,6 +101,20 @@ Item {
 
         }
 
+        DelegateChoice {
+            roleValue: MtxEvent.UnknownMessage
+
+            TextMessage {
+                formatted: d.formattedBody
+                body: d.body
+                isOnlyEmoji: d.isOnlyEmoji
+                isReply: d.isReply
+                keepFullText: d.keepFullText
+                metadataWidth: d.metadataWidth
+            }
+
+        }
+
         DelegateChoice {
             roleValue: MtxEvent.ConfettiMessage
 
diff --git a/src/Utils.cpp b/src/Utils.cpp
index c5b2abd1..eca5cb29 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -221,6 +221,7 @@ utils::getMessageDescription(const TimelineEvent &event,
     using Image      = mtx::events::RoomEvent<mtx::events::msg::Image>;
     using Notice     = mtx::events::RoomEvent<mtx::events::msg::Notice>;
     using Text       = mtx::events::RoomEvent<mtx::events::msg::Text>;
+    using Unknown    = mtx::events::RoomEvent<mtx::events::msg::Unknown>;
     using Video      = mtx::events::RoomEvent<mtx::events::msg::Video>;
     using Confetti   = mtx::events::RoomEvent<mtx::events::msg::Confetti>;
     using CallInvite = mtx::events::RoomEvent<mtx::events::voip::CallInvite>;
@@ -241,6 +242,8 @@ utils::getMessageDescription(const TimelineEvent &event,
         return createDescriptionInfo<Notice>(event, localUser, displayName);
     } else if (std::holds_alternative<Text>(event)) {
         return createDescriptionInfo<Text>(event, localUser, displayName);
+    } else if (std::holds_alternative<Unknown>(event)) {
+        return createDescriptionInfo<Unknown>(event, localUser, displayName);
     } else if (std::holds_alternative<Video>(event)) {
         return createDescriptionInfo<Video>(event, localUser, displayName);
     } else if (std::holds_alternative<Confetti>(event)) {
diff --git a/src/Utils.h b/src/Utils.h
index 2bf01f84..c16d5a13 100644
--- a/src/Utils.h
+++ b/src/Utils.h
@@ -102,6 +102,7 @@ messageDescription(const QString &username = QString(),
     using Notice     = mtx::events::RoomEvent<mtx::events::msg::Notice>;
     using Sticker    = mtx::events::Sticker;
     using Text       = mtx::events::RoomEvent<mtx::events::msg::Text>;
+    using Unknown    = mtx::events::RoomEvent<mtx::events::msg::Unknown>;
     using Video      = mtx::events::RoomEvent<mtx::events::msg::Video>;
     using Confetti   = mtx::events::RoomEvent<mtx::events::msg::Confetti>;
     using CallInvite = mtx::events::RoomEvent<mtx::events::voip::CallInvite>;
@@ -149,7 +150,7 @@ messageDescription(const QString &username = QString(),
             return QCoreApplication::translate("message-description sent:",
                                                "%1 sent a notification")
               .arg(username);
-    } else if (std::is_same<T, Text>::value) {
+    } else if (std::is_same<T, Text>::value || std::is_same<T, Unknown>::value) {
         if (isLocal)
             return QCoreApplication::translate("message-description sent:", "You: %1").arg(body);
         else
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index cb9fb7fa..ae6ecc9a 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -84,6 +84,11 @@ struct RoomEventType
         return qml_mtx_events::EventType::TextMessage;
     }
     constexpr qml_mtx_events::EventType
+    operator()(const mtx::events::Event<mtx::events::msg::Unknown> &)
+    {
+        return qml_mtx_events::EventType::UnknownMessage;
+    }
+    constexpr qml_mtx_events::EventType
     operator()(const mtx::events::Event<mtx::events::msg::Video> &)
     {
         return qml_mtx_events::EventType::VideoMessage;
@@ -203,7 +208,7 @@ qml_mtx_events::toRoomEventType(mtx::events::EventType e)
     case EventType::RoomMember:
         return qml_mtx_events::EventType::Member;
     case EventType::RoomMessage:
-        return qml_mtx_events::EventType::UnknownMessage;
+        return qml_mtx_events::EventType::UnknownEvent;
     case EventType::RoomName:
         return qml_mtx_events::EventType::Name;
     case EventType::RoomPowerLevels:
@@ -239,7 +244,7 @@ qml_mtx_events::toRoomEventType(mtx::events::EventType e)
     case EventType::Unsupported:
         return qml_mtx_events::EventType::Unsupported;
     default:
-        return qml_mtx_events::EventType::UnknownMessage;
+        return qml_mtx_events::EventType::UnknownEvent;
     }
 }
 
@@ -369,9 +374,10 @@ qml_mtx_events::fromRoomEventType(qml_mtx_events::EventType t)
     case qml_mtx_events::LocationMessage:
     case qml_mtx_events::NoticeMessage:
     case qml_mtx_events::TextMessage:
+    case qml_mtx_events::UnknownMessage:
     case qml_mtx_events::VideoMessage:
     case qml_mtx_events::Redacted:
-    case qml_mtx_events::UnknownMessage:
+    case qml_mtx_events::UnknownEvent:
     case qml_mtx_events::KeyVerificationRequest:
     case qml_mtx_events::KeyVerificationStart:
     case qml_mtx_events::KeyVerificationMac:
@@ -1077,6 +1083,11 @@ TimelineModel::addEvents(const mtx::responses::Timeline &timeline)
                   std::get<RoomEvent<mtx::events::msg::Text>>(e).content.body);
                 msg.contains("🎉") || msg.contains("🎊"))
                 needsSpecialEffects_ = true;
+        } else if (std::holds_alternative<RoomEvent<mtx::events::msg::Unknown>>(e)) {
+            if (auto msg = QString::fromStdString(
+                  std::get<RoomEvent<mtx::events::msg::Unknown>>(e).content.body);
+                msg.contains("🎉") || msg.contains("🎊"))
+                needsSpecialEffects_ = true;
         } else if (std::holds_alternative<RoomEvent<mtx::events::msg::Confetti>>(e))
             needsSpecialEffects_ = true;
     }
diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h
index 03cb9ecb..d71012c1 100644
--- a/src/timeline/TimelineModel.h
+++ b/src/timeline/TimelineModel.h
@@ -106,9 +106,10 @@ enum EventType
     LocationMessage,
     NoticeMessage,
     TextMessage,
+    UnknownMessage,
     VideoMessage,
     Redacted,
-    UnknownMessage,
+    UnknownEvent,
     KeyVerificationRequest,
     KeyVerificationStart,
     KeyVerificationMac,

From 296385e6fe6f9ec543d96ba7ed068e793a12c3f3 Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Tue, 7 Mar 2023 13:11:00 -0500
Subject: [PATCH 02/12] Add rainfall effect

This is a proof-of-concept example of inplementing a msgtype not found
in the spec.
---
 resources/qml/TimelineView.qml | 62 ++++++++++++++++++++++++++++++++--
 src/CommandCompleter.cpp       | 12 +++++++
 src/CommandCompleter.h         |  2 ++
 src/timeline/InputBar.cpp      | 30 ++++++++++++++++
 src/timeline/InputBar.h        |  1 +
 src/timeline/TimelineModel.cpp | 44 +++++++++++++++++++-----
 src/timeline/TimelineModel.h   | 13 ++++++-
 7 files changed, 152 insertions(+), 12 deletions(-)

diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index a146a991..72570d4a 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -364,7 +364,9 @@ Item {
         onClicked: Rooms.resetCurrentRoom()
     }
 
-    ParticleSystem { id: confettiParticleSystem 
+    ParticleSystem {
+        id: confettiParticleSystem
+
         Component.onCompleted: pause();
         paused: !shouldEffectsRun
     }
@@ -420,6 +422,42 @@ Item {
         angle: 90
     }
 
+    ParticleSystem {
+        id: rainfallParticleSystem
+
+        Component.onCompleted: pause();
+        paused: !shouldEffectsRun
+    }
+
+    Emitter {
+        id: rainfallEmitter
+
+        width: parent.width
+        enabled: false
+        anchors.horizontalCenter: parent.horizontalCenter
+        y: -60
+        emitRate: parent.width / 50
+        lifeSpan: 10000
+        system: rainfallParticleSystem
+        velocity: PointDirection {
+            x: 0
+            y: 300
+            xVariation: 0
+            yVariation: 75
+        }
+
+        ItemParticle {
+            system: rainfallParticleSystem
+            fade: false
+            delegate: Rectangle {
+                width: 2
+                height: 30 + 30 * Math.random()
+                radius: 2
+                color: "#0099ff"
+            }
+        }
+    }
+
     NhekoDropArea {
         anchors.fill: parent
         roomid: room ? room.roomId : ""
@@ -428,7 +466,7 @@ Item {
     Timer {
         id: effectsTimer
         onTriggered: shouldEffectsRun = false;
-        interval: confettiEmitter.lifeSpan
+        interval: Math.max(confettiEmitter.lifeSpan, rainfallEmitter.lifeSpan)
         repeat: false
         running: false
     }
@@ -471,7 +509,25 @@ Item {
             if (!Settings.fancyEffects)
                 return
 
-            effectsTimer.start();
+            effectsTimer.restart();
+        }
+
+        function onRainfall()
+        {
+            if (!Settings.fancyEffects)
+                return
+
+            shouldEffectsRun = true;
+            rainfallEmitter.pulse(parent.height * 7.5)
+            room.markSpecialEffectsDone()
+        }
+
+        function onRainfallDone()
+        {
+            if (!Settings.fancyEffects)
+                return
+
+            effectsTimer.restart();
         }
 
         target: room
diff --git a/src/CommandCompleter.cpp b/src/CommandCompleter.cpp
index 2ec427d6..a0fb101d 100644
--- a/src/CommandCompleter.cpp
+++ b/src/CommandCompleter.cpp
@@ -87,6 +87,10 @@ CommandCompleter::data(const QModelIndex &index, int role) const
                 return QStringLiteral("/confetti ");
             case RainbowConfetti:
                 return QStringLiteral("/rainbowconfetti ");
+            case Rainfall:
+                return QStringLiteral("/rainfall ");
+            case RainbowRain:
+                return QStringLiteral("/rainbowrain ");
             case Goto:
                 return QStringLiteral("/goto ");
             case ConvertToDm:
@@ -156,6 +160,10 @@ CommandCompleter::data(const QModelIndex &index, int role) const
                 return tr("/confetti [message]");
             case RainbowConfetti:
                 return tr("/rainbowconfetti [message]");
+            case Rainfall:
+                return tr("/rainfall [message]");
+            case RainbowRain:
+                return tr("/rainbowrain [message]");
             case Goto:
                 return tr("/goto <message reference>");
             case ConvertToDm:
@@ -225,6 +233,10 @@ CommandCompleter::data(const QModelIndex &index, int role) const
                 return tr("Send a message with confetti.");
             case RainbowConfetti:
                 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 Goto:
                 return tr("Go to a specific message using an event id, index or matrix: link");
             case ConvertToDm:
diff --git a/src/CommandCompleter.h b/src/CommandCompleter.h
index fcbbe3e5..be5250b8 100644
--- a/src/CommandCompleter.h
+++ b/src/CommandCompleter.h
@@ -46,6 +46,8 @@ public:
         RainbowNotice,
         Confetti,
         RainbowConfetti,
+        Rainfall,
+        RainbowRain,
         Goto,
         ConvertToDm,
         ConvertToRoom,
diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp
index b27128e0..cb7c3919 100644
--- a/src/timeline/InputBar.cpp
+++ b/src/timeline/InputBar.cpp
@@ -281,6 +281,8 @@ InputBar::updateTextContentProperties(const QString &t)
                                              QStringLiteral("rainbownotice"),
                                              QStringLiteral("confetti"),
                                              QStringLiteral("rainbowconfetti"),
+                                             QStringLiteral("rain"),
+                                             QStringLiteral("rainbowrain"),
                                              QStringLiteral("goto"),
                                              QStringLiteral("converttodm"),
                                              QStringLiteral("converttoroom")};
@@ -623,6 +625,30 @@ InputBar::confetti(const QString &body, bool rainbowify)
     room->sendMessageEvent(confetti, mtx::events::EventType::RoomMessage);
 }
 
+void
+InputBar::rainfall(const QString &body, bool rainbowify)
+{
+    auto html = utils::markdownToHtml(body, rainbowify);
+
+    mtx::events::msg::Unknown rain;
+    rain.msgtype = "io.element.effect.rainfall";
+    rain.body    = body.trimmed().toStdString();
+
+    if (html != body.trimmed().toHtmlEscaped() &&
+        ChatPage::instance()->userSettings()->markdown()) {
+        nlohmann::json j;
+        j["formatted_body"] = html.toStdString();
+        j["format"]         = "org.matrix.custom.html";
+        rain.content        = j.dump();
+        // Remove markdown links by completer
+        rain.body = replaceMatrixToMarkdownLink(body.trimmed()).toStdString();
+    }
+
+    rain.relations = generateRelations();
+
+    room->sendMessageEvent(rain, mtx::events::EventType::RoomMessage);
+}
+
 void
 InputBar::image(const QString &filename,
                 const std::optional<mtx::crypto::EncryptedFile> &file,
@@ -890,6 +916,10 @@ InputBar::command(const QString &command, QString args)
         confetti(args, false);
     } else if (command == QLatin1String("rainbowconfetti")) {
         confetti(args, true);
+    } else if (command == QLatin1String("rainfall")) {
+        rainfall(args, false);
+    } else if (command == QLatin1String("rainbowrain")) {
+        rainfall(args, true);
     } else if (command == QLatin1String("goto")) {
         // Goto has three different modes:
         // 1 - Going directly to a given event ID
diff --git a/src/timeline/InputBar.h b/src/timeline/InputBar.h
index acafd964..a34427ba 100644
--- a/src/timeline/InputBar.h
+++ b/src/timeline/InputBar.h
@@ -242,6 +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);
     bool command(const QString &name, QString args);
     void image(const QString &filename,
                const std::optional<mtx::crypto::EncryptedFile> &file,
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index ae6ecc9a..ba10c3c6 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -1081,19 +1081,29 @@ TimelineModel::addEvents(const mtx::responses::Timeline &timeline)
         } else if (std::holds_alternative<RoomEvent<mtx::events::msg::Text>>(e)) {
             if (auto msg = QString::fromStdString(
                   std::get<RoomEvent<mtx::events::msg::Text>>(e).content.body);
-                msg.contains("🎉") || msg.contains("🎊"))
+                msg.contains("🎉") || msg.contains("🎊")) {
                 needsSpecialEffects_ = true;
+                specialEffects_.setFlag(Confetti);
+            }
         } else if (std::holds_alternative<RoomEvent<mtx::events::msg::Unknown>>(e)) {
             if (auto msg = QString::fromStdString(
                   std::get<RoomEvent<mtx::events::msg::Unknown>>(e).content.body);
-                msg.contains("🎉") || msg.contains("🎊"))
+                msg.contains("🎉") || msg.contains("🎊")) {
                 needsSpecialEffects_ = true;
-        } else if (std::holds_alternative<RoomEvent<mtx::events::msg::Confetti>>(e))
+                specialEffects_.setFlag(Confetti);
+            } else if (std::get<RoomEvent<mtx::events::msg::Unknown>>(e).content.msgtype ==
+                       "io.element.effect.rainfall") {
+                needsSpecialEffects_ = true;
+                specialEffects_.setFlag(Rainfall);
+            }
+        } else if (std::holds_alternative<RoomEvent<mtx::events::msg::Confetti>>(e)) {
             needsSpecialEffects_ = true;
+            specialEffects_.setFlag(Confetti);
+        }
     }
 
     if (needsSpecialEffects_)
-        emit confetti();
+        triggerSpecialEffects();
 
     if (avatarChanged)
         emit roomAvatarUrlChanged();
@@ -2056,7 +2066,14 @@ TimelineModel::triggerSpecialEffects()
 {
     if (needsSpecialEffects_) {
         // Note (Loren): Without the timer, this apparently emits before QML is ready
-        QTimer::singleShot(1, this, [this] { emit confetti(); });
+        if (specialEffects_.testFlag(Confetti)) {
+            QTimer::singleShot(1, this, [this] { emit confetti(); });
+            specialEffects_.setFlag(Confetti, false);
+        }
+        if (specialEffects_.testFlag(Rainfall)) {
+            QTimer::singleShot(1, this, [this] { emit rainfall(); });
+            specialEffects_.setFlag(Rainfall, false);
+        }
         needsSpecialEffects_ = false;
     }
 }
@@ -2066,6 +2083,10 @@ TimelineModel::markSpecialEffectsDone()
 {
     needsSpecialEffects_ = false;
     emit confettiDone();
+    emit rainfallDone();
+
+    specialEffects_.setFlag(Confetti, false);
+    specialEffects_.setFlag(Rainfall, false);
 }
 
 QString
@@ -2928,7 +2949,8 @@ TimelineModel::setEdit(const QString &newEdit)
             if (msgType == mtx::events::MessageType::Text ||
                 msgType == mtx::events::MessageType::Notice ||
                 msgType == mtx::events::MessageType::Emote ||
-                msgType == mtx::events::MessageType::Confetti) {
+                msgType == mtx::events::MessageType::Confetti ||
+                msgType == mtx::events::MessageType::Unknown) {
                 auto relInfo  = relatedInfo(newEdit);
                 auto editText = relInfo.quoted_body;
 
@@ -2950,8 +2972,14 @@ TimelineModel::setEdit(const QString &newEdit)
                 if (msgType == mtx::events::MessageType::Emote)
                     input()->setText("/me " + editText);
                 else if (msgType == mtx::events::MessageType::Confetti)
-                    input()->setText("/confetti" + editText);
-                else
+                    input()->setText("/confetti " + editText);
+                else if (msgType == mtx::events::MessageType::Unknown) {
+                    if (auto u = std::get_if<mtx::events::RoomEvent<mtx::events::msg::Unknown>>(&e);
+                        u && u->content.msgtype == "io.element.effect.rainfall")
+                        input()->setText("/rainfall " + editText);
+                    else
+                        input()->setText(editText);
+                } else
                     input()->setText(editText);
             } else {
                 input()->setText(QLatin1String(""));
diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h
index d71012c1..ce3dc9e4 100644
--- a/src/timeline/TimelineModel.h
+++ b/src/timeline/TimelineModel.h
@@ -267,6 +267,13 @@ public:
     };
     Q_ENUM(Roles);
 
+    enum SpecialEffect
+    {
+        Confetti,
+        Rainfall,
+    };
+    Q_DECLARE_FLAGS(SpecialEffects, SpecialEffect)
+
     QHash<int, QByteArray> roleNames() const override;
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
@@ -451,6 +458,8 @@ signals:
     void scrollToIndex(int index);
     void confetti();
     void confettiDone();
+    void rainfall();
+    void rainfallDone();
 
     void lastMessageChanged();
     void notificationsChanged();
@@ -522,8 +531,8 @@ private:
     std::string last_event_id;
     std::string fullyReadEventId_;
 
-    // TODO (Loren): This should hopefully handle more than just confetti in the future
     bool needsSpecialEffects_ = false;
+    QFlags<SpecialEffect> specialEffects_;
 
     std::unique_ptr<RoomSummary, DeleteLaterDeleter> parentSummary = nullptr;
     bool parentChecked                                             = false;
@@ -531,6 +540,8 @@ private:
     friend void EventStore::refetchOnlineKeyBackupKeys(TimelineModel *room);
 };
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(TimelineModel::SpecialEffects)
+
 template<class T>
 void
 TimelineModel::sendMessageEvent(const T &content, mtx::events::EventType eventType)

From 44d4e6f9b5881fdccdb1b08dc5a49d6ee8785c15 Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Tue, 21 Mar 2023 19:44:00 -0400
Subject: [PATCH 03/12] Allow sending custom msgtypes

---
 src/CommandCompleter.cpp  |  6 ++++++
 src/CommandCompleter.h    |  1 +
 src/timeline/InputBar.cpp | 27 +++++++++++++++++++++++++++
 src/timeline/InputBar.h   |  1 +
 4 files changed, 35 insertions(+)

diff --git a/src/CommandCompleter.cpp b/src/CommandCompleter.cpp
index a0fb101d..c4674315 100644
--- a/src/CommandCompleter.cpp
+++ b/src/CommandCompleter.cpp
@@ -91,6 +91,8 @@ CommandCompleter::data(const QModelIndex &index, int role) const
                 return QStringLiteral("/rainfall ");
             case RainbowRain:
                 return QStringLiteral("/rainbowrain ");
+            case Msgtype:
+                return QStringLiteral("/msgtype ");
             case Goto:
                 return QStringLiteral("/goto ");
             case ConvertToDm:
@@ -164,6 +166,8 @@ CommandCompleter::data(const QModelIndex &index, int role) const
                 return tr("/rainfall [message]");
             case RainbowRain:
                 return tr("/rainbowrain [message]");
+            case Msgtype:
+                return tr("/msgtype <msgtype> [message]");
             case Goto:
                 return tr("/goto <message reference>");
             case ConvertToDm:
@@ -237,6 +241,8 @@ CommandCompleter::data(const QModelIndex &index, int role) const
                 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:
                 return tr("Go to a specific message using an event id, index or matrix: link");
             case ConvertToDm:
diff --git a/src/CommandCompleter.h b/src/CommandCompleter.h
index be5250b8..dda3bb55 100644
--- a/src/CommandCompleter.h
+++ b/src/CommandCompleter.h
@@ -48,6 +48,7 @@ public:
         RainbowConfetti,
         Rainfall,
         RainbowRain,
+        Msgtype,
         Goto,
         ConvertToDm,
         ConvertToRoom,
diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp
index cb7c3919..23e94945 100644
--- a/src/timeline/InputBar.cpp
+++ b/src/timeline/InputBar.cpp
@@ -283,6 +283,7 @@ InputBar::updateTextContentProperties(const QString &t)
                                              QStringLiteral("rainbowconfetti"),
                                              QStringLiteral("rain"),
                                              QStringLiteral("rainbowrain"),
+                                             QStringLiteral("msgtype"),
                                              QStringLiteral("goto"),
                                              QStringLiteral("converttodm"),
                                              QStringLiteral("converttoroom")};
@@ -649,6 +650,30 @@ InputBar::rainfall(const QString &body, bool rainbowify)
     room->sendMessageEvent(rain, mtx::events::EventType::RoomMessage);
 }
 
+void
+InputBar::customMsgtype(const QString &msgtype, const QString &body, bool rainbowify)
+{
+    auto html = utils::markdownToHtml(body, rainbowify);
+
+    mtx::events::msg::Unknown msg;
+    msg.msgtype = msgtype.toStdString();
+    msg.body    = body.trimmed().toStdString();
+
+    if (html != body.trimmed().toHtmlEscaped() &&
+        ChatPage::instance()->userSettings()->markdown()) {
+        nlohmann::json j;
+        j["formatted_body"] = html.toStdString();
+        j["format"]         = "org.matrix.custom.html";
+        msg.content         = j.dump();
+        // Remove markdown links by completer
+        msg.body = replaceMatrixToMarkdownLink(body.trimmed()).toStdString();
+    }
+
+    msg.relations = generateRelations();
+
+    room->sendMessageEvent(msg, mtx::events::EventType::RoomMessage);
+}
+
 void
 InputBar::image(const QString &filename,
                 const std::optional<mtx::crypto::EncryptedFile> &file,
@@ -920,6 +945,8 @@ InputBar::command(const QString &command, QString args)
         rainfall(args, false);
     } else if (command == QLatin1String("rainbowrain")) {
         rainfall(args, true);
+    } else if (command == QLatin1String("msgtype")) {
+        customMsgtype(args.section(' ', 0, 0), args.section(' ', 1, -1), false);
     } else if (command == QLatin1String("goto")) {
         // Goto has three different modes:
         // 1 - Going directly to a given event ID
diff --git a/src/timeline/InputBar.h b/src/timeline/InputBar.h
index a34427ba..61ba9f12 100644
--- a/src/timeline/InputBar.h
+++ b/src/timeline/InputBar.h
@@ -243,6 +243,7 @@ private:
     void notice(const QString &body, bool rainbowify);
     void confetti(const QString &body, bool rainbowify);
     void rainfall(const QString &body, bool rainbowify);
+    void customMsgtype(const QString &msgtype, const QString &body, bool rainbowify);
     bool command(const QString &name, QString args);
     void image(const QString &filename,
                const std::optional<mtx::crypto::EncryptedFile> &file,

From c751c487da98e67b7566aef95e28e9705866e973 Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Fri, 24 Mar 2023 08:50:44 -0400
Subject: [PATCH 04/12] Use particle groups to separate effects

---
 resources/qml/TimelineView.qml | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index 72570d4a..4621956f 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -365,7 +365,7 @@ Item {
     }
 
     ParticleSystem {
-        id: confettiParticleSystem
+        id: particleSystem
 
         Component.onCompleted: pause();
         paused: !shouldEffectsRun
@@ -374,13 +374,14 @@ Item {
     Emitter {
         id: confettiEmitter
 
+        group: "confetti"
         width: parent.width * 3/4
         enabled: false
         anchors.horizontalCenter: parent.horizontalCenter
         y: parent.height
         emitRate: Math.min(400 * Math.sqrt(parent.width * parent.height) / 870, 1000)
         lifeSpan: 15000
-        system: confettiParticleSystem
+        system: particleSystem
         maximumEmitted: 500
         velocityFromMovement: 8
         size: 16
@@ -394,7 +395,8 @@ Item {
     }
 
     ImageParticle {
-        system: confettiParticleSystem
+        system: particleSystem
+        groups: ["confetti"]
         source: "qrc:/confettiparticle.svg"
         rotationVelocity: 0
         rotationVelocityVariation: 360
@@ -416,29 +418,23 @@ Item {
     }
 
     Gravity {
-        system: confettiParticleSystem
+        system: particleSystem
         anchors.fill: parent
         magnitude: 350
         angle: 90
     }
 
-    ParticleSystem {
-        id: rainfallParticleSystem
-
-        Component.onCompleted: pause();
-        paused: !shouldEffectsRun
-    }
-
     Emitter {
         id: rainfallEmitter
 
+        group: "rain"
         width: parent.width
         enabled: false
         anchors.horizontalCenter: parent.horizontalCenter
         y: -60
         emitRate: parent.width / 50
         lifeSpan: 10000
-        system: rainfallParticleSystem
+        system: particleSystem
         velocity: PointDirection {
             x: 0
             y: 300
@@ -447,7 +443,8 @@ Item {
         }
 
         ItemParticle {
-            system: rainfallParticleSystem
+            system: particleSystem
+            groups: ["rain"]
             fade: false
             delegate: Rectangle {
                 width: 2

From 5f3ecc213fbf9fc3a47173d7a7aca6954aee07cf Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Fri, 24 Mar 2023 09:36:42 -0400
Subject: [PATCH 05/12] Move effects into a separate file

---
 resources/qml/TimelineView.qml       |  95 ++---------------------
 resources/qml/ui/TimelineEffects.qml | 111 +++++++++++++++++++++++++++
 resources/res.qrc                    |   1 +
 3 files changed, 117 insertions(+), 90 deletions(-)
 create mode 100644 resources/qml/ui/TimelineEffects.qml

diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index 4621956f..30ad9292 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -364,95 +364,10 @@ Item {
         onClicked: Rooms.resetCurrentRoom()
     }
 
-    ParticleSystem {
-        id: particleSystem
+    TimelineEffects {
+        id: timelineEffects
 
-        Component.onCompleted: pause();
-        paused: !shouldEffectsRun
-    }
-
-    Emitter {
-        id: confettiEmitter
-
-        group: "confetti"
-        width: parent.width * 3/4
-        enabled: false
-        anchors.horizontalCenter: parent.horizontalCenter
-        y: parent.height
-        emitRate: Math.min(400 * Math.sqrt(parent.width * parent.height) / 870, 1000)
-        lifeSpan: 15000
-        system: particleSystem
-        maximumEmitted: 500
-        velocityFromMovement: 8
-        size: 16
-        sizeVariation: 4
-        velocity: PointDirection {
-            x: 0
-            y: -Math.min(450 * parent.height / 700, 1000)
-            xVariation: Math.min(4 * parent.width / 7, 450)
-            yVariation: 250
-        }
-    }
-
-    ImageParticle {
-        system: particleSystem
-        groups: ["confetti"]
-        source: "qrc:/confettiparticle.svg"
-        rotationVelocity: 0
-        rotationVelocityVariation: 360
-        colorVariation: 1
-        color: "white"
-        entryEffect: ImageParticle.None
-        xVector: PointDirection {
-            x: 1
-            y: 0
-            xVariation: 0.2
-            yVariation: 0.2
-        }
-        yVector: PointDirection {
-            x: 0
-            y: 0.5
-            xVariation: 0.2
-            yVariation: 0.2
-        }
-    }
-
-    Gravity {
-        system: particleSystem
         anchors.fill: parent
-        magnitude: 350
-        angle: 90
-    }
-
-    Emitter {
-        id: rainfallEmitter
-
-        group: "rain"
-        width: parent.width
-        enabled: false
-        anchors.horizontalCenter: parent.horizontalCenter
-        y: -60
-        emitRate: parent.width / 50
-        lifeSpan: 10000
-        system: particleSystem
-        velocity: PointDirection {
-            x: 0
-            y: 300
-            xVariation: 0
-            yVariation: 75
-        }
-
-        ItemParticle {
-            system: particleSystem
-            groups: ["rain"]
-            fade: false
-            delegate: Rectangle {
-                width: 2
-                height: 30 + 30 * Math.random()
-                radius: 2
-                color: "#0099ff"
-            }
-        }
     }
 
     NhekoDropArea {
@@ -463,7 +378,7 @@ Item {
     Timer {
         id: effectsTimer
         onTriggered: shouldEffectsRun = false;
-        interval: Math.max(confettiEmitter.lifeSpan, rainfallEmitter.lifeSpan)
+        interval: timelineEffects.maxLifespan
         repeat: false
         running: false
     }
@@ -497,7 +412,7 @@ Item {
                 return
 
             shouldEffectsRun = true;
-            confettiEmitter.pulse(parent.height * 2)
+            timelineEffects.pulseConfetti()
             room.markSpecialEffectsDone()
         }
 
@@ -515,7 +430,7 @@ Item {
                 return
 
             shouldEffectsRun = true;
-            rainfallEmitter.pulse(parent.height * 7.5)
+            timelineEffects.pulseRainfall()
             room.markSpecialEffectsDone()
         }
 
diff --git a/resources/qml/ui/TimelineEffects.qml b/resources/qml/ui/TimelineEffects.qml
new file mode 100644
index 00000000..6af2892e
--- /dev/null
+++ b/resources/qml/ui/TimelineEffects.qml
@@ -0,0 +1,111 @@
+// SPDX-FileCopyrightText: Nheko Contributors
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+import QtQuick 2.15
+import QtQuick.Particles 2.15
+
+Item {
+    readonly property int maxLifespan: Math.max(confettiEmitter.lifeSpan, rainfallEmitter.lifeSpan)
+
+    function pulseConfetti()
+    {
+        confettiEmitter.pulse(parent.height * 2)
+    }
+
+    function pulseRainfall()
+    {
+        rainfallEmitter.pulse(parent.height * 7.5)
+    }
+
+    ParticleSystem {
+        id: particleSystem
+
+        Component.onCompleted: pause();
+        paused: !shouldEffectsRun
+    }
+
+    Emitter {
+        id: confettiEmitter
+
+        group: "confetti"
+        width: parent.width * 3/4
+        enabled: false
+        anchors.horizontalCenter: parent.horizontalCenter
+        y: parent.height
+        emitRate: Math.min(400 * Math.sqrt(parent.width * parent.height) / 870, 1000)
+        lifeSpan: 15000
+        system: particleSystem
+        maximumEmitted: 500
+        velocityFromMovement: 8
+        size: 16
+        sizeVariation: 4
+        velocity: PointDirection {
+            x: 0
+            y: -Math.min(450 * parent.height / 700, 1000)
+            xVariation: Math.min(4 * parent.width / 7, 450)
+            yVariation: 250
+        }
+    }
+
+    ImageParticle {
+        system: particleSystem
+        groups: ["confetti"]
+        source: "qrc:/confettiparticle.svg"
+        rotationVelocity: 0
+        rotationVelocityVariation: 360
+        colorVariation: 1
+        color: "white"
+        entryEffect: ImageParticle.None
+        xVector: PointDirection {
+            x: 1
+            y: 0
+            xVariation: 0.2
+            yVariation: 0.2
+        }
+        yVector: PointDirection {
+            x: 0
+            y: 0.5
+            xVariation: 0.2
+            yVariation: 0.2
+        }
+    }
+
+    Gravity {
+        system: particleSystem
+        anchors.fill: parent
+        magnitude: 350
+        angle: 90
+    }
+
+    Emitter {
+        id: rainfallEmitter
+
+        group: "rain"
+        width: parent.width
+        enabled: false
+        anchors.horizontalCenter: parent.horizontalCenter
+        y: -60
+        emitRate: parent.width / 50
+        lifeSpan: 10000
+        system: particleSystem
+        velocity: PointDirection {
+            x: 0
+            y: 300
+            xVariation: 0
+            yVariation: 75
+        }
+
+        ItemParticle {
+            system: particleSystem
+            groups: ["rain"]
+            fade: false
+            delegate: Rectangle {
+                width: 2
+                height: 30 + 30 * Math.random()
+                radius: 2
+                color: "#0099ff"
+            }
+        }
+    }
+}
diff --git a/resources/res.qrc b/resources/res.qrc
index faa90495..3f1b2b65 100644
--- a/resources/res.qrc
+++ b/resources/res.qrc
@@ -197,6 +197,7 @@
         <file>qml/voip/VideoCall.qml</file>
         <file>confettiparticle.svg</file>
         <file>qml/delegates/EncryptionEnabled.qml</file>
+        <file>qml/ui/TimelineEffects.qml</file>
     </qresource>
     <qresource prefix="/media">
         <file>media/ring.ogg</file>

From 0c1cd7a3595889abd338c98ecda9a1b010a2406a Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Sat, 25 Mar 2023 20:02:22 -0400
Subject: [PATCH 06/12] Fix command name

---
 src/timeline/InputBar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp
index 23e94945..0fa5cff4 100644
--- a/src/timeline/InputBar.cpp
+++ b/src/timeline/InputBar.cpp
@@ -281,7 +281,7 @@ InputBar::updateTextContentProperties(const QString &t)
                                              QStringLiteral("rainbownotice"),
                                              QStringLiteral("confetti"),
                                              QStringLiteral("rainbowconfetti"),
-                                             QStringLiteral("rain"),
+                                             QStringLiteral("rainfall"),
                                              QStringLiteral("rainbowrain"),
                                              QStringLiteral("msgtype"),
                                              QStringLiteral("goto"),

From b95388a5b9a546be4725d846ec62d120166cb357 Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Sat, 25 Mar 2023 20:02:50 -0400
Subject: [PATCH 07/12] Don't allow rainbowifying custom messages

---
 src/timeline/InputBar.cpp | 6 +++---
 src/timeline/InputBar.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp
index 0fa5cff4..3a14790c 100644
--- a/src/timeline/InputBar.cpp
+++ b/src/timeline/InputBar.cpp
@@ -651,9 +651,9 @@ InputBar::rainfall(const QString &body, bool rainbowify)
 }
 
 void
-InputBar::customMsgtype(const QString &msgtype, const QString &body, bool rainbowify)
+InputBar::customMsgtype(const QString &msgtype, const QString &body)
 {
-    auto html = utils::markdownToHtml(body, rainbowify);
+    auto html = utils::markdownToHtml(body);
 
     mtx::events::msg::Unknown msg;
     msg.msgtype = msgtype.toStdString();
@@ -946,7 +946,7 @@ InputBar::command(const QString &command, QString args)
     } else if (command == QLatin1String("rainbowrain")) {
         rainfall(args, true);
     } else if (command == QLatin1String("msgtype")) {
-        customMsgtype(args.section(' ', 0, 0), args.section(' ', 1, -1), false);
+        customMsgtype(args.section(' ', 0, 0), args.section(' ', 1, -1));
     } else if (command == QLatin1String("goto")) {
         // Goto has three different modes:
         // 1 - Going directly to a given event ID
diff --git a/src/timeline/InputBar.h b/src/timeline/InputBar.h
index 61ba9f12..4d836375 100644
--- a/src/timeline/InputBar.h
+++ b/src/timeline/InputBar.h
@@ -243,7 +243,7 @@ private:
     void notice(const QString &body, bool rainbowify);
     void confetti(const QString &body, bool rainbowify);
     void rainfall(const QString &body, bool rainbowify);
-    void customMsgtype(const QString &msgtype, const QString &body, bool rainbowify);
+    void customMsgtype(const QString &msgtype, const QString &body);
     bool command(const QString &name, QString args);
     void image(const QString &filename,
                const std::optional<mtx::crypto::EncryptedFile> &file,

From 58b2ae1f0667dfb96b07e0615b7cc4d56752b205 Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Sat, 25 Mar 2023 20:07:01 -0400
Subject: [PATCH 08/12] Don't apply gravity to rain

It makes the rain look wacky.
---
 resources/qml/ui/TimelineEffects.qml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/qml/ui/TimelineEffects.qml b/resources/qml/ui/TimelineEffects.qml
index 6af2892e..1594aaac 100644
--- a/resources/qml/ui/TimelineEffects.qml
+++ b/resources/qml/ui/TimelineEffects.qml
@@ -73,6 +73,7 @@ Item {
 
     Gravity {
         system: particleSystem
+        groups: ["confetti"]
         anchors.fill: parent
         magnitude: 350
         angle: 90

From 5df7a8b2a7cb4fc72a79e2ef24de586f3baaf633 Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Wed, 29 Mar 2023 12:47:17 -0400
Subject: [PATCH 09/12] Rain, rain, go away sooner

---
 resources/qml/ui/TimelineEffects.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/qml/ui/TimelineEffects.qml b/resources/qml/ui/TimelineEffects.qml
index 1594aaac..aaff04a0 100644
--- a/resources/qml/ui/TimelineEffects.qml
+++ b/resources/qml/ui/TimelineEffects.qml
@@ -15,7 +15,7 @@ Item {
 
     function pulseRainfall()
     {
-        rainfallEmitter.pulse(parent.height * 7.5)
+        rainfallEmitter.pulse(parent.height * 3.3)
     }
 
     ParticleSystem {

From e026242a62aad2036e9f72c6f0048811e3dc1a2b Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Sat, 1 Apr 2023 15:40:58 -0400
Subject: [PATCH 10/12] 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 <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,

From 138b0a6b8683a8e69a4d2fb92926e5a0645d4d5a Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Sat, 1 Apr 2023 15:41:49 -0400
Subject: [PATCH 11/12] Use the new mtxclient special effects refactoring

---
 CMakeLists.txt                              |  2 +-
 io.github.NhekoReborn.Nheko.yaml            |  2 +-
 resources/qml/delegates/MessageDelegate.qml |  2 +-
 src/Utils.cpp                               | 32 ++++++++--------
 src/Utils.h                                 | 37 +++++++++---------
 src/timeline/InputBar.cpp                   |  5 ++-
 src/timeline/TimelineModel.cpp              | 42 +++++++++++++--------
 src/timeline/TimelineModel.h                |  2 +-
 8 files changed, 69 insertions(+), 55 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06af4bbe..146a3e25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -602,7 +602,7 @@ if(USE_BUNDLED_MTXCLIENT)
 	FetchContent_Declare(
 		MatrixClient
                 GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
-                GIT_TAG        c8849cd033bb59bee39f3fb2eaca953853731eb2
+                GIT_TAG        f8a9cbbb25ea145a23506c2f9386f6c61401bed0
 		)
 	set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
 	set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")
diff --git a/io.github.NhekoReborn.Nheko.yaml b/io.github.NhekoReborn.Nheko.yaml
index 3bcfdf52..26c2020f 100644
--- a/io.github.NhekoReborn.Nheko.yaml
+++ b/io.github.NhekoReborn.Nheko.yaml
@@ -213,7 +213,7 @@ modules:
     buildsystem: cmake-ninja
     name: mtxclient
     sources:
-      - commit: c8849cd033bb59bee39f3fb2eaca953853731eb2
+      - commit: f8a9cbbb25ea145a23506c2f9386f6c61401bed0
         #tag: v0.9.2
         type: git
         url: https://github.com/Nheko-Reborn/mtxclient.git
diff --git a/resources/qml/delegates/MessageDelegate.qml b/resources/qml/delegates/MessageDelegate.qml
index 9126186e..c0bcec0d 100644
--- a/resources/qml/delegates/MessageDelegate.qml
+++ b/resources/qml/delegates/MessageDelegate.qml
@@ -116,7 +116,7 @@ Item {
         }
 
         DelegateChoice {
-            roleValue: MtxEvent.ConfettiMessage
+            roleValue: MtxEvent.ElementEffectMessage
 
             TextMessage {
                 formatted: d.formattedBody
diff --git a/src/Utils.cpp b/src/Utils.cpp
index eca5cb29..2bf8eb3b 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -215,20 +215,20 @@ utils::getMessageDescription(const TimelineEvent &event,
                              const QString &localUser,
                              const QString &displayName)
 {
-    using Audio      = mtx::events::RoomEvent<mtx::events::msg::Audio>;
-    using Emote      = mtx::events::RoomEvent<mtx::events::msg::Emote>;
-    using File       = mtx::events::RoomEvent<mtx::events::msg::File>;
-    using Image      = mtx::events::RoomEvent<mtx::events::msg::Image>;
-    using Notice     = mtx::events::RoomEvent<mtx::events::msg::Notice>;
-    using Text       = mtx::events::RoomEvent<mtx::events::msg::Text>;
-    using Unknown    = mtx::events::RoomEvent<mtx::events::msg::Unknown>;
-    using Video      = mtx::events::RoomEvent<mtx::events::msg::Video>;
-    using Confetti   = mtx::events::RoomEvent<mtx::events::msg::Confetti>;
-    using CallInvite = mtx::events::RoomEvent<mtx::events::voip::CallInvite>;
-    using CallAnswer = mtx::events::RoomEvent<mtx::events::voip::CallAnswer>;
-    using CallHangUp = mtx::events::RoomEvent<mtx::events::voip::CallHangUp>;
-    using CallReject = mtx::events::RoomEvent<mtx::events::voip::CallReject>;
-    using Encrypted  = mtx::events::EncryptedEvent<mtx::events::msg::Encrypted>;
+    using Audio         = mtx::events::RoomEvent<mtx::events::msg::Audio>;
+    using Emote         = mtx::events::RoomEvent<mtx::events::msg::Emote>;
+    using File          = mtx::events::RoomEvent<mtx::events::msg::File>;
+    using Image         = mtx::events::RoomEvent<mtx::events::msg::Image>;
+    using Notice        = mtx::events::RoomEvent<mtx::events::msg::Notice>;
+    using Text          = mtx::events::RoomEvent<mtx::events::msg::Text>;
+    using Unknown       = mtx::events::RoomEvent<mtx::events::msg::Unknown>;
+    using Video         = mtx::events::RoomEvent<mtx::events::msg::Video>;
+    using ElementEffect = mtx::events::RoomEvent<mtx::events::msg::ElementEffect>;
+    using CallInvite    = mtx::events::RoomEvent<mtx::events::voip::CallInvite>;
+    using CallAnswer    = mtx::events::RoomEvent<mtx::events::voip::CallAnswer>;
+    using CallHangUp    = mtx::events::RoomEvent<mtx::events::voip::CallHangUp>;
+    using CallReject    = mtx::events::RoomEvent<mtx::events::voip::CallReject>;
+    using Encrypted     = mtx::events::EncryptedEvent<mtx::events::msg::Encrypted>;
 
     if (std::holds_alternative<Audio>(event)) {
         return createDescriptionInfo<Audio>(event, localUser, displayName);
@@ -246,8 +246,8 @@ utils::getMessageDescription(const TimelineEvent &event,
         return createDescriptionInfo<Unknown>(event, localUser, displayName);
     } else if (std::holds_alternative<Video>(event)) {
         return createDescriptionInfo<Video>(event, localUser, displayName);
-    } else if (std::holds_alternative<Confetti>(event)) {
-        return createDescriptionInfo<Confetti>(event, localUser, displayName);
+    } else if (std::holds_alternative<ElementEffect>(event)) {
+        return createDescriptionInfo<ElementEffect>(event, localUser, displayName);
     } else if (std::holds_alternative<CallInvite>(event)) {
         return createDescriptionInfo<CallInvite>(event, localUser, displayName);
     } else if (std::holds_alternative<CallAnswer>(event)) {
diff --git a/src/Utils.h b/src/Utils.h
index c16d5a13..2c8988e5 100644
--- a/src/Utils.h
+++ b/src/Utils.h
@@ -95,21 +95,21 @@ messageDescription(const QString &username = QString(),
                    const QString &body     = QString(),
                    const bool isLocal      = false)
 {
-    using Audio      = mtx::events::RoomEvent<mtx::events::msg::Audio>;
-    using Emote      = mtx::events::RoomEvent<mtx::events::msg::Emote>;
-    using File       = mtx::events::RoomEvent<mtx::events::msg::File>;
-    using Image      = mtx::events::RoomEvent<mtx::events::msg::Image>;
-    using Notice     = mtx::events::RoomEvent<mtx::events::msg::Notice>;
-    using Sticker    = mtx::events::Sticker;
-    using Text       = mtx::events::RoomEvent<mtx::events::msg::Text>;
-    using Unknown    = mtx::events::RoomEvent<mtx::events::msg::Unknown>;
-    using Video      = mtx::events::RoomEvent<mtx::events::msg::Video>;
-    using Confetti   = mtx::events::RoomEvent<mtx::events::msg::Confetti>;
-    using CallInvite = mtx::events::RoomEvent<mtx::events::voip::CallInvite>;
-    using CallAnswer = mtx::events::RoomEvent<mtx::events::voip::CallAnswer>;
-    using CallHangUp = mtx::events::RoomEvent<mtx::events::voip::CallHangUp>;
-    using CallReject = mtx::events::RoomEvent<mtx::events::voip::CallReject>;
-    using Encrypted  = mtx::events::EncryptedEvent<mtx::events::msg::Encrypted>;
+    using Audio         = mtx::events::RoomEvent<mtx::events::msg::Audio>;
+    using Emote         = mtx::events::RoomEvent<mtx::events::msg::Emote>;
+    using File          = mtx::events::RoomEvent<mtx::events::msg::File>;
+    using Image         = mtx::events::RoomEvent<mtx::events::msg::Image>;
+    using Notice        = mtx::events::RoomEvent<mtx::events::msg::Notice>;
+    using Sticker       = mtx::events::Sticker;
+    using Text          = mtx::events::RoomEvent<mtx::events::msg::Text>;
+    using Unknown       = mtx::events::RoomEvent<mtx::events::msg::Unknown>;
+    using Video         = mtx::events::RoomEvent<mtx::events::msg::Video>;
+    using ElementEffect = mtx::events::RoomEvent<mtx::events::msg::ElementEffect>;
+    using CallInvite    = mtx::events::RoomEvent<mtx::events::voip::CallInvite>;
+    using CallAnswer    = mtx::events::RoomEvent<mtx::events::voip::CallAnswer>;
+    using CallHangUp    = mtx::events::RoomEvent<mtx::events::voip::CallHangUp>;
+    using CallReject    = mtx::events::RoomEvent<mtx::events::voip::CallReject>;
+    using Encrypted     = mtx::events::EncryptedEvent<mtx::events::msg::Encrypted>;
 
     if (std::is_same<T, Audio>::value) {
         if (isLocal)
@@ -156,14 +156,15 @@ messageDescription(const QString &username = QString(),
         else
             return QCoreApplication::translate("message-description sent:", "%1: %2")
               .arg(username, body);
-    } else if (std::is_same<T, Confetti>::value) {
+    } else if (std::is_same<T, ElementEffect>::value) {
         if (body.isEmpty()) {
+            // TODO: what is the best way to handle this?
             if (isLocal)
                 return QCoreApplication::translate("message-description sent:",
-                                                   "You sent some confetti");
+                                                   "You sent a chat effect");
             else
                 return QCoreApplication::translate("message-description sent:",
-                                                   "%1 sent some confetti")
+                                                   "%1 sent a chat effect")
                   .arg(username);
         } else {
             if (isLocal)
diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp
index d3810cf8..fe8b8e48 100644
--- a/src/timeline/InputBar.cpp
+++ b/src/timeline/InputBar.cpp
@@ -609,8 +609,9 @@ InputBar::confetti(const QString &body, bool rainbowify)
 {
     auto html = utils::markdownToHtml(body, rainbowify);
 
-    mtx::events::msg::Confetti confetti;
-    confetti.body = body.trimmed().toStdString();
+    mtx::events::msg::ElementEffect confetti;
+    confetti.msgtype = "nic.custom.confetti";
+    confetti.body    = body.trimmed().toStdString();
 
     if (html != body.trimmed().toHtmlEscaped() &&
         ChatPage::instance()->userSettings()->markdown()) {
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index ba10c3c6..9e667bce 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -54,9 +54,9 @@ struct RoomEventType
         return qml_mtx_events::EventType::AudioMessage;
     }
     constexpr qml_mtx_events::EventType
-    operator()(const mtx::events::Event<mtx::events::msg::Confetti> &)
+    operator()(const mtx::events::Event<mtx::events::msg::ElementEffect> &)
     {
-        return qml_mtx_events::EventType::ConfettiMessage;
+        return qml_mtx_events::EventType::ElementEffectMessage;
     }
     constexpr qml_mtx_events::EventType
     operator()(const mtx::events::Event<mtx::events::msg::Emote> &)
@@ -367,7 +367,7 @@ qml_mtx_events::fromRoomEventType(qml_mtx_events::EventType t)
         return mtx::events::EventType::SpaceChild;
     /// m.room.message
     case qml_mtx_events::AudioMessage:
-    case qml_mtx_events::ConfettiMessage:
+    case qml_mtx_events::ElementEffectMessage:
     case qml_mtx_events::EmoteMessage:
     case qml_mtx_events::FileMessage:
     case qml_mtx_events::ImageMessage:
@@ -1091,14 +1091,17 @@ TimelineModel::addEvents(const mtx::responses::Timeline &timeline)
                 msg.contains("🎉") || msg.contains("🎊")) {
                 needsSpecialEffects_ = true;
                 specialEffects_.setFlag(Confetti);
-            } else if (std::get<RoomEvent<mtx::events::msg::Unknown>>(e).content.msgtype ==
-                       "io.element.effect.rainfall") {
+            }
+        } else if (std::holds_alternative<RoomEvent<mtx::events::msg::ElementEffect>>(e)) {
+            if (auto msgtype =
+                  std::get<RoomEvent<mtx::events::msg::ElementEffect>>(e).content.msgtype;
+                msgtype == "nic.custom.confetti") {
+                needsSpecialEffects_ = true;
+                specialEffects_.setFlag(Confetti);
+            } else if (msgtype == "io.element.effect.rainfall") {
                 needsSpecialEffects_ = true;
                 specialEffects_.setFlag(Rainfall);
             }
-        } else if (std::holds_alternative<RoomEvent<mtx::events::msg::Confetti>>(e)) {
-            needsSpecialEffects_ = true;
-            specialEffects_.setFlag(Confetti);
         }
     }
 
@@ -2949,7 +2952,7 @@ TimelineModel::setEdit(const QString &newEdit)
             if (msgType == mtx::events::MessageType::Text ||
                 msgType == mtx::events::MessageType::Notice ||
                 msgType == mtx::events::MessageType::Emote ||
-                msgType == mtx::events::MessageType::Confetti ||
+                msgType == mtx::events::MessageType::ElementEffect ||
                 msgType == mtx::events::MessageType::Unknown) {
                 auto relInfo  = relatedInfo(newEdit);
                 auto editText = relInfo.quoted_body;
@@ -2971,14 +2974,23 @@ TimelineModel::setEdit(const QString &newEdit)
 
                 if (msgType == mtx::events::MessageType::Emote)
                     input()->setText("/me " + editText);
-                else if (msgType == mtx::events::MessageType::Confetti)
-                    input()->setText("/confetti " + editText);
-                else if (msgType == mtx::events::MessageType::Unknown) {
-                    if (auto u = std::get_if<mtx::events::RoomEvent<mtx::events::msg::Unknown>>(&e);
-                        u && u->content.msgtype == "io.element.effect.rainfall")
+                else if (msgType == mtx::events::MessageType::ElementEffect)
+                {
+                    auto u =
+                      std::get_if<mtx::events::RoomEvent<mtx::events::msg::ElementEffect>>(&e);
+                    auto msgtypeString = u ? u->content.msgtype : "";
+                    if (msgtypeString == "io.element.effect.rainfall")
                         input()->setText("/rainfall " + editText);
+                    else if (msgtypeString == "nic.custom.confetti")
+                        input()->setText("/confetti " + editText);
                     else
-                        input()->setText(editText);
+                        input()->setText("/msgtype " + QString::fromStdString(msgtypeString) + " " +
+                                         editText);
+                } else if (msgType == mtx::events::MessageType::Unknown) {
+                    auto u = std::get_if<mtx::events::RoomEvent<mtx::events::msg::Unknown>>(&e);
+                    input()->setText("/msgtype " +
+                                     (u ? QString::fromStdString(u->content.msgtype) : "") + " " +
+                                     editText);
                 } else
                     input()->setText(editText);
             } else {
diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h
index ce3dc9e4..ef845bb5 100644
--- a/src/timeline/TimelineModel.h
+++ b/src/timeline/TimelineModel.h
@@ -99,7 +99,7 @@ enum EventType
     Widget,
     /// m.room.message
     AudioMessage,
-    ConfettiMessage,
+    ElementEffectMessage,
     EmoteMessage,
     FileMessage,
     ImageMessage,

From bdee662bbd58544b36dab66963858c4fe6ae825d Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Sat, 8 Apr 2023 19:08:11 -0400
Subject: [PATCH 12/12] Update mtxclient commit hash

---
 CMakeLists.txt                   | 2 +-
 io.github.NhekoReborn.Nheko.yaml | 2 +-
 src/timeline/TimelineModel.cpp   | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 146a3e25..20fcb029 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -602,7 +602,7 @@ if(USE_BUNDLED_MTXCLIENT)
 	FetchContent_Declare(
 		MatrixClient
                 GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
-                GIT_TAG        f8a9cbbb25ea145a23506c2f9386f6c61401bed0
+                GIT_TAG        dd2bdbd104ae8f70f82da9ff7b4b60007fc105c3
 		)
 	set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
 	set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")
diff --git a/io.github.NhekoReborn.Nheko.yaml b/io.github.NhekoReborn.Nheko.yaml
index 26c2020f..97d0b770 100644
--- a/io.github.NhekoReborn.Nheko.yaml
+++ b/io.github.NhekoReborn.Nheko.yaml
@@ -213,7 +213,7 @@ modules:
     buildsystem: cmake-ninja
     name: mtxclient
     sources:
-      - commit: f8a9cbbb25ea145a23506c2f9386f6c61401bed0
+      - commit: dd2bdbd104ae8f70f82da9ff7b4b60007fc105c3
         #tag: v0.9.2
         type: git
         url: https://github.com/Nheko-Reborn/mtxclient.git
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index 9e667bce..918d1c0b 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -2974,8 +2974,7 @@ TimelineModel::setEdit(const QString &newEdit)
 
                 if (msgType == mtx::events::MessageType::Emote)
                     input()->setText("/me " + editText);
-                else if (msgType == mtx::events::MessageType::ElementEffect)
-                {
+                else if (msgType == mtx::events::MessageType::ElementEffect) {
                     auto u =
                       std::get_if<mtx::events::RoomEvent<mtx::events::msg::ElementEffect>>(&e);
                     auto msgtypeString = u ? u->content.msgtype : "";