From 82274c0fbbeb36f4aeb4a7ff7b1c7cfea8c29b27 Mon Sep 17 00:00:00 2001
From: aringenbach <arnaudr@element.io>
Date: Thu, 27 Oct 2022 10:55:42 +0200
Subject: [PATCH] Fixed IRC-style message and commands support in Rich text
 editor

---
 Riot/Modules/Room/RoomViewController.swift | 2 +-
 changelog.d/6962.bugfix                    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/6962.bugfix

diff --git a/Riot/Modules/Room/RoomViewController.swift b/Riot/Modules/Room/RoomViewController.swift
index 7bbc6812cd..09366bcedc 100644
--- a/Riot/Modules/Room/RoomViewController.swift
+++ b/Riot/Modules/Room/RoomViewController.swift
@@ -84,7 +84,7 @@ extension RoomViewController {
                             "event_id": eventModified.eventId
                         ])
                 })
-            } else {
+            } else if !self.send(asIRCStyleCommandIfPossible: rawTextMsg) {
                 roomDataSource.sendFormattedTextMessage(rawTextMsg, html: htmlMsg) { response in
                     switch response {
                     case .success:
diff --git a/changelog.d/6962.bugfix b/changelog.d/6962.bugfix
new file mode 100644
index 0000000000..bacf915610
--- /dev/null
+++ b/changelog.d/6962.bugfix
@@ -0,0 +1 @@
+Fixed IRC-style message and commands support in Rich text editor