From 9bc0c70fa0604a11f7f19d4b4415b0bb7414582c Mon Sep 17 00:00:00 2001
From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>
Date: Thu, 2 Apr 2026 15:22:44 +0000
Subject: [PATCH 1/3] agent: getConnLinkPrivKey (#1759)

---
 src/Simplex/Messaging/Agent.hs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/Simplex/Messaging/Agent.hs b/src/Simplex/Messaging/Agent.hs
index 0db47840b..982935bfc 100644
--- a/src/Simplex/Messaging/Agent.hs
+++ b/src/Simplex/Messaging/Agent.hs
@@ -64,6 +64,7 @@ module Simplex.Messaging.Agent
     setConnShortLink,
     deleteConnShortLink,
     getConnShortLink,
+    getConnLinkPrivKey,
     deleteLocalInvShortLink,
     changeConnectionUser,
     prepareConnectionToJoin,
@@ -428,6 +429,10 @@ getConnShortLink :: AgentClient -> NetworkRequestMode -> UserId -> ConnShortLink
 getConnShortLink c = withAgentEnv c .:. getConnShortLink' c
 {-# INLINE getConnShortLink #-}
 
+getConnLinkPrivKey :: AgentClient -> ConnId -> AE (Maybe C.PrivateKeyEd25519)
+getConnLinkPrivKey c = withAgentEnv c . getConnLinkPrivKey' c
+{-# INLINE getConnLinkPrivKey #-}
+
 -- | This irreversibly deletes short link data, and it won't be retrievable again
 deleteLocalInvShortLink :: AgentClient -> ConnShortLink 'CMInvitation -> AE ()
 deleteLocalInvShortLink c = withAgentEnv c . deleteLocalInvShortLink' c
@@ -1087,6 +1092,14 @@ deleteConnShortLink' c nm connId cMode =
       (RcvConnection _ rq, SCMInvitation) -> deleteQueueLink c nm rq
       _ -> throwE $ CMD PROHIBITED "deleteConnShortLink: not contact address"
 
+getConnLinkPrivKey' :: AgentClient -> ConnId -> AM (Maybe C.PrivateKeyEd25519)
+getConnLinkPrivKey' c connId = do
+  SomeConn _ conn <- withStore c (`getConn` connId)
+  pure $ case conn of
+    ContactConnection _ rq -> linkPrivSigKey <$> shortLink rq
+    RcvConnection _ rq -> linkPrivSigKey <$> shortLink rq
+    _ -> Nothing
+
 -- TODO [short links] remove 1-time invitation data and link ID from the server after the message is sent.
 getConnShortLink' :: forall c. AgentClient -> NetworkRequestMode -> UserId -> ConnShortLink c -> AM (FixedLinkData c, ConnLinkData c)
 getConnShortLink' c nm userId = \case

From b82cf7d001c2719dbe8e48e1c84dbbd9d485688d Mon Sep 17 00:00:00 2001
From: Evgeny <evgeny@poberezkin.com>
Date: Fri, 3 Apr 2026 10:47:52 +0100
Subject: [PATCH 2/3] xftp: remove page (#1761)

---
 apps/common/Web/static/index.html | 4 ++--
 apps/xftp-server/XFTPWeb.hs       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/common/Web/static/index.html b/apps/common/Web/static/index.html
index 10caed33a..a5b42313a 100644
--- a/apps/common/Web/static/index.html
+++ b/apps/common/Web/static/index.html
@@ -105,13 +105,13 @@
                     class="text-[16px] leading-[26px] tracking-[0.01em] nav-link-text text-black dark:text-white before:bg-black dark:before:bg-white">Server
                     information</span></a>
               </li>
-              <x-xftpConfig>
+              <!-- <x-xftpConfig>
               <li class="nav-link relative"><a href="/file"
                   class="flex items-center justify-between gap-2 lg:py-5 whitespace-nowrap"><span
                     class="text-[16px] leading-[26px] tracking-[0.01em] nav-link-text text-black dark:text-white before:bg-black dark:before:bg-white">File
                     transfer</span></a>
               </li>
-              </x-xftpConfig>
+              </x-xftpConfig> -->
             </ul><a target="_blank" href="https://github.com/simplex-chat/simplex-chat#help-us-with-donations"
               class="whitespace-nowrap flex items-center gap-1 self-center text-white dark:text-black text-[16px] font-medium tracking-[0.02em] rounded-[34px] bg-primary-light dark:bg-primary-dark py-3 lg:py-2 px-20 lg:px-5 mb-16 lg:mb-0">Donate</a>
           </div>
diff --git a/apps/xftp-server/XFTPWeb.hs b/apps/xftp-server/XFTPWeb.hs
index a3edb41f0..d0b450ece 100644
--- a/apps/xftp-server/XFTPWeb.hs
+++ b/apps/xftp-server/XFTPWeb.hs
@@ -31,8 +31,8 @@ xftpWebContent = $(embedDir "apps/xftp-server/static/xftp-web-bundle/")
 xftpMediaContent :: [(FilePath, ByteString)]
 xftpMediaContent = $(embedDir "apps/xftp-server/static/media/")
 
-xftpFilePageHtml :: ByteString
-xftpFilePageHtml = $(embedFile "apps/xftp-server/static/file.html")
+-- xftpFilePageHtml :: ByteString
+-- xftpFilePageHtml = $(embedFile "apps/xftp-server/static/file.html")
 
 xftpGenerateSite :: XFTPServerConfig -> Maybe ServerPublicInfo -> Maybe TransportHost -> FilePath -> IO ()
 xftpGenerateSite cfg info onionHost path = do
@@ -44,7 +44,7 @@ xftpGenerateSite cfg info onionHost path = do
   filePage xftpDir xftpWebContent
   filePage mediaDir xftpMediaContent
   createDirectoryIfMissing True fileDir
-  B.writeFile (fileDir </> "index.html") $ render xftpFilePageHtml substs
+  -- B.writeFile (fileDir </> "index.html") $ render xftpFilePageHtml substs
   where
     filePage dir content_ = do
       createDirectoryIfMissing True dir

From 97802a30fce1dfeea90f0b465e21fc8eca937abb Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <evgeny@poberezkin.com>
Date: Sat, 4 Apr 2026 17:28:23 +0100
Subject: [PATCH 3/3] 6.5.0.14

---
 simplexmq.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/simplexmq.cabal b/simplexmq.cabal
index 9caabc26b..ce1d5bfb6 100644
--- a/simplexmq.cabal
+++ b/simplexmq.cabal
@@ -1,7 +1,7 @@
 cabal-version: 1.12
 
 name:           simplexmq
-version:        6.5.0.12
+version:        6.5.0.14
 synopsis:       SimpleXMQ message broker
 description:    This package includes <./docs/Simplex-Messaging-Server.html server>,
                 <./docs/Simplex-Messaging-Client.html client> and