blade/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2024-12-17 17:20:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'stable' into stable-ios

Browse Source
This commit is contained in:
spaced4ndy
2023-07-31 15:27:17 +04:00
parent 5e1e6aed6b fff8935b94
commit 2ee528c81c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simplex/Chat/Messages.hs
+4 -2
View File
@@ -553,7 +553,8 @@ instance MsgDirectionI d => StrEncoding (CIFileStatus d) where
instance StrEncoding ACIFileStatus where
strEncode (AFS _ s) = strEncode s
strP =
statusP <|> (AFS SMDSnd . CIFSInvalid . safeDecodeUtf8 <$> A.takeByteString)
(statusP <* A.endOfInput) -- endOfInput to make it fail on partial correct parse
<|> (AFS SMDSnd . CIFSInvalid . safeDecodeUtf8 <$> A.takeByteString)
where
statusP =
A.takeTill (== ' ') >>= \case
@@ -669,7 +670,8 @@ instance MsgDirectionI d => StrEncoding (CIStatus d) where
instance StrEncoding ACIStatus where
strEncode (ACIStatus _ s) = strEncode s
strP =
statusP <|> (ACIStatus SMDSnd . CISInvalid . safeDecodeUtf8 <$> A.takeByteString)
(statusP <* A.endOfInput) -- endOfInput to make it fail on partial correct parse, e.g. "snd_rcvd ok complete"
<|> (ACIStatus SMDSnd . CISInvalid . safeDecodeUtf8 <$> A.takeByteString)
where
statusP =
A.takeTill (== ' ') >>= \case