Merge pull request #266 from simplex-chat/ep/fix-utf8-api

fix utf8 encoding for C API requests

src/Simplex/Chat.hs

@@ -34,7 +34,6 @@ import qualified Data.Map.Strict as M
 import Data.Maybe (isJust, mapMaybe)
 import Data.Text (Text)
 import qualified Data.Text as T
-import Data.Text.Encoding (encodeUtf8)
 import Data.Time.Clock (UTCTime, getCurrentTime)
 import Data.Time.LocalTime (getCurrentTimeZone)
 import Data.Word (Word32)
@@ -109,8 +108,8 @@ withLock lock =
     (void . atomically $ takeTMVar lock)
     (atomically $ putTMVar lock ())
 
-execChatCommand :: (MonadUnliftIO m, MonadReader ChatController m) => String -> m ChatResponse
-execChatCommand s = case parseAll chatCommandP . B.dropWhileEnd isSpace . encodeUtf8 $ T.pack s of
+execChatCommand :: (MonadUnliftIO m, MonadReader ChatController m) => ByteString -> m ChatResponse
+execChatCommand s = case parseAll chatCommandP $ B.dropWhileEnd isSpace s of
   Left e -> pure . CRChatError . ChatError $ CECommandError e
   Right cmd -> do
     ChatController {chatLock = l, smpAgent = a, currentUser} <- ask

src/Simplex/Chat/Mobile.hs

@@ -117,7 +117,7 @@ chatStart ChatStore {dbFilePrefix, chatStore} = do
   pure cc
 
 chatSendCmd :: ChatController -> String -> IO JSONString
-chatSendCmd cc s = LB.unpack . J.encode . APIResponse Nothing <$> runReaderT (execChatCommand s) cc
+chatSendCmd cc s = LB.unpack . J.encode . APIResponse Nothing <$> runReaderT (execChatCommand $ B.pack s) cc
 
 chatRecvMsg :: ChatController -> IO JSONString
 chatRecvMsg ChatController {outputQ} = json <$> atomically (readTBQueue outputQ)

src/Simplex/Chat/Terminal/Input.hs

@@ -9,6 +9,7 @@ import Control.Monad.IO.Unlift
 import Control.Monad.Reader
 import Data.List (dropWhileEnd)
 import qualified Data.Text as T
+import Data.Text.Encoding (encodeUtf8)
 import Simplex.Chat
 import Simplex.Chat.Controller
 import Simplex.Chat.Terminal.Output
@@ -29,7 +30,7 @@ runInputLoop ct = do
   q <- asks inputQ
   forever $ do
     s <- atomically $ readTBQueue q
-    r <- execChatCommand s
+    r <- execChatCommand . encodeUtf8 $ T.pack s
     liftIO . printToTerminal ct $ responseToView s r
 
 runTerminalInput :: (MonadUnliftIO m, MonadReader ChatController m) => ChatTerminal -> m ()