From 7c04a1d494a904376bae38b955220bdf984f8e1f Mon Sep 17 00:00:00 2001
From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>
Date: Thu, 10 Oct 2024 19:06:33 +0400
Subject: [PATCH] group join

---
 src/Simplex/Chat.hs | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/Simplex/Chat.hs b/src/Simplex/Chat.hs
index 0d3369a007..f1be694d3b 100644
--- a/src/Simplex/Chat.hs
+++ b/src/Simplex/Chat.hs
@@ -2040,27 +2040,22 @@ processChatCommand' vr = \case
       case activeConn of
         Just Connection {peerChatVRange} -> do
           subMode <- chatReadVar subscriptionMode
-          dm <- encodeConnInfo $ XGrpAcpt membershipMemId
-          -- TODO conn prepare
-          -- check if admin member already has connection record
-          -- case connection Just: use it
-          -- case connection Nothing: code below
-          agentConnId <- withAgent $ \a -> prepareConnectionToJoin a (aUserId user) True connRequest PQSupportOff
-          let chatV = vr `peerConnChatVersion` peerChatVRange
-          cId <- withFastStore' $ \db -> do
-            Connection {connId = cId} <- createMemberConnection db userId fromMember agentConnId chatV peerChatVRange subMode
+          agentConnId <- case memberConn fromMember of
+            Nothing -> do
+              agentConnId <- withAgent $ \a -> prepareConnectionToJoin a (aUserId user) True connRequest PQSupportOff
+              let chatV = vr `peerConnChatVersion` peerChatVRange
+              void $ withFastStore' $ \db -> createMemberConnection db userId fromMember agentConnId chatV peerChatVRange subMode
+              pure agentConnId
+            Just conn -> pure $ aConnId conn
+          withFastStore' $ \db -> do
             updateGroupMemberStatus db userId fromMember GSMemAccepted
             updateGroupMemberStatus db userId membership GSMemAccepted
-            pure cId
-          -- TODO conn prepare
-          -- don't cleanup (set failure state? - same as for invitation links)
+          dm <- encodeConnInfo $ XGrpAcpt membershipMemId
           void (withAgent $ \a -> joinConnection a (aUserId user) agentConnId True connRequest dm PQSupportOff subMode)
             `catchChatError` \e -> do
               withFastStore' $ \db -> do
-                deleteConnectionRecord db user cId
                 updateGroupMemberStatus db userId fromMember GSMemInvited
                 updateGroupMemberStatus db userId membership GSMemInvited
-              withAgent $ \a -> deleteConnectionAsync a False agentConnId
               throwError e
           updateCIGroupInvitationStatus user g CIGISAccepted `catchChatError` (toView . CRChatError (Just user))
           pure $ CRUserAcceptedGroupSent user g {membership = membership {memberStatus = GSMemAccepted}} Nothing