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)

src/Simplex/Chat/Controller.hs

@@ -396,8 +396,8 @@ data ChatResponse
   | CRContactConnected {user :: User, contact :: Contact, userCustomProfile :: Maybe Profile}
   | CRContactAnotherClient {user :: User, contact :: Contact}
   | CRSubscriptionEnd {user :: User, connectionEntity :: ConnectionEntity}
-  | CRContactsDisconnected {user :: User, server :: SMPServer, contactRefs :: [ContactRef]}
-  | CRContactsSubscribed {user :: User, server :: SMPServer, contactRefs :: [ContactRef]}
+  | CRContactsDisconnected {server :: SMPServer, contactRefs :: [ContactRef]}
+  | CRContactsSubscribed {server :: SMPServer, contactRefs :: [ContactRef]}
   | CRContactSubError {contact :: Contact, chatError :: ChatError} -- TODO delete
   | CRContactSubSummary {user :: User, contactSubscriptions :: [ContactSubStatus]}
   | CRUserContactSubSummary {user :: User, userContactSubscriptions :: [UserContactSubStatus]}

src/Simplex/Chat/Store.hs

@@ -1715,8 +1715,8 @@ getConnectionById db User {userId} connId = ExceptT $ do
       |]
       (userId, connId)
 
-getConnectionsContacts :: DB.Connection -> UserId -> [ConnId] -> IO [ContactRef]
-getConnectionsContacts db userId agentConnIds = do
+getConnectionsContacts :: DB.Connection -> [ConnId] -> IO [ContactRef]
+getConnectionsContacts db agentConnIds = do
   DB.execute_ db "DROP TABLE IF EXISTS temp.conn_ids"
   DB.execute_ db "CREATE TABLE temp.conn_ids (conn_id BLOB)"
   DB.executeMany db "INSERT INTO temp.conn_ids (conn_id) VALUES (?)" $ map Only agentConnIds
@@ -1725,19 +1725,18 @@ getConnectionsContacts db userId agentConnIds = do
       <$> DB.query
         db
         [sql|
-          SELECT ct.contact_id, c.connection_id, ct.local_display_name
+          SELECT ct.contact_id, c.connection_id, c.agent_conn_id, ct.local_display_name
           FROM contacts ct
           JOIN connections c ON c.contact_id = ct.contact_id
-          WHERE ct.user_id = ?
-            AND c.agent_conn_id IN (SELECT conn_id FROM temp.conn_ids)
+          WHERE c.agent_conn_id IN (SELECT conn_id FROM temp.conn_ids)
             AND c.conn_type = ?
         |]
-        (userId, ConnContact)
+        (Only ConnContact)
   DB.execute_ db "DROP TABLE temp.conn_ids"
   pure conns
   where
-    toContactRef :: (ContactId, Int64, ContactName) -> ContactRef
-    toContactRef (contactId, connId, localDisplayName) = ContactRef {contactId, connId, localDisplayName}
+    toContactRef :: (ContactId, Int64, ConnId, ContactName) -> ContactRef
+    toContactRef (contactId, connId, acId, localDisplayName) = ContactRef {contactId, connId, agentConnId = AgentConnId acId, localDisplayName}
 
 getGroupAndMember :: DB.Connection -> User -> Int64 -> ExceptT StoreError IO (GroupInfo, GroupMember)
 getGroupAndMember db User {userId, userContactId} groupMemberId =

src/Simplex/Chat/Types.hs

@@ -173,6 +173,7 @@ contactSecurityCode Contact {activeConn} = connectionCode activeConn
 data ContactRef = ContactRef
   { contactId :: ContactId,
     connId :: Int64,
+    agentConnId :: AgentConnId,
     localDisplayName :: ContactName
   }
   deriving (Eq, Show, Generic)

src/Simplex/Chat/View.hs

@@ -152,8 +152,8 @@ responseToView user_ ChatConfig {logLevel, testView} liveItems ts = \case
   CRContactConnected u ct userCustomProfile -> ttyUser u $ viewContactConnected ct userCustomProfile testView
   CRContactAnotherClient u c -> ttyUser u [ttyContact' c <> ": contact is connected to another client"]
   CRSubscriptionEnd u acEntity -> ttyUser u [sShow (connId (entityConnection acEntity :: Connection)) <> ": END"]
-  CRContactsDisconnected u srv cs -> ttyUser u [plain $ "server disconnected " <> showSMPServer srv <> " (" <> contactList cs <> ")"]
-  CRContactsSubscribed u srv cs -> ttyUser u [plain $ "server connected " <> showSMPServer srv <> " (" <> contactList cs <> ")"]
+  CRContactsDisconnected srv cs -> [plain $ "server disconnected " <> showSMPServer srv <> " (" <> contactList cs <> ")"]
+  CRContactsSubscribed srv cs -> [plain $ "server connected " <> showSMPServer srv <> " (" <> contactList cs <> ")"]
   CRContactSubError c e -> [ttyContact' c <> ": contact error " <> sShow e]
   CRContactSubSummary u summary ->
     ttyUser u $ [sShow (length subscribed) <> " contacts connected (use " <> highlight' "/cs" <> " for the list)" | not (null subscribed)] <> viewErrorsSummary errors " contact errors"