merged element 1.10.12 into bum

2026-04-23 01:52:44 +02:00 · 2023-06-07 15:45:59 +02:00
parent 110dc72b77 a3048b3125
commit 1c0ef0ca52
132 changed files with 2750 additions and 2416 deletions
@@ -58,6 +58,22 @@ extension RoomViewController {
        }
    }

+    @objc func setCommand(_ command: String) {
+        if let wysiwygInputToolbar, wysiwygInputToolbar.textFormattingEnabled {
+            wysiwygInputToolbar.command(command)
+            wysiwygInputToolbar.becomeFirstResponder()
+        } else {
+            guard let attributedText = inputToolbarView.attributedTextMessage else { return }
+
+            let newAttributedString = NSMutableAttributedString(attributedString: attributedText)
+            newAttributedString.append(NSAttributedString(string: "\(command) ",
+                                                          attributes: [.font: inputToolbarView.defaultFont]))
+
+            inputToolbarView.attributedTextMessage = newAttributedString
+            inputToolbarView.becomeFirstResponder()
+        }
+    }
+

    /// Send the formatted text message and its raw counterpart to the room
    ///
@@ -91,7 +107,7 @@ extension RoomViewController {
                            "event_id": eventModified.eventId
                        ])
                })
-            } else if !self.send(asIRCStyleCommandIfPossible: rawTextMsg) {
+            } else {
                roomDataSource.sendFormattedTextMessage(rawTextMsg, html: htmlMsg) { response in
                    switch response {
                    case .success: