dandri/simplexmq
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplexmq.git synced 2026-04-03 02:45:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix encoding

Browse Source
This commit is contained in:
Alexander Bondarenko
2024-04-18 17:22:18 +03:00
committed by Evgeny Poberezkin
parent daece6b736
commit 47c1b93dc9
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Simplex/Messaging/Encoding/String.hs
View File

@@ -32,6 +32,7 @@ import qualified Data.List.NonEmpty as L
import Data.Set (Set)
import qualified Data.Set as S
import Data.Text (Text)
import qualified Data.Text as T
import Data.Text.Encoding (decodeLatin1, encodeUtf8)
import Data.Time.Clock (UTCTime)
import Data.Time.Clock.System (SystemTime (..))
@@ -39,7 +40,7 @@ import Data.Time.Format.ISO8601
import Data.Word (Word16, Word32)
import Simplex.Messaging.Encoding
import Simplex.Messaging.Parsers (parseAll)
import Simplex.Messaging.Util ((<$?>))
import Simplex.Messaging.Util (safeDecodeUtf8, (<$?>))
class TextEncoding a where
textEncode :: a -> Text
@@ -75,9 +76,10 @@ instance StrEncoding Str where
strEncode = unStr
strP = Str <$> A.takeTill (== ' ') <* optional A.space
-- inherited from ByteString, the parser only allows non-empty strings
instance StrEncoding String where
strEncode = strEncode . B.pack
strP = B.unpack <$> strP
strEncode = strEncode . encodeUtf8 . T.pack
strP = T.unpack . safeDecodeUtf8 <$> strP
instance ToJSON Str where
toJSON (Str s) = strToJSON s