From a4ccd9af0d99f9664d83291cc6355be537baecd7 Mon Sep 17 00:00:00 2001
From: fmodf <fmodf.ios@gmail.com>
Date: Tue, 2 Jul 2024 09:22:28 +0200
Subject: [PATCH] wip

---
 .../AppCore/Middlewares/DatabaseMiddleware.swift       |  2 +-
 ConversationsClassic/AppCore/XMPP/XMPPService.swift    | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ConversationsClassic/AppCore/Middlewares/DatabaseMiddleware.swift b/ConversationsClassic/AppCore/Middlewares/DatabaseMiddleware.swift
index ea61c49..86d96ef 100644
--- a/ConversationsClassic/AppCore/Middlewares/DatabaseMiddleware.swift
+++ b/ConversationsClassic/AppCore/Middlewares/DatabaseMiddleware.swift
@@ -167,7 +167,7 @@ final class DatabaseMiddleware {
                         promise(.success(.databaseAction(.storeMessageFailed(reason: L10n.Global.Error.genericDbError))))
                         return
                     }
-                    guard message.contentType != .typing else {
+                    guard message.contentType != .typing, message.body != nil else {
                         promise(.success(.empty))
                         return
                     }
diff --git a/ConversationsClassic/AppCore/XMPP/XMPPService.swift b/ConversationsClassic/AppCore/XMPP/XMPPService.swift
index 0f720fa..2386227 100644
--- a/ConversationsClassic/AppCore/XMPP/XMPPService.swift
+++ b/ConversationsClassic/AppCore/XMPP/XMPPService.swift
@@ -109,11 +109,13 @@ final class XMPPService: ObservableObject {
             completion(false)
             return
         }
-        let message = Martin.Message()
-        message.to = JID(to)
-        message.body = message.body
+        guard let chat = client.module(MessageModule.self).chatManager.chat(for: client.context, with: BareJID(to)) else {
+            completion(false)
+            return
+        }
 
-        client.context.writer.write(message) { res in
+        let msg = chat.createMessage(text: message.body ?? "??", id: message.id)
+        chat.send(message: msg) { res in
             switch res {
             case .success:
                 completion(true)