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

combine transactions (build fails, names need to be merged first)

Browse Source
This commit is contained in:
Evgeny Poberezkin
2026-07-02 08:06:22 +01:00
parent 5fde232e46
commit fefe18c141
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simplex/Chat/Library/Internal.hs
+6 -4
View File
@@ -985,10 +985,11 @@ acceptGroupJoinRequestAsync
subMode <- chatReadVar subscriptionMode
let chatV = vr cxt `peerConnChatVersion` cReqChatVRange
(cmdId, acId) <- prepareAgentAccept user True cReqInvId PQSupportOff
withStore $ \db ->
m <- withStore $ \db -> do
liftIO $ createJoiningMemberConnection db user uclId (cmdId, acId) chatV cReqChatVRange groupMemberId subMode
getGroupMemberById db vr user groupMemberId
agentAcceptContactAsync user cmdId acId True cReqInvId msg PQSupportOff chatV subMode
withStore $ \db -> getGroupMemberById db vr user groupMemberId
pure m
acceptGroupJoinSendRejectAsync :: User -> Int64 -> GroupInfo -> InvitationId -> VersionRangeChat -> Profile -> Maybe XContactId -> GroupRejectionReason -> CM GroupMember
acceptGroupJoinSendRejectAsync
@@ -1016,10 +1017,11 @@ acceptGroupJoinSendRejectAsync
subMode <- chatReadVar subscriptionMode
let chatV = vr cxt `peerConnChatVersion` cReqChatVRange
(cmdId, acId) <- prepareAgentAccept user False cReqInvId PQSupportOff
withStore $ \db ->
m <- withStore $ \db -> do
liftIO $ createJoiningMemberConnection db user uclId (cmdId, acId) chatV cReqChatVRange groupMemberId subMode
getGroupMemberById db vr user groupMemberId
agentAcceptContactAsync user cmdId acId False cReqInvId msg PQSupportOff chatV subMode
withStore $ \db -> getGroupMemberById db vr user groupMemberId
pure m
acceptBusinessJoinRequestAsync :: User -> Int64 -> GroupInfo -> GroupMember -> UserContactRequest -> CM (GroupInfo, GroupMember)
acceptBusinessJoinRequestAsync