From 7f32ff2ead89cab9f9ec62b85d50dfe8a7fcbeca Mon Sep 17 00:00:00 2001 From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com> Date: Fri, 28 Feb 2025 16:51:44 +0400 Subject: [PATCH] comment --- src/Simplex/Chat/Library/Subscriber.hs | 16 +++++++--------- .../Store/SQLite/Migrations/chat_query_plans.txt | 4 ++++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/Simplex/Chat/Library/Subscriber.hs b/src/Simplex/Chat/Library/Subscriber.hs index 6f67bbfd5c..6338661130 100644 --- a/src/Simplex/Chat/Library/Subscriber.hs +++ b/src/Simplex/Chat/Library/Subscriber.hs @@ -594,13 +594,13 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage = ucl <- withStore $ \db -> getUserContactLinkById db userId userContactLinkId let (UserContactLink {autoAccept}, gli_) = ucl when (connChatVersion < batchSend2Version) $ sendAutoReply ct' autoAccept - -- TODO [knocking] legacy branch - do nothing? - forM_ gli_ $ \GroupLinkInfo {groupId, memberRole = gLinkMemRole, acceptance = _acceptance} -> do - groupInfo <- withStore $ \db -> getGroupInfo db vr user groupId - subMode <- chatReadVar subscriptionMode - groupConnIds <- createAgentConnectionAsync user CFCreateConnGrpInv True SCMInvitation subMode - gVar <- asks random - withStore $ \db -> createNewContactMemberAsync db gVar user groupInfo ct' gLinkMemRole groupConnIds connChatVersion peerChatVRange subMode + -- -- TODO [knocking] legacy branch - do nothing? + -- forM_ gli_ $ \GroupLinkInfo {groupId, memberRole = gLinkMemRole, acceptance = _acceptance} -> do + -- groupInfo <- withStore $ \db -> getGroupInfo db vr user groupId + -- subMode <- chatReadVar subscriptionMode + -- groupConnIds <- createAgentConnectionAsync user CFCreateConnGrpInv True SCMInvitation subMode + -- gVar <- asks random + -- withStore $ \db -> createNewContactMemberAsync db gVar user groupInfo ct' gLinkMemRole groupConnIds connChatVersion peerChatVRange subMode Just (gInfo, m@GroupMember {activeConn}) -> when (maybe False ((== ConnReady) . connStatus) activeConn) $ do notifyMemberConnected gInfo m $ Just ct @@ -1338,8 +1338,6 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage = | v < groupJoinRejectVersion -> messageWarning $ "processUserContactRequest (group " <> groupName' gInfo <> "): joining of " <> displayName <> " is blocked" | otherwise -> do - -- TODO [knocking] reject via agent api without creating reply queue; revert rejection changes: - -- TODO protocol (XGrpLinkReject), status (GSMemRejected), processing on CON, INFO mem <- acceptGroupJoinSendRejectAsync user gInfo cReq rjctReason toViewTE $ TERejectingGroupJoinRequestMember user gInfo mem rjctReason _ -> toView $ CRReceivedContactRequest user cReq diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt index 853a9c84a0..ab77856d05 100644 --- a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt +++ b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt @@ -5781,6 +5781,10 @@ Query: UPDATE group_members SET member_role = ? WHERE user_id = ? AND group_memb Plan: SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?) +Query: UPDATE group_members SET member_status='pending_approval' WHERE group_member_id = 1 +Plan: +SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?) + Query: UPDATE group_members SET member_status='pending_approval' WHERE group_member_id = 2 Plan: SEARCH group_members USING INTEGER PRIMARY KEY (rowid=?)