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

possibly fix builder for single msg

Browse Source
This commit is contained in:
spaced4ndy
2023-12-20 22:15:37 +04:00
parent c350aa0ae4
commit 396b4d2b2c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simplex/Chat.hs
+7 -6
View File
@@ -5665,9 +5665,14 @@ batchChatMessages = reverse . mkBatch []
| len' <= maxSize' =
case L.nonEmpty msgs_ of
Just msgs' -> encodeBatch builder' len' cnt' batchedMsgs' msgs'
Nothing -> (CMBMessages $ MessagesBatch (completeBuilder builder') (reverse batchedMsgs'), Nothing)
Nothing -> (CMBMessages $ MessagesBatch completeBuilder (reverse batchedMsgs'), Nothing)
where
completeBuilder
| cnt' == 1 = builder'
| otherwise = builder' <> "]"
| cnt' == 1 = (CMBLargeMessage msg, L.nonEmpty msgs_)
| otherwise = (CMBMessages $ MessagesBatch (completeBuilder builder) (reverse batchedMsgs), Just remainingMsgs)
| cnt' == 2 = (CMBMessages $ MessagesBatch builder (reverse batchedMsgs), Just remainingMsgs)
| otherwise = (CMBMessages $ MessagesBatch (builder <> "]") (reverse batchedMsgs), Just remainingMsgs)
where
SndMessage {msgBody} = msg
cnt' = cnt + 1
@@ -5679,10 +5684,6 @@ batchChatMessages = reverse . mkBatch []
| cnt' == 1 = Builder.lazyByteString msgBody
| cnt' == 2 = "[" <> builder <> "," <> Builder.lazyByteString msgBody
| otherwise = builder <> "," <> Builder.lazyByteString msgBody
-- TODO test, probably need different functions for a case when only a single message fits into batch
completeBuilder bldr
| cnt' == 1 = bldr
| otherwise = bldr <> "]"
maxSize'
| cnt' == 1 = maxChatMsgSize
| otherwise = maxChatMsgSize - 1 -- for closing bracket "]"