dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-04-15 05:05:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

comment

Browse Source
This commit is contained in:
spaced4ndy
2025-02-28 16:51:44 +04:00
parent 3a6125d65b
commit 7f32ff2ead
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Simplex/Chat/Library/Subscriber.hs
View File

@@ -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

4
src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
View File

@@ -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=?)