From 9155aa5ad8e5ff4abb5c0317c82be17ed4ef06c6 Mon Sep 17 00:00:00 2001
From: fmodf <fmodf.ios@gmail.com>
Date: Wed, 24 Jul 2024 15:35:17 +0200
Subject: [PATCH] wip

---
 .../AppCore/XMPP/XMPPService.swift                | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/ConversationsClassic/AppCore/XMPP/XMPPService.swift b/ConversationsClassic/AppCore/XMPP/XMPPService.swift
index f3ce6a4..87d09d6 100644
--- a/ConversationsClassic/AppCore/XMPP/XMPPService.swift
+++ b/ConversationsClassic/AppCore/XMPP/XMPPService.swift
@@ -73,13 +73,7 @@ final class XMPPService: ObservableObject {
                 }
                 .store(in: &clientMessagesCancellables)
 
-            // enable carbons if available
-            client.module(.messageCarbons).$isAvailable.filter { $0 }
-                .sink(receiveValue: { [weak client] _ in
-                    client?.module(.messageCarbons).enable()
-                })
-                .store(in: &clientMessagesCancellables)
-
+            // subscribe to archived messages
             client.module(.mam).archivedMessagesPublisher
                 .sink(receiveValue: { [weak self] archived in
                     let message = archived.message
@@ -88,6 +82,13 @@ final class XMPPService: ObservableObject {
                 })
                 .store(in: &clientMessagesCancellables)
 
+            // enable carbons if available
+            client.module(.messageCarbons).$isAvailable.filter { $0 }
+                .sink(receiveValue: { [weak client] _ in
+                    client?.module(.messageCarbons).enable()
+                })
+                .store(in: &clientMessagesCancellables)
+
             // finally, do login
             client.login()
         }