remove group requests (revert)

src/Simplex/Chat/Library/Internal.hs

@@ -922,18 +922,22 @@ acceptContactRequestAsync
       liftIO $ setCommandConnId db user cmdId connId
       getContact db vr user contactId
 
-acceptGroupJoinRequestAsync :: User -> Int64 -> GroupInfo -> GroupMember -> UserContactRequest -> GroupAcceptance -> GroupMemberRole -> Maybe IncognitoProfile -> CM GroupMember
+acceptGroupJoinRequestAsync :: User -> Int64 -> GroupInfo -> InvitationId -> VersionRangeChat -> Profile -> Maybe XContactId -> GroupAcceptance -> GroupMemberRole -> Maybe IncognitoProfile -> CM GroupMember
 acceptGroupJoinRequestAsync
   user
   uclId
   gInfo@GroupInfo {groupProfile, membership, businessChat}
-  member@GroupMember {groupMemberId, memberId}
-  ucr@UserContactRequest {agentInvitationId = AgentInvId cReqInvId, cReqChatVRange}
+  cReqInvId
+  cReqChatVRange
+  cReqProfile
+  cReqXContactId_
   gAccepted
   gLinkMemRole
   incognitoProfile = do
+    gVar <- asks random
     let initialStatus = acceptanceToStatus (memberAdmission groupProfile) gAccepted
-    _member' <- withStore' $ \db -> setMemberRoleStatus db member gLinkMemRole initialStatus
+    (groupMemberId, memberId) <- withStore $ \db ->
+      createJoiningMember db gVar user gInfo cReqChatVRange cReqProfile cReqXContactId_ gLinkMemRole initialStatus
     currentMemCount <- withStore' $ \db -> getGroupCurrentMembersCount db user gInfo
     let Profile {displayName} = profileToSendOnAccept user incognitoProfile True
         GroupMember {memberRole = userRole, memberId = userMemberId} = membership
@@ -953,19 +957,22 @@ acceptGroupJoinRequestAsync
     let chatV = vr `peerConnChatVersion` cReqChatVRange
     connIds <- agentAcceptContactAsync user True cReqInvId msg subMode PQSupportOff chatV
     withStore $ \db -> do
-      liftIO $ setContactRequestAccepted db ucr
       liftIO $ createJoiningMemberConnection db user uclId connIds chatV cReqChatVRange groupMemberId subMode
       getGroupMemberById db vr user groupMemberId
 
-acceptGroupJoinSendRejectAsync :: User -> Int64 -> GroupInfo -> GroupMember -> UserContactRequest -> GroupRejectionReason -> CM GroupMember
+acceptGroupJoinSendRejectAsync :: User -> Int64 -> GroupInfo -> InvitationId -> VersionRangeChat -> Profile -> Maybe XContactId -> GroupRejectionReason -> CM GroupMember
 acceptGroupJoinSendRejectAsync
   user
   uclId
-  GroupInfo {groupProfile, membership}
-  member@GroupMember {groupMemberId, memberId}
-  ucr@UserContactRequest {agentInvitationId = AgentInvId cReqInvId, cReqChatVRange}
+  gInfo@GroupInfo {groupProfile, membership}
+  cReqInvId
+  cReqChatVRange
+  cReqProfile
+  cReqXContactId_
   rejectionReason = do
-    _member' <- withStore' $ \db -> setMemberRoleStatus db member GRObserver GSMemRejected
+    gVar <- asks random
+    (groupMemberId, memberId) <- withStore $ \db ->
+      createJoiningMember db gVar user gInfo cReqChatVRange cReqProfile cReqXContactId_ GRObserver GSMemRejected
     let GroupMember {memberRole = userRole, memberId = userMemberId} = membership
         msg =
           XGrpLinkReject $
@@ -980,7 +987,6 @@ acceptGroupJoinSendRejectAsync
     let chatV = vr `peerConnChatVersion` cReqChatVRange
     connIds <- agentAcceptContactAsync user False cReqInvId msg subMode PQSupportOff chatV
     withStore $ \db -> do
-      liftIO $ setContactRequestAccepted db ucr
       liftIO $ createJoiningMemberConnection db user uclId connIds chatV cReqChatVRange groupMemberId subMode
       getGroupMemberById db vr user groupMemberId
 

src/Simplex/Chat/Library/Subscriber.hs

@@ -1238,93 +1238,94 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
       where
         profileContactRequest :: InvitationId -> VersionRangeChat -> Profile -> Maybe XContactId -> Maybe SharedMsgId -> Maybe (SharedMsgId, MsgContent) -> PQSupport -> CM ()
         profileContactRequest invId chatVRange p@Profile {displayName} xContactId_ welcomeMsgId_ requestMsg_ reqPQSup = do
-          uclGLinkInfo <- withStore $ \db -> getUserContactLinkById db userId uclId
-          let (UserContactLink {connLinkContact = CCLink connReq _, shortLinkDataSet, addressSettings}, gLinkInfo_) = uclGLinkInfo
-              AddressSettings {autoAccept} = addressSettings
-              isSimplexTeam = sameConnReqContact connReq adminContactReq
-              v = maxVersion chatVRange
-          gVar <- asks random
-          withStore (\db -> createOrUpdateContactRequest db gVar vr user uclId uclGLinkInfo isSimplexTeam invId chatVRange p xContactId_ welcomeMsgId_ requestMsg_ reqPQSup) >>= \case
-            RSAcceptedRequest _ucr re -> case re of
-              REContact ct ->
-                -- TODO update request msg
-                toView $ CEvtContactRequestAlreadyAccepted user ct
-              REBusinessChat gInfo _clientMember ->
-                -- TODO update request msg
-                toView $ CEvtBusinessRequestAlreadyAccepted user gInfo
-              REGroupMember _gInfo _m -> pure ()
-            RSCurrentRequest ucr re_ repeatRequest -> case re_ of
-              Nothing -> toView $ CEvtReceivedContactRequest user ucr Nothing
-              Just (REContact ct) -> do
-                -- TODO [short links] prevent duplicate items
-                -- update welcome message if changed (send update event to UI) and add updated feature items.
-                -- Do not created e2e item on repeat request
-                if repeatRequest
-                  then do
+          (ucl, gLinkInfo_) <- withStore $ \db -> getUserContactLinkById db userId uclId
+          let v = maxVersion chatVRange
+          case gLinkInfo_ of
+            -- ##### Contact requests (regular and business contacts) #####
+            Nothing -> do
+              let UserContactLink {connLinkContact = CCLink connReq _, shortLinkDataSet, addressSettings} = ucl
+                  AddressSettings {autoAccept} = addressSettings
+                  isSimplexTeam = sameConnReqContact connReq adminContactReq
+              gVar <- asks random
+              withStore (\db -> createOrUpdateContactRequest db gVar vr user uclId ucl isSimplexTeam invId chatVRange p xContactId_ welcomeMsgId_ requestMsg_ reqPQSup) >>= \case
+                RSAcceptedRequest _ucr re -> case re of
+                  REContact ct ->
                     -- TODO update request msg
-                    -- ....
-                    acceptOrShow Nothing -- pass item?
-                  else do
-                    -- TODO [short links] save sharedMsgId instead of the last Nothing
-                    let createItem content = createChatItem user (CDDirectRcv ct) False content Nothing Nothing
-                    void $ createItem $ CIRcvDirectE2EEInfo $ E2EInfo $ Just $ CR.pqSupportToEnc $ reqPQSup
-                    void $ createFeatureEnabledItems_ user ct
+                    toView $ CEvtContactRequestAlreadyAccepted user ct
+                  REBusinessChat gInfo _clientMember ->
+                    -- TODO update request msg
+                    toView $ CEvtBusinessRequestAlreadyAccepted user gInfo
+                RSCurrentRequest ucr re_ repeatRequest -> case re_ of
+                  Nothing -> toView $ CEvtReceivedContactRequest user ucr Nothing
+                  Just (REContact ct) -> do
+                    -- TODO [short links] prevent duplicate items
+                    -- update welcome message if changed (send update event to UI) and add updated feature items.
+                    -- Do not created e2e item on repeat request
+                    if repeatRequest
+                      then do
+                        -- TODO update request msg
+                        -- ....
+                        acceptOrShow Nothing -- pass item?
+                      else do
+                        -- TODO [short links] save sharedMsgId instead of the last Nothing
+                        let createItem content = createChatItem user (CDDirectRcv ct) False content Nothing Nothing
+                        void $ createItem $ CIRcvDirectE2EEInfo $ E2EInfo $ Just $ CR.pqSupportToEnc $ reqPQSup
+                        void $ createFeatureEnabledItems_ user ct
+                        -- TODO [short links] save sharedMsgId
+                        aci <- forM requestMsg_ $ \(sharedMsgId, mc) -> do
+                          aci <- createItem $ CIRcvMsgContent mc
+                          unlessM (asks $ coreApi . config) $ toView $ CEvtNewChatItems user [aci]
+                          pure aci
+                        acceptOrShow aci
+                    where
+                      acceptOrShow aci_ =
+                        case autoAccept of
+                          Nothing -> do
+                            let cInfo = DirectChat ct
+                                chat = AChat SCTDirect $ case aci_ of
+                                    Just (AChatItem SCTDirect dir _ ci) -> Chat cInfo [CChatItem dir ci] emptyChatStats {unreadCount = 1, minUnreadItemId = chatItemId' ci}
+                                    _ -> Chat cInfo [] emptyChatStats
+                            toView $ CEvtReceivedContactRequest user ucr (Just chat)
+                          Just AutoAccept {acceptIncognito} -> do
+                            incognitoProfile <-
+                              if not shortLinkDataSet && acceptIncognito
+                                then Just . NewIncognito <$> liftIO generateRandomProfile
+                                else pure Nothing
+                            ct' <- acceptContactRequestAsync user uclId ct ucr incognitoProfile
+                            -- chat in event?
+                            toView $ CEvtAcceptingContactRequest user ct'
+                  Just (REBusinessChat gInfo clientMember) -> do
+                    -- TODO [short links] prevent duplicate items (use repeatRequest like for REContact)
+                    (_gInfo', _clientMember') <- acceptBusinessJoinRequestAsync user uclId gInfo clientMember ucr
+                    -- TODO [short links] add welcome message if welcomeMsgId is present
+                    -- forM_ autoReply $ \arMC ->
+                    --   when (shortLinkDataSet && v >= shortLinkDataVersion) $
+                    --     createInternalChatItem user (CDGroupSnd gInfo Nothing) (CISndMsgContent arMC) Nothing
                     -- TODO [short links] save sharedMsgId
-                    aci <- forM requestMsg_ $ \(sharedMsgId, mc) -> do
-                      aci <- createItem $ CIRcvMsgContent mc
-                      unlessM (asks $ coreApi . config) $ toView $ CEvtNewChatItems user [aci]
-                      pure aci
-                    acceptOrShow aci
-                where
-                  acceptOrShow aci_ =
-                    case autoAccept of
-                      Nothing -> do
-                        let cInfo = DirectChat ct
-                            chat = AChat SCTDirect $ case aci_ of
-                                Just (AChatItem SCTDirect dir _ ci) -> Chat cInfo [CChatItem dir ci] emptyChatStats {unreadCount = 1, minUnreadItemId = chatItemId' ci}
-                                _ -> Chat cInfo [] emptyChatStats
-                        toView $ CEvtReceivedContactRequest user ucr (Just chat)
-                      Just AutoAccept {acceptIncognito} -> do
-                        incognitoProfile <-
-                          if not shortLinkDataSet && acceptIncognito
-                            then Just . NewIncognito <$> liftIO generateRandomProfile
-                            else pure Nothing
-                        ct' <- acceptContactRequestAsync user uclId ct ucr incognitoProfile
-                        -- chat in event?
-                        toView $ CEvtAcceptingContactRequest user ct'
-              Just (REBusinessChat gInfo clientMember) -> do
-                -- TODO [short links] prevent duplicate items (use repeatRequest like for REContact)
-                (_gInfo', _clientMember') <- acceptBusinessJoinRequestAsync user uclId gInfo clientMember ucr
-                -- TODO [short links] add welcome message if welcomeMsgId is present
-                -- forM_ autoReply $ \arMC ->
-                --   when (shortLinkDataSet && v >= shortLinkDataVersion) $
-                --     createInternalChatItem user (CDGroupSnd gInfo Nothing) (CISndMsgContent arMC) Nothing
-                -- TODO [short links] save sharedMsgId
-                forM_ requestMsg_ $ \(sharedMsgId, mc) ->
-                  createInternalChatItem user (CDGroupRcv gInfo Nothing clientMember) (CIRcvMsgContent mc) Nothing
-                toView $ CEvtAcceptingBusinessRequest user gInfo
-              Just (REGroupMember gInfo mem) -> case gLinkInfo_ of
-                Nothing -> throwChatError $ CEException "processUserContactRequest: no group link info not found for group member request"
-                Just gli@GroupLinkInfo {memberRole = gLinkMemRole} -> do
-                  acceptMember_ <- asks $ acceptMember . chatHooks . config
-                  maybe (pure $ Right (GAAccepted, gLinkMemRole)) (\am -> liftIO $ am gInfo gli p) acceptMember_ >>= \case
-                    Right (acceptance, useRole)
-                      | v < groupFastLinkJoinVersion -> do
-                          withStore' $ \db -> deleteGroupMember db user mem
-                          messageError "processUserContactRequest: chat version range incompatible for accepting group join request"
-                      | otherwise -> do
-                          let profileMode = ExistingIncognito <$> incognitoMembershipProfile gInfo
-                          mem' <- acceptGroupJoinRequestAsync user uclId gInfo mem ucr acceptance useRole profileMode
-                          (gInfo', mem'', scopeInfo) <- mkGroupChatScope gInfo mem'
-                          createInternalChatItem user (CDGroupRcv gInfo' scopeInfo mem'') (CIRcvGroupEvent RGEInvitedViaGroupLink) Nothing
-                          toView $ CEvtAcceptingGroupJoinRequestMember user gInfo' mem''
-                    Left rjctReason
-                      | v < groupJoinRejectVersion -> do
-                          withStore' $ \db -> deleteGroupMember db user mem
-                          messageWarning $ "processUserContactRequest (group " <> groupName' gInfo <> "): joining of " <> displayName <> " is blocked"
-                      | otherwise -> do
-                          mem' <- acceptGroupJoinSendRejectAsync user uclId gInfo mem ucr rjctReason
-                          toViewTE $ TERejectingGroupJoinRequestMember user gInfo mem' rjctReason
+                    forM_ requestMsg_ $ \(sharedMsgId, mc) ->
+                      createInternalChatItem user (CDGroupRcv gInfo Nothing clientMember) (CIRcvMsgContent mc) Nothing
+                    toView $ CEvtAcceptingBusinessRequest user gInfo
+            -- ##### Group link join requests #####
+            Just gli@GroupLinkInfo {groupId, memberRole = gLinkMemRole} -> do
+              -- TODO deduplicate request by xContactId?
+              gInfo <- withStore $ \db -> getGroupInfo db vr user groupId
+              acceptMember_ <- asks $ acceptMember . chatHooks . config
+              maybe (pure $ Right (GAAccepted, gLinkMemRole)) (\am -> liftIO $ am gInfo gli p) acceptMember_ >>= \case
+                Right (acceptance, useRole)
+                  | v < groupFastLinkJoinVersion ->
+                      messageError "processUserContactRequest: chat version range incompatible for accepting group join request"
+                  | otherwise -> do
+                      let profileMode = ExistingIncognito <$> incognitoMembershipProfile gInfo
+                      mem <- acceptGroupJoinRequestAsync user uclId gInfo invId chatVRange p xContactId_ acceptance useRole profileMode
+                      (gInfo', mem', scopeInfo) <- mkGroupChatScope gInfo mem
+                      createInternalChatItem user (CDGroupRcv gInfo' scopeInfo mem') (CIRcvGroupEvent RGEInvitedViaGroupLink) Nothing
+                      toView $ CEvtAcceptingGroupJoinRequestMember user gInfo' mem'
+                Left rjctReason
+                  | v < groupJoinRejectVersion ->
+                      messageWarning $ "processUserContactRequest (group " <> groupName' gInfo <> "): joining of " <> displayName <> " is blocked"
+                  | otherwise -> do
+                      mem <- acceptGroupJoinSendRejectAsync user uclId gInfo invId chatVRange p xContactId_ rjctReason
+                      toViewTE $ TERejectingGroupJoinRequestMember user gInfo mem rjctReason
 
     memberCanSend :: GroupMember -> Maybe MsgScope -> CM () -> CM ()
     memberCanSend m@GroupMember {memberRole} msgScope a = case msgScope of

src/Simplex/Chat/Store/ContactRequest.hs

@@ -28,7 +28,6 @@ import Simplex.Chat.Store.Shared
 import Simplex.Chat.Store.Profiles
 import Simplex.Chat.Types
 import Simplex.Chat.Types.Preferences
-import Simplex.Chat.Types.Shared
 import Simplex.Messaging.Agent.Protocol (InvitationId)
 import Simplex.Messaging.Agent.Store.AgentStore (maybeFirstRow)
 import Simplex.Messaging.Agent.Store.DB (Binary (..), BoolInt (..))
@@ -50,7 +49,7 @@ createOrUpdateContactRequest ::
   -> VersionRangeChat
   -> User
   -> Int64
-  -> (UserContactLink, Maybe GroupLinkInfo)
+  -> UserContactLink
   -> Bool
   -> InvitationId
   -> VersionRangeChat
@@ -66,7 +65,7 @@ createOrUpdateContactRequest
   vr
   user@User {userId, userContactId}
   uclId
-  uclGLinkInfo
+  UserContactLink {addressSettings = AddressSettings {businessAddress}}
   isSimplexTeam
   invId
   cReqChatVRange@(VersionRange minV maxV)
@@ -150,7 +149,7 @@ createOrUpdateContactRequest
           [sql|
             SELECT
               cr.contact_request_id, cr.local_display_name, cr.agent_invitation_id,
-              cr.contact_id, cr.group_member_id, cr.business_group_id, cr.user_contact_link_id,
+              cr.contact_id, cr.business_group_id, cr.user_contact_link_id,
               c.agent_conn_id, cr.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, cr.xcontact_id,
               cr.pq_support, cr.accepted, cr.welcome_shared_msg_id, cr.request_shared_msg_id, p.preferences,
               cr.created_at, cr.updated_at,
@@ -188,18 +187,12 @@ createOrUpdateContactRequest
         contactRequestId <- liftIO $ insertedRowId db
         createRequestEntity ldn profileId contactRequestId currentTs
       where
-        createRequestEntity ldn profileId contactRequestId currentTs = do
-          let (UserContactLink {addressSettings}, gLinkInfo_) = uclGLinkInfo
-              AddressSettings {businessAddress} = addressSettings
-          if businessAddress
-            then
+        createRequestEntity ldn profileId contactRequestId currentTs
+          | businessAddress =
               if isSimplexTeam && maxV < businessChatsVersion
                 then createContact'
                 else createBusinessChat
-            else
-              case gLinkInfo_ of
-                Nothing -> createContact'
-                Just gli -> createGroupMember gli
+          | otherwise = createContact'
           where
             createContact' = do
               liftIO $
@@ -216,17 +209,6 @@ createOrUpdateContactRequest
               ucr <- getContactRequest db user contactRequestId
               ct <- getContact db vr user contactId
               pure $ RSCurrentRequest ucr (Just $ REContact ct) False
-            createGroupMember GroupLinkInfo {groupId} = do
-              gInfo <- getGroupInfo db vr user groupId
-              gmId <- createJoiningMember db gVar user gInfo cReqChatVRange profileId ldn GRObserver GSMemUnknown
-              gm <- getGroupMemberById db vr user gmId
-              liftIO $
-                DB.execute
-                  db
-                  "UPDATE contact_requests SET group_member_id = ? WHERE contact_request_id = ?"
-                  (gmId, contactRequestId)
-              ucr <- getContactRequest db user contactRequestId
-              pure $ RSCurrentRequest ucr (Just $ REGroupMember gInfo gm) False
             createBusinessChat = do
               let Profile {preferences = userPreferences} = profileToSendOnAccept user Nothing True
                   groupPreferences = maybe defaultBusinessGroupPrefs businessGroupPrefs userPreferences
@@ -301,23 +283,19 @@ createOrUpdateContactRequest
                       (ldn, currentTs, contactId)
                   safeDeleteLDN db user oldLdn
     getRequestEntity :: UserContactRequest -> ExceptT StoreError IO (Maybe RequestEntity)
-    getRequestEntity UserContactRequest {contactRequestId, contactId_, groupMemberId_, businessGroupId_} =
-      case (contactId_, groupMemberId_, businessGroupId_) of
-        (Just contactId, Nothing, Nothing) -> do
+    getRequestEntity UserContactRequest {contactRequestId, contactId_, businessGroupId_} =
+      case (contactId_, businessGroupId_) of
+        (Just contactId, Nothing) -> do
           ct <- getContact db vr user contactId
           pure $ Just (REContact ct)
-        (Nothing, Just groupMemberId, Nothing) -> do
-          gm@GroupMember {groupId} <- getGroupMemberById db vr user groupMemberId
-          gInfo <- getGroupInfo db vr user groupId
-          pure $ Just (REGroupMember gInfo gm)
-        (Nothing, Nothing, Just businessGroupId) -> do
+        (Nothing, Just businessGroupId) -> do
           gInfo <- getGroupInfo db vr user businessGroupId
           case gInfo of
             GroupInfo {businessChat = Just BusinessChatInfo {customerId}} -> do
               clientMember <- getGroupMemberByMemberId db vr user gInfo customerId
               pure $ Just (REBusinessChat gInfo clientMember)
             _ -> throwError SEInvalidBusinessChatContactRequest
-        (Nothing, Nothing, Nothing) -> pure Nothing
+        (Nothing, Nothing) -> pure Nothing
         _ -> throwError $ SEInvalidContactRequestEntity contactRequestId
 
 setContactRequestAccepted :: DB.Connection -> UserContactRequest -> IO ()

src/Simplex/Chat/Store/Direct.hs

@@ -688,7 +688,7 @@ getContactRequest db User {userId} contactRequestId =
       [sql|
         SELECT
           cr.contact_request_id, cr.local_display_name, cr.agent_invitation_id,
-          cr.contact_id, cr.group_member_id, cr.business_group_id, cr.user_contact_link_id,
+          cr.contact_id, cr.business_group_id, cr.user_contact_link_id,
           c.agent_conn_id, cr.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, cr.xcontact_id,
           cr.pq_support, cr.accepted, cr.welcome_shared_msg_id, cr.request_shared_msg_id, p.preferences,
           cr.created_at, cr.updated_at,

src/Simplex/Chat/Store/Groups.hs

@@ -76,7 +76,6 @@ module Simplex.Chat.Store.Groups
     createNewContactMember,
     createNewContactMemberAsync,
     createJoiningMember,
-    setMemberRoleStatus,
     createJoiningMemberConnection,
     createBusinessRequestGroup,
     getContactViaMember,
@@ -1231,51 +1230,46 @@ createNewContactMemberAsync db gVar user@User {userId, userContactId} GroupInfo
             :. (minV, maxV)
         )
 
-createJoiningMember :: DB.Connection -> TVar ChaChaDRG -> User -> GroupInfo -> VersionRangeChat -> Int64 -> ContactName -> GroupMemberRole -> GroupMemberStatus -> ExceptT StoreError IO GroupMemberId
+createJoiningMember :: DB.Connection -> TVar ChaChaDRG -> User -> GroupInfo -> VersionRangeChat -> Profile -> Maybe XContactId -> GroupMemberRole -> GroupMemberStatus -> ExceptT StoreError IO (GroupMemberId, MemberId)
 createJoiningMember
   db
   gVar
   User {userId, userContactId}
   GroupInfo {groupId, membership}
   cReqChatVRange
-  profileId
-  ldn
+  Profile {displayName, fullName, image, contactLink, preferences}
+  cReqXContactId_
   memberRole
   memberStatus = do
     currentTs <- liftIO getCurrentTime
-    createWithRandomId gVar $ \memId -> do
-      insertMember_ (MemberId memId) currentTs
-      liftIO $ insertedRowId db
+    ExceptT . withLocalDisplayName db userId displayName $ \ldn -> runExceptT $ do
+      liftIO $
+        DB.execute
+          db
+          "INSERT INTO contact_profiles (display_name, full_name, image, contact_link, user_id, preferences, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?)"
+          (displayName, fullName, image, contactLink, userId, preferences, currentTs, currentTs)
+      profileId <- liftIO $ insertedRowId db
+      createWithRandomId gVar $ \memId -> do
+        insertMember_ ldn profileId (MemberId memId) currentTs
+        groupMemberId <- liftIO $ insertedRowId db
+        pure (groupMemberId, MemberId memId)
     where
       VersionRange minV maxV = cReqChatVRange
-      insertMember_ memberId currentTs =
+      insertMember_ ldn profileId memberId currentTs =
         DB.execute
           db
           [sql|
             INSERT INTO group_members
               ( group_id, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id,
-                user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at,
+                user_id, local_display_name, contact_id, contact_profile_id, member_xcontact_id, created_at, updated_at,
                 peer_chat_min_version, peer_chat_max_version)
-            VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+            VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
           |]
           ( (groupId, memberId, memberRole, GCInviteeMember, memberStatus, fromInvitedBy userContactId IBUser, groupMemberId' membership)
-              :. (userId, ldn, Nothing :: (Maybe Int64), profileId, currentTs, currentTs)
+              :. (userId, ldn, Nothing :: (Maybe Int64), profileId, cReqXContactId_, currentTs, currentTs)
               :. (minV, maxV)
           )
 
-setMemberRoleStatus :: DB.Connection -> GroupMember -> GroupMemberRole -> GroupMemberStatus -> IO GroupMember
-setMemberRoleStatus db gm@GroupMember {groupMemberId} newRole newStatus = do
-  currentTs <- getCurrentTime
-  DB.execute
-    db
-    [sql|
-      UPDATE group_members
-      SET member_role = ?, member_status = ?, updated_at = ?
-      WHERE group_member_id = ?
-    |]
-    (newRole, newStatus, currentTs, groupMemberId)
-  pure gm {memberRole = newRole, memberStatus = newStatus, updatedAt = currentTs}
-
 createJoiningMemberConnection :: DB.Connection -> User -> Int64 -> (CommandId, ConnId) -> VersionChat -> VersionRangeChat -> GroupMemberId -> SubscriptionMode -> IO ()
 createJoiningMemberConnection
   db

src/Simplex/Chat/Store/Messages.hs

@@ -1050,7 +1050,7 @@ getContactRequestChatPreviews_ db User {userId} pagination clq = case clq of
       [sql|
         SELECT
           cr.contact_request_id, cr.local_display_name, cr.agent_invitation_id,
-          cr.contact_id, cr.group_member_id, cr.business_group_id, cr.user_contact_link_id,
+          cr.contact_id, cr.business_group_id, cr.user_contact_link_id,
           c.agent_conn_id, cr.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, cr.xcontact_id,
           cr.pq_support, cr.accepted, cr.welcome_shared_msg_id, cr.request_shared_msg_id, p.preferences,
           cr.created_at, cr.updated_at,

src/Simplex/Chat/Store/SQLite/Migrations/M20250526_short_links.hs

@@ -15,12 +15,13 @@ ALTER TABLE contacts ADD COLUMN welcome_shared_msg_id BLOB;
 ALTER TABLE contacts ADD COLUMN contact_request_id INTEGER REFERENCES contact_requests ON DELETE SET NULL;
 CREATE INDEX idx_contacts_contact_request_id ON contacts(contact_request_id);
 
-ALTER TABLE contact_requests ADD COLUMN group_member_id INTEGER REFERENCES group_members ON DELETE CASCADE;
 ALTER TABLE contact_requests ADD COLUMN business_group_id INTEGER REFERENCES groups(group_id) ON DELETE CASCADE;
 ALTER TABLE contact_requests ADD COLUMN accepted INTEGER NOT NULL DEFAULT 0;
 ALTER TABLE contact_requests ADD COLUMN welcome_shared_msg_id BLOB;
 ALTER TABLE contact_requests ADD COLUMN request_shared_msg_id BLOB;
 
+ALTER TABLE group_members ADD COLUMN member_xcontact_id BLOB;
+
 ALTER TABLE user_contact_links ADD COLUMN short_link_data_set INTEGER NOT NULL DEFAULT 0;
 ALTER TABLE user_contact_links ADD COLUMN address_welcome_message TEXT;
 

src/Simplex/Chat/Store/SQLite/Migrations/chat_schema.sql

@@ -181,6 +181,7 @@ CREATE TABLE group_members(
   support_chat_items_member_attention INTEGER NOT NULL DEFAULT 0,
   support_chat_items_mentions INTEGER NOT NULL DEFAULT 0,
   support_chat_last_msg_from_member_ts TEXT,
+  member_xcontact_id BLOB,
   FOREIGN KEY(user_id, local_display_name)
   REFERENCES display_names(user_id, local_display_name)
   ON DELETE CASCADE
@@ -355,7 +356,6 @@ CREATE TABLE contact_requests(
   peer_chat_max_version INTEGER NOT NULL DEFAULT 1,
   pq_support INTEGER NOT NULL DEFAULT 0,
   contact_id INTEGER REFERENCES contacts ON DELETE CASCADE,
-  group_member_id INTEGER REFERENCES group_members ON DELETE CASCADE,
   business_group_id INTEGER REFERENCES groups(group_id) ON DELETE CASCADE,
   accepted INTEGER NOT NULL DEFAULT 0,
   welcome_shared_msg_id BLOB,

src/Simplex/Chat/Store/Shared.hs

@@ -472,13 +472,13 @@ getProfileById db userId profileId =
     toProfile :: (ContactName, Text, Maybe ImageData, Maybe ConnLinkContact, LocalAlias, Maybe Preferences) -> LocalProfile
     toProfile (displayName, fullName, image, contactLink, localAlias, preferences) = LocalProfile {profileId, displayName, fullName, image, contactLink, preferences, localAlias}
 
-type ContactRequestRow = (Int64, ContactName, AgentInvId, Maybe ContactId, Maybe GroupMemberId, Maybe GroupId, Int64) :. (AgentConnId, Int64, ContactName, Text, Maybe ImageData, Maybe ConnLinkContact) :. (Maybe XContactId, PQSupport, BoolInt, Maybe SharedMsgId, Maybe SharedMsgId, Maybe Preferences, UTCTime, UTCTime, VersionChat, VersionChat)
+type ContactRequestRow = (Int64, ContactName, AgentInvId, Maybe ContactId, Maybe GroupId, Int64) :. (AgentConnId, Int64, ContactName, Text, Maybe ImageData, Maybe ConnLinkContact) :. (Maybe XContactId, PQSupport, BoolInt, Maybe SharedMsgId, Maybe SharedMsgId, Maybe Preferences, UTCTime, UTCTime, VersionChat, VersionChat)
 
 toContactRequest :: ContactRequestRow -> UserContactRequest
-toContactRequest ((contactRequestId, localDisplayName, agentInvitationId, contactId_, groupMemberId_, businessGroupId_, userContactLinkId) :. (agentContactConnId, profileId, displayName, fullName, image, contactLink) :. (xContactId, pqSupport, BI accepted, welcomeSharedMsgId, requestSharedMsgId, preferences, createdAt, updatedAt, minVer, maxVer)) = do
+toContactRequest ((contactRequestId, localDisplayName, agentInvitationId, contactId_, businessGroupId_, userContactLinkId) :. (agentContactConnId, profileId, displayName, fullName, image, contactLink) :. (xContactId, pqSupport, BI accepted, welcomeSharedMsgId, requestSharedMsgId, preferences, createdAt, updatedAt, minVer, maxVer)) = do
   let profile = Profile {displayName, fullName, image, contactLink, preferences}
       cReqChatVRange = fromMaybe (versionToRange maxVer) $ safeVersionRange minVer maxVer
-   in UserContactRequest {contactRequestId, agentInvitationId, contactId_, groupMemberId_, businessGroupId_, userContactLinkId, agentContactConnId, cReqChatVRange, localDisplayName, profileId, profile, xContactId, pqSupport, accepted, welcomeSharedMsgId, requestSharedMsgId, createdAt, updatedAt}
+   in UserContactRequest {contactRequestId, agentInvitationId, contactId_, businessGroupId_, userContactLinkId, agentContactConnId, cReqChatVRange, localDisplayName, profileId, profile, xContactId, pqSupport, accepted, welcomeSharedMsgId, requestSharedMsgId, createdAt, updatedAt}
 
 userQuery :: Query
 userQuery =

src/Simplex/Chat/Types.hs

@@ -345,7 +345,6 @@ data UserContactRequest = UserContactRequest
   { contactRequestId :: Int64,
     agentInvitationId :: AgentInvId,
     contactId_ :: Maybe ContactId,
-    groupMemberId_ :: Maybe GroupMemberId,
     businessGroupId_ :: Maybe GroupId,
     userContactLinkId :: Int64,
     agentContactConnId :: AgentConnId, -- connection id of user contact
@@ -402,7 +401,6 @@ instance ToJSON ConnReqUriHash where
 data RequestEntity
   = REContact Contact
   | REBusinessChat GroupInfo GroupMember
-  | REGroupMember GroupInfo GroupMember
 
 type RepeatRequest = Bool