From 351cfcbcbc1485b5bd65b1b2235f0b0bc4a1f416 Mon Sep 17 00:00:00 2001
From: Evgeny <evgeny@poberezkin.com>
Date: Sun, 8 Sep 2024 20:02:38 +0100
Subject: [PATCH] core: allow deleting user when user record in agent database
 was deleted (#4851)

---
 apps/simplex-chat/Server.hs | 4 ++--
 cabal.project               | 2 +-
 scripts/nix/sha256map.nix   | 2 +-
 src/Simplex/Chat.hs         | 5 ++++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/simplex-chat/Server.hs b/apps/simplex-chat/Server.hs
index 58a167e4f5..5351565946 100644
--- a/apps/simplex-chat/Server.hs
+++ b/apps/simplex-chat/Server.hs
@@ -23,7 +23,7 @@ import Simplex.Chat
 import Simplex.Chat.Controller
 import Simplex.Chat.Core
 import Simplex.Chat.Options
-import Simplex.Messaging.Transport.Server (runTCPServer)
+import Simplex.Messaging.Transport.Server (runLocalTCPServer)
 import Simplex.Messaging.Util (raceAny_)
 import UnliftIO.Exception
 import UnliftIO.STM
@@ -68,7 +68,7 @@ newChatServerClient qSize = do
 runChatServer :: ChatServerConfig -> ChatController -> IO ()
 runChatServer ChatServerConfig {chatPort, clientQSize} cc = do
   started <- newEmptyTMVarIO
-  runTCPServer started chatPort $ \sock -> do
+  runLocalTCPServer started chatPort $ \sock -> do
     ws <- liftIO $ getConnection sock
     c <- atomically $ newChatServerClient clientQSize
     putStrLn "client connected"
diff --git a/cabal.project b/cabal.project
index d7f6b67eb1..26a25613d6 100644
--- a/cabal.project
+++ b/cabal.project
@@ -12,7 +12,7 @@ constraints: zip +disable-bzip2 +disable-zstd
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/simplexmq.git
-    tag: d559a66145cf7b4cd367c09974ed1ce8393940b2
+    tag: 344a295845ceea6a8a926e3f4c10fe79bcf05abe
 
 source-repository-package
     type: git
diff --git a/scripts/nix/sha256map.nix b/scripts/nix/sha256map.nix
index 0f6592086f..5b16072588 100644
--- a/scripts/nix/sha256map.nix
+++ b/scripts/nix/sha256map.nix
@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."d559a66145cf7b4cd367c09974ed1ce8393940b2" = "1jav7jmriims6vlkxg8gmal03f9mbgrwc8v6g0rp95ivkx8gfjyw";
+  "https://github.com/simplex-chat/simplexmq.git"."344a295845ceea6a8a926e3f4c10fe79bcf05abe" = "13l8qmzx0bfvs089hb68x25nfh5v0ik0gq1iyv3y3qnffw8601cf";
   "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
   "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
   "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";
diff --git a/src/Simplex/Chat.hs b/src/Simplex/Chat.hs
index cfc9f0dc97..1b4227eb39 100644
--- a/src/Simplex/Chat.hs
+++ b/src/Simplex/Chat.hs
@@ -2763,7 +2763,10 @@ processChatCommand' vr = \case
       filesInfo <- withFastStore' (`getUserFileInfo` user)
       cancelFilesInProgress user filesInfo
       deleteFilesLocally filesInfo
-      withAgent $ \a -> deleteUser a (aUserId user) delSMPQueues
+      withAgent (\a -> deleteUser a (aUserId user) delSMPQueues)
+        `catchChatError` \case
+          e@(ChatErrorAgent NO_USER _) -> toView $ CRChatError (Just user) e
+          e -> throwError e
       withFastStore' (`deleteUserRecord` user)
       when (activeUser user) $ chatWriteVar currentUser Nothing
       ok_