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

core: fix group being displayed as connecting after join (#5908)

Browse Source
This commit is contained in:
spaced4ndy
2025-05-14 11:25:24 +00:00
committed by GitHub
parent e1ab178fe6
commit d3bc22726a
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simplex/Chat/Library/Subscriber.hs
+13 -11
View File
@@ -769,20 +769,22 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
withAgent $ \a -> toggleConnectionNtfs a (aConnId conn) $ chatHasNtfs chatSettings
case memberCategory m of
GCHostMember -> do
(mStatus, membershipStatus) <- withStore' $ \db -> do
(m', gInfo') <- withStore' $ \db -> do
updateGroupMemberStatus db userId m GSMemConnected
membershipStatus <-
gInfo' <-
if not (memberPending membership)
then updateGroupMemberStatus db userId membership GSMemConnected $> GSMemConnected
else pure $ memberStatus membership
pure (GSMemConnected, membershipStatus)
toView $ CEvtUserJoinedGroup user gInfo {membership = membership {memberStatus = membershipStatus}} m {memberStatus = mStatus}
(gInfo', m', scopeInfo) <- mkGroupChatScope gInfo m
let cd = CDGroupRcv gInfo' scopeInfo m'
then do
updateGroupMemberStatus db userId membership GSMemConnected
pure gInfo {membership = membership {memberStatus = GSMemConnected}}
else pure gInfo
pure (m {memberStatus = GSMemConnected}, gInfo')
toView $ CEvtUserJoinedGroup user gInfo' m'
(gInfo'', m'', scopeInfo) <- mkGroupChatScope gInfo' m'
let cd = CDGroupRcv gInfo'' scopeInfo m''
createInternalChatItem user cd (CIRcvGroupE2EEInfo E2EInfo {pqEnabled = PQEncOff}) Nothing
createGroupFeatureItems user cd CIRcvGroupFeature gInfo'
memberConnectedChatItem gInfo' scopeInfo m'
unless (memberPending membership) $ maybeCreateGroupDescrLocal gInfo' m'
createGroupFeatureItems user cd CIRcvGroupFeature gInfo''
memberConnectedChatItem gInfo'' scopeInfo m''
unless (memberPending membership) $ maybeCreateGroupDescrLocal gInfo'' m''
GCInviteeMember -> do
(gInfo', mStatus) <-
if not (memberPending m)