dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-08-28 07:34:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into group-knocking

Browse Source
This commit is contained in:
Evgeny Poberezkin
2025-04-25 07:54:13 +01:00
parent 18fa5dbf04 3625233931
commit 82be7d00fd
56 changed files with 1308 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simplex/Chat/Library/Commands.hs
+2 -2
View File
@@ -3235,9 +3235,9 @@ processChatCommand' vr = \case
hash :: ConnReqContact -> ConnReqUriHash
hash = ConnReqUriHash . C.sha256Hash . strEncode
getShortLinkConnReq :: User -> ConnShortLink m -> CM (ConnectionRequestUri m)
getShortLinkConnReq User {userId} l = do
getShortLinkConnReq user l = do
l' <- restoreShortLink' l
(cReq, cData) <- withAgent (\a -> getConnShortLink a userId l')
(cReq, cData) <- withAgent (\a -> getConnShortLink a (aUserId user) l')
case cData of
ContactLinkData {direct} | not direct -> throwChatError CEUnsupportedConnReq
_ -> pure ()
src/Simplex/Chat/Remote.hs
+2 -2
View File
@@ -75,11 +75,11 @@ remoteFilesFolder = "simplex_v1_files"
-- when acting as host
minRemoteCtrlVersion :: AppVersion
minRemoteCtrlVersion = AppVersion [6, 3, 0, 8]
minRemoteCtrlVersion = AppVersion [6, 3, 3, 1]
-- when acting as controller
minRemoteHostVersion :: AppVersion
minRemoteHostVersion = AppVersion [6, 3, 0, 8]
minRemoteHostVersion = AppVersion [6, 3, 3, 1]
currentAppVersion :: AppVersion
currentAppVersion = AppVersion SC.version