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

core: don't filter out non active user connections on UP & DOWN agent events; use agent connection id instead of db connection id for ContactRef (#1807)

Browse Source
This commit is contained in:
JRoberts
2023-01-20 15:02:27 +04:00
committed by GitHub
parent 396b3ae639
commit ef15dca0b4
5 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simplex/Chat.hs
+5 -7
View File
@@ -1991,16 +1991,14 @@ expireChatItems user@User {userId} ttl sync = do
processAgentMessage :: forall m. ChatMonad m => ACorrId -> ConnId -> ACommand 'Agent -> m ()
processAgentMessage _ "" msg =
asks currentUser >>= readTVarIO >>= \case
Just user -> processAgentMessageNoConn user msg `catchError` (toView . CRChatError (Just user))
_ -> throwChatError CENoActiveUser
processAgentMessageNoConn msg `catchError` (toView . CRChatError Nothing)
processAgentMessage corrId connId msg =
withStore' (`getUserByAConnId` AgentConnId connId) >>= \case
Just user -> processAgentMessageConn user corrId connId msg `catchError` (toView . CRChatError (Just user))
_ -> throwChatError $ CENoConnectionUser (AgentConnId connId)
processAgentMessageNoConn :: forall m. ChatMonad m => User -> ACommand 'Agent -> m ()
processAgentMessageNoConn user@User {userId} = \case
processAgentMessageNoConn :: forall m. ChatMonad m => ACommand 'Agent -> m ()
processAgentMessageNoConn = \case
CONNECT p h -> hostEvent $ CRHostConnected p h
DISCONNECT p h -> hostEvent $ CRHostDisconnected p h
DOWN srv conns -> serverEvent srv conns CRContactsDisconnected "disconnected"
@@ -2010,8 +2008,8 @@ processAgentMessageNoConn user@User {userId} = \case
where
hostEvent = whenM (asks $ hostEvents . config) . toView
serverEvent srv@(SMPServer host _ _) conns event str = do
cs <- withStore' $ \db -> getConnectionsContacts db userId conns
toView $ event user srv cs
cs <- withStore' $ \db -> getConnectionsContacts db conns
toView $ event srv cs
showToast ("server " <> str) (safeDecodeUtf8 $ strEncode host)
processAgentMessageConn :: forall m. ChatMonad m => User -> ACorrId -> ConnId -> ACommand 'Agent -> m ()