dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-05-28 13:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: update simplexmq (remove protocol encodings) (#4272)

Browse Source 
* core: update simplexmq (remove protocol encodings)

* nix

* update simplexmq

* update simplexmq
This commit is contained in:
Evgeny Poberezkin
2024-06-05 17:49:01 +01:00
committed by GitHub
parent cf2eb76cb7
commit f578ee843b
6 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simplex/Chat/Types.hs
+3 -3
View File
@@ -47,7 +47,7 @@ import Simplex.Chat.Types.Shared
import Simplex.Chat.Types.UITheme
import Simplex.Chat.Types.Util
import Simplex.FileTransfer.Description (FileDigest)
import Simplex.Messaging.Agent.Protocol (ACommandTag (..), ACorrId, AParty (..), APartyCmdTag (..), ConnId, ConnectionMode (..), ConnectionRequestUri, InvitationId, RcvFileId, SAEntity (..), SndFileId, UserId)
import Simplex.Messaging.Agent.Protocol (ACorrId, AEventTag (..), AEvtTag (..), ConnId, ConnectionMode (..), ConnectionRequestUri, InvitationId, RcvFileId, SAEntity (..), SndFileId, UserId)
import Simplex.Messaging.Crypto.File (CryptoFileArgs (..))
import Simplex.Messaging.Crypto.Ratchet (PQEncryption (..), PQSupport, pattern PQEncOff)
import Simplex.Messaging.Encoding.String
@@ -1582,7 +1582,7 @@ instance TextEncoding CommandFunction where
CFAckMessage -> "ack_message"
CFDeleteConn -> "delete_conn"
commandExpectedResponse :: CommandFunction -> APartyCmdTag 'Agent
commandExpectedResponse :: CommandFunction -> AEvtTag
commandExpectedResponse = \case
CFCreateConnGrpMemInv -> t INV_
CFCreateConnGrpInv -> t INV_
@@ -1594,7 +1594,7 @@ commandExpectedResponse = \case
CFAckMessage -> t OK_
CFDeleteConn -> t OK_
where
t = APCT SAEConn
t = AEvtTag SAEConn
data CommandData = CommandData
{ cmdId :: CommandId,
src/Simplex/Chat/View.hs
+2 -2
View File
@@ -65,7 +65,7 @@ import Simplex.Messaging.Parsers (dropPrefix, taggedObjectJSON)
import Simplex.Messaging.Protocol (AProtoServerWithAuth (..), AProtocolType, ProtoServerWithAuth, ProtocolServer (..), ProtocolTypeI, SProtocolType (..))
import qualified Simplex.Messaging.Protocol as SMP
import Simplex.Messaging.Transport.Client (TransportHost (..))
import Simplex.Messaging.Util (bshow, safeDecodeUtf8, tshow)
import Simplex.Messaging.Util (safeDecodeUtf8, tshow)
import Simplex.Messaging.Version hiding (version)
import Simplex.RemoteControl.Types (RCCtrlAddress (..))
import System.Console.ANSI.Types
@@ -1194,7 +1194,7 @@ viewServerTestResult (AProtoServerWithAuth p _) = \case
<> [pName <> " server requires authorization to upload files, check password" | testStep == TSCreateFile && (case testError of XFTP _ XFTP.AUTH -> True; _ -> False)]
<> ["Possibly, certificate fingerprint in " <> pName <> " server address is incorrect" | testStep == TSConnect && brokerErr]
where
result = [pName <> " server test failed at " <> plain (drop 2 $ show testStep) <> ", error: " <> plain (strEncode testError)]
result = [pName <> " server test failed at " <> plain (drop 2 $ show testStep) <> ", error: " <> sShow testError]
brokerErr = case testError of
BROKER _ NETWORK -> True
_ -> False