test chat items (#285)

src/Simplex/Chat.hs

@@ -79,7 +79,8 @@ defaultChatConfig =
       dbPoolSize = 1,
       yesToMigrations = False,
       tbqSize = 16,
-      fileChunkSize = 15780
+      fileChunkSize = 15780,
+      testView = False
     }
 
 logCfg :: LogConfig

src/Simplex/Chat/Controller.hs

@@ -49,7 +49,8 @@ data ChatConfig = ChatConfig
     dbPoolSize :: Int,
     yesToMigrations :: Bool,
     tbqSize :: Natural,
-    fileChunkSize :: Integer
+    fileChunkSize :: Integer,
+    testView :: Bool
   }
 
 data ActiveTo = ActiveNone | ActiveC ContactName | ActiveG GroupName

src/Simplex/Chat/Mobile.hs

@@ -70,7 +70,7 @@ chatInit dbFilePrefix = do
   let f = chatStoreFile dbFilePrefix
   chatStore <- createStore f (dbPoolSize defaultMobileConfig) (yesToMigrations defaultMobileConfig)
   user_ <- getActiveUser_ chatStore
-  newChatController chatStore user_ defaultMobileConfig mobileChatOpts {dbFilePrefix} . const $ pure ()
+  newChatController chatStore user_ defaultMobileConfig mobileChatOpts {dbFilePrefix} (const $ pure ())
 
 chatSendCmd :: ChatController -> String -> IO JSONString
 chatSendCmd cc s = LB.unpack . J.encode . APIResponse Nothing <$> runReaderT (execChatCommand $ B.pack s) cc

src/Simplex/Chat/Store.hs

@@ -2050,13 +2050,13 @@ getDirectChatPreviews_ db User {userId} = do
         JOIN contact_profiles cp ON ct.contact_profile_id = cp.contact_profile_id
         JOIN connections c ON c.contact_id = ct.contact_id
         LEFT JOIN (
-          SELECT contact_id, MAX(item_ts) AS MaxDate
+          SELECT contact_id, MAX(chat_item_id) AS MaxId
           FROM chat_items
           WHERE item_deleted != 1
           GROUP BY contact_id
-        ) CIMaxDates ON CIMaxDates.contact_id = ct.contact_id
-        LEFT JOIN chat_items ci ON ci.contact_id = CIMaxDates.contact_id
-                               AND ci.item_ts = CIMaxDates.MaxDate
+        ) MaxIds ON MaxIds.contact_id = ct.contact_id
+        LEFT JOIN chat_items ci ON ci.contact_id = MaxIds.contact_id
+                               AND ci.chat_item_id = MaxIds.MaxId
         LEFT JOIN (
           SELECT contact_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
           FROM chat_items
@@ -2113,13 +2113,13 @@ getGroupChatPreviews_ db User {userId, userContactId} = do
         JOIN group_members mu ON mu.group_id = g.group_id
         JOIN contact_profiles pu ON pu.contact_profile_id = mu.contact_profile_id
         LEFT JOIN (
-          SELECT group_id, MAX(item_ts) AS MaxDate
+          SELECT group_id, MAX(chat_item_id) AS MaxId
           FROM chat_items
           WHERE item_deleted != 1
           GROUP BY group_id
-        ) GIMaxDates ON GIMaxDates.group_id = g.group_id
-        LEFT JOIN chat_items ci ON ci.group_id = GIMaxDates.group_id
-                               AND ci.item_ts = GIMaxDates.MaxDate
+        ) MaxIds ON MaxIds.group_id = g.group_id
+        LEFT JOIN chat_items ci ON ci.group_id = MaxIds.group_id
+                               AND ci.chat_item_id = MaxIds.MaxId
         LEFT JOIN (
           SELECT group_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
           FROM chat_items

src/Simplex/Chat/Terminal/Input.hs

@@ -29,7 +29,8 @@ runInputLoop :: ChatTerminal -> ChatController -> IO ()
 runInputLoop ct cc = forever $ do
   s <- atomically . readTBQueue $ inputQ cc
   r <- runReaderT (execChatCommand . encodeUtf8 $ T.pack s) cc
-  printToTerminal ct $ responseToView s r
+  let testV = testView $ config cc
+  printToTerminal ct $ responseToView s testV r
 
 runTerminalInput :: ChatTerminal -> ChatController -> IO ()
 runTerminalInput ct cc = withChatTerm ct $ do

src/Simplex/Chat/Terminal/Output.hs

@@ -73,9 +73,10 @@ withTermLock ChatTerminal {termLock} action = do
   atomically $ putTMVar termLock ()
 
 runTerminalOutput :: ChatTerminal -> ChatController -> IO ()
-runTerminalOutput ct cc =
+runTerminalOutput ct cc = do
+  let testV = testView $ config cc
   forever $
-    atomically (readTBQueue $ outputQ cc) >>= printToTerminal ct . responseToView "" . snd
+    atomically (readTBQueue $ outputQ cc) >>= printToTerminal ct . responseToView "" testV . snd
 
 printToTerminal :: ChatTerminal -> [StyledString] -> IO ()
 printToTerminal ct s =

src/Simplex/Chat/View.hs

@@ -19,7 +19,7 @@ import Numeric (showFFloat)
 import Simplex.Chat.Controller
 import Simplex.Chat.Help
 import Simplex.Chat.Markdown
-import Simplex.Chat.Messages
+import Simplex.Chat.Messages hiding (NewChatItem (..))
 import Simplex.Chat.Protocol
 import Simplex.Chat.Store (StoreError (..))
 import Simplex.Chat.Styled
@@ -30,14 +30,14 @@ import qualified Simplex.Messaging.Protocol as SMP
 import System.Console.ANSI.Types
 
 serializeChatResponse :: ChatResponse -> String
-serializeChatResponse = unlines . map unStyle . responseToView ""
+serializeChatResponse = unlines . map unStyle . responseToView "" False
 
-responseToView :: String -> ChatResponse -> [StyledString]
-responseToView cmd = \case
+responseToView :: String -> Bool -> ChatResponse -> [StyledString]
+responseToView cmd testView = \case
   CRActiveUser User {profile} -> r $ viewUserProfile profile
   CRChatStarted -> r ["chat started"]
-  CRApiChats chats -> r [sShow chats]
-  CRApiChat chat -> r [sShow chat]
+  CRApiChats chats -> r $ if testView then testViewChats chats else [sShow chats]
+  CRApiChat chat -> r $ if testView then testViewChat chat else [sShow chat]
   CRNewChatItem (AChatItem _ _ chat item) -> viewChatItem chat item
   CRChatItemUpdated _ -> []
   CRMsgIntegrityError mErr -> viewMsgIntegrityError mErr
@@ -124,6 +124,21 @@ responseToView cmd = \case
     -- this function should be `r` for "synchronous", `id` for "asynchronous" command responses
     -- r' = id
     r' = r
+    testViewChats :: [AChat] -> [StyledString]
+    testViewChats chats = [sShow $ map toChatView chats]
+      where
+        toChatView :: AChat -> (Text, Text)
+        toChatView (AChat _ (Chat (DirectChat Contact {localDisplayName}) items _)) = ("@" <> localDisplayName, toCIPreview items)
+        toChatView (AChat _ (Chat (GroupChat GroupInfo {localDisplayName}) items _)) = ("#" <> localDisplayName, toCIPreview items)
+        toChatView (AChat _ (Chat (ContactRequest UserContactRequest {localDisplayName}) items _)) = ("<@" <> localDisplayName, toCIPreview items)
+        toCIPreview :: [CChatItem c] -> Text
+        toCIPreview ((CChatItem _ ChatItem {meta}) : _) = itemText meta
+        toCIPreview _ = ""
+    testViewChat :: AChat -> [StyledString]
+    testViewChat (AChat _ Chat {chatItems}) = [sShow $ map toChatView chatItems]
+      where
+        toChatView :: CChatItem c -> (Int, Text)
+        toChatView (CChatItem dir ChatItem {meta}) = (msgDirectionInt $ toMsgDirection dir, itemText meta)
 
 viewChatItem :: ChatInfo c -> ChatItem c d -> [StyledString]
 viewChatItem chat (ChatItem cd meta content) = case (chat, cd) of