diff --git a/src/Simplex/Chat/Library/Internal.hs b/src/Simplex/Chat/Library/Internal.hs index a3a5ea8b87..66d94d396f 100644 --- a/src/Simplex/Chat/Library/Internal.hs +++ b/src/Simplex/Chat/Library/Internal.hs @@ -2749,8 +2749,8 @@ prepareAgentCreation user cmdFunction enableNtfs cMode = do connId <- withAgent $ \a -> prepareConnectionToCreate a (aUserId user) enableNtfs cMode PQSupportOff pure (cmdId, connId) -createAgentConnectionAsync :: ConnectionModeI c => CommandId -> ConnId -> Bool -> SConnectionMode c -> SubscriptionMode -> CM () -createAgentConnectionAsync cmdId connId enableNtfs cMode subMode = +createAgentConnectionAsync :: ConnectionModeI c => (CommandId, ConnId) -> Bool -> SConnectionMode c -> SubscriptionMode -> CM () +createAgentConnectionAsync (cmdId, connId) enableNtfs cMode subMode = withAgent $ \a -> createConnectionAsync a (aCorrId cmdId) connId enableNtfs cMode IKPQOff subMode prepareAgentJoin :: User -> Maybe Connection -> Bool -> ConnectionRequestUri c -> CM (CommandId, ConnId) diff --git a/src/Simplex/Chat/Library/Subscriber.hs b/src/Simplex/Chat/Library/Subscriber.hs index 9099cf5a85..e959a547cf 100644 --- a/src/Simplex/Chat/Library/Subscriber.hs +++ b/src/Simplex/Chat/Library/Subscriber.hs @@ -642,7 +642,7 @@ processAgentMessageConn cxt user@User {userId} corrId agentConnId agentMessage = groupConnIds <- prepareAgentCreation user CFCreateConnGrpInv True SCMInvitation gVar <- asks random withStore $ \db -> createNewContactMemberAsync db gVar user groupInfo ct' gLinkMemRole groupConnIds connChatVersion peerChatVRange subMode - uncurry createAgentConnectionAsync groupConnIds True SCMInvitation subMode + createAgentConnectionAsync groupConnIds True SCMInvitation subMode -- TODO REMOVE LEGACY ^^^ SENT msgId proxy -> do void $ continueSending connEntity conn @@ -3184,7 +3184,7 @@ processAgentMessageConn cxt user@User {userId} corrId agentConnId agentMessage = void $ withStore $ \db -> do reMember <- createIntroReMember db cxt user gInfo memInfo memRestrictions createIntroReMemberConn db user m reMember chatV memInfo groupConnIds subMode - uncurry createAgentConnectionAsync groupConnIds (chatHasNtfs chatSettings) SCMInvitation subMode + createAgentConnectionAsync groupConnIds (chatHasNtfs chatSettings) SCMInvitation subMode | otherwise -> messageError "x.grp.mem.intro: member chat version range incompatible" _ -> messageError "x.grp.mem.intro can be only sent by host member" where