ios: fix auto-closing support chat for invitee when accepted; core: add accepted item to main scope (#5916)

This commit is contained in:
spaced4ndy authored and GitHub committed 2025-05-15 16:05:18 +00:00
1 parent 409d7e8532
commit a8da7c1c44
2 files changed
+4 -4

No files matched your search

-1
View File
@@ -2294,7 +2294,6 @@ func processReceivedMsg(_ res: ChatEvent) async {
case .memberSupport(nil) = m.secondaryIM?.groupScopeInfo {
await MainActor.run {
m.secondaryPendingInviteeChatOpened = false
m.secondaryIM = nil
}
}
}
+4 -3
View File
@@ -2121,10 +2121,11 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
processUserAccepted = case acceptance of
GAAccepted -> do
membership' <- withStore' $ \db -> updateGroupMemberAccepted db user membership GSMemConnected role
-- create item in both scopes
let gInfo' = gInfo {membership = membership'}
scopeInfo = Just $ GCSIMemberSupport {groupMember_ = Nothing}
(ci, cInfo) <- saveRcvChatItemNoParse user (CDGroupRcv gInfo' scopeInfo m) msg brokerTs (CIRcvGroupEvent RGEUserAccepted)
groupMsgToView cInfo ci
createInternalChatItem user (CDGroupRcv gInfo' Nothing m) (CIRcvGroupEvent RGEUserAccepted) Nothing
let scopeInfo = Just $ GCSIMemberSupport {groupMember_ = Nothing}
createInternalChatItem user (CDGroupRcv gInfo' scopeInfo m) (CIRcvGroupEvent RGEUserAccepted) Nothing
toView $ CEvtUserJoinedGroup user gInfo' m
let cd = CDGroupRcv gInfo' Nothing m
createInternalChatItem user cd (CIRcvGroupE2EEInfo E2EInfo {pqEnabled = PQEncOff}) Nothing