fix bg conns

This commit is contained in:
Alexander Bondarenko
2024-05-29 22:25:55 +03:00
parent f21b5af568
commit a126215c8c
2 changed files with 6 additions and 8 deletions
+1 -1
View File
@@ -3343,7 +3343,7 @@ subscribeUserConnections vr onlyNeeded user = do
let (ctConns, ucs, mConns, sfts, rfts, pcConns) = foldl' addEntity ([], M.empty, [], M.empty, M.empty, []) entities
pure (conns, ctConns, ucs, [], mConns, sfts, rfts, pcConns)
else do
withStore' unsetConnectionToSubscribe
withStore' (`unsetConnectionToSubscribe` user)
ctConns <- getContactConns
(ucConns, ucs) <- getUserContactLinkConns
(gs, mConns) <- getGroupMemberConns
+5 -7
View File
@@ -213,12 +213,10 @@ getContactConnEntityByConnReqHash db vr user@User {userId} (cReqHash1, cReqHash2
getConnectionsToSubscribe :: DB.Connection -> VersionRangeChat -> User -> IO ([ConnId], [ConnectionEntity])
getConnectionsToSubscribe db vr user@User {userId} = do
aConnIds <- map fromOnly <$> DB.query db "SELECT agent_conn_id FROM connections WHERE c.user_id = ? AND to_subscribe = 1" (Only userId)
unsetConnectionToSubscribe db
entities <- forM aConnIds $ \acId -> eitherToMaybe <$> runExceptT (getConnectionEntity db vr user acId)
unsetConnectionToSubscribe db
let connIds = map (\(AgentConnId connId) -> connId) aConnIds
connIds <- map fromOnly <$> DB.query db "SELECT agent_conn_id FROM connections WHERE user_id = ? AND to_subscribe = 1" (Only userId)
unsetConnectionToSubscribe db user
entities <- forM connIds $ fmap eitherToMaybe . runExceptT . getConnectionEntity db vr user . AgentConnId
pure (connIds, catMaybes entities)
unsetConnectionToSubscribe :: DB.Connection -> IO ()
unsetConnectionToSubscribe db = DB.execute_ db "UPDATE connections SET to_subscribe = 0 WHERE to_subscribe = 1"
unsetConnectionToSubscribe :: DB.Connection -> User -> IO ()
unsetConnectionToSubscribe db User {userId} = DB.execute db "UPDATE connections SET to_subscribe = 0 WHERE user_id = ? AND to_subscribe = 1" (Only userId)