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

fix ok sizes in summary

Browse Source
This commit is contained in:
Alexander Bondarenko
2024-05-28 22:11:27 +03:00
parent 998907f107
commit b6cf81e680
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simplex/Chat.hs
+10 -6
View File
@@ -3411,9 +3411,10 @@ subscribeUserConnections vr onlyNeeded user = do
contactSubsToView :: Map ConnId AgentErrorType -> [ConnId] -> Map ConnId ContactRef -> Bool -> CM ()
contactSubsToView errs cts connRefs ce = ifM (asks $ coreApi . config) notifyAPI notifyCLI
where
conns = S.fromList cts
errConns = M.restrictKeys errs conns
notifyCLI = do
let errConns = M.restrictKeys errs (S.fromList cts)
toView CRConnectionSubSummary {user, okSubs = M.size errs - M.size errConns, errSubs = M.size errConns}
toView CRConnectionSubSummary {user, okSubs = S.size conns - M.size errConns, errSubs = M.size errConns}
when (ce && not (M.null errConns)) $ forM_ (M.assocs errConns) $ \(acId, err) ->
forM_ (M.lookup acId connRefs) $ \ContactRef {localDisplayName} ->
toView CRContactSubError {user, contactName = localDisplayName, chatError = ChatErrorAgent err Nothing}
@@ -3428,15 +3429,18 @@ subscribeUserConnections vr onlyNeeded user = do
e -> show e
contactLinkSubsToView :: Map ConnId AgentErrorType -> [ConnId] -> CM ()
contactLinkSubsToView errs ucConns = do
let errConns = M.restrictKeys errs (S.fromList ucConns)
toView CRConnectionSubSummary {user, okSubs = M.size errs - M.size errConns, errSubs = M.size errConns}
toView CRConnectionSubSummary {user, okSubs = S.size conns - M.size errConns, errSubs = M.size errConns}
where
conns = S.fromList ucConns
errConns = M.restrictKeys errs conns
groupSubsToView :: Map ConnId AgentErrorType -> [Group] -> [ConnId] -> Map ConnId ContactRef -> Bool -> CM ()
groupSubsToView errs gs ms connRefs ce = do
mapM_ groupSub $
sortOn (\(Group GroupInfo {localDisplayName = g} _) -> g) gs
toView CRConnectionSubSummary {user, okSubs = M.size errs - M.size errConns, errSubs = M.size errConns} -- XXX: add label?
toView CRConnectionSubSummary {user, okSubs = S.size conns - M.size errConns, errSubs = M.size errConns} -- XXX: add label?
where
errConns = M.restrictKeys errs (S.fromList ms)
conns = S.fromList ms
errConns = M.restrictKeys errs conns
groupSub :: Group -> CM ()
groupSub (Group g@GroupInfo {membership} members) = do
when ce $ mapM_ (toView . uncurry (CRMemberSubError user g) ) mErrors