Merge branch 'master' into users

src/Simplex/Chat.hs

@@ -1209,6 +1209,9 @@ processChatCommand = \case
     quotedItemId <- withStore $ \db -> getGroupChatItemIdByText db user groupId cName (safeDecodeUtf8 quotedMsg)
     let mc = MCText $ safeDecodeUtf8 msg
     processChatCommand . APISendMessage (ChatRef CTGroup groupId) False $ ComposedMessage Nothing (Just quotedItemId) mc
+  LastChats count_ -> withUser' $ \user -> do
+    chats <- withStore' $ \db -> getChatPreviews db user False
+    pure $ CRChats $ maybe id take count_ chats
   LastMessages (Just chatName) count search -> withUser $ \user -> do
     chatRef <- getChatRef user chatName
     chatResp <- processChatCommand $ APIGetChat chatRef (CPLast count) search
@@ -3970,7 +3973,7 @@ chatCommandP =
       (">#" <|> "> #") *> (SendGroupMessageQuote <$> displayName <* A.space <*> pure Nothing <*> quotedMsg <*> A.takeByteString),
       (">#" <|> "> #") *> (SendGroupMessageQuote <$> displayName <* A.space <* char_ '@' <*> (Just <$> displayName) <* A.space <*> quotedMsg <*> A.takeByteString),
       "/_contacts " *> (APIListContacts <$> A.decimal),
-      ("/contacts" <|> "/cs") $> ListContacts,
+      "/contacts" $> ListContacts,
       "/_connect " *> (APIConnect <$> A.decimal <* A.space <*> ((Just <$> strP) <|> A.takeByteString $> Nothing)),
       "/_connect " *> (APIAddContact <$> A.decimal),
       ("/connect " <|> "/c ") *> (Connect <$> ((Just <$> strP) <|> A.takeByteString $> Nothing)),
@@ -3982,6 +3985,7 @@ chatCommandP =
       ("\\ " <|> "\\") *> (DeleteMessage <$> chatNameP <* A.space <*> A.takeByteString),
       ("! " <|> "!") *> (EditMessage <$> chatNameP <* A.space <*> (quotedMsg <|> pure "") <*> A.takeByteString),
       "/feed " *> (SendMessageBroadcast <$> A.takeByteString),
+      ("/chats" <|> "/cs") *> (LastChats <$> (" all" $> Nothing <|> Just <$> (A.space *> A.decimal <|> pure 20))),
       ("/tail" <|> "/t") *> (LastMessages <$> optional (A.space *> chatNameP) <*> msgCountP <*> pure Nothing),
       ("/search" <|> "/?") *> (LastMessages <$> optional (A.space *> chatNameP) <*> msgCountP <*> (Just <$> (A.space *> stringP))),
       "/last_item_id" *> (LastChatItemId <$> optional (A.space *> chatNameP) <*> (A.space *> A.decimal <|> pure 0)),

src/Simplex/Chat/Controller.hs

@@ -285,6 +285,7 @@ data ChatCommand
   | DeleteGroupLink GroupName
   | ShowGroupLink GroupName
   | SendGroupMessageQuote {groupName :: GroupName, contactName_ :: Maybe ContactName, quotedMsg :: ByteString, message :: ByteString}
+  | LastChats (Maybe Int) -- UserId (not used in UI)
   | LastMessages (Maybe ChatName) Int (Maybe String) -- UserId (not used in UI)
   | LastChatItemId (Maybe ChatName) Int -- UserId (not used in UI)
   | ShowChatItem (Maybe ChatItemId) -- UserId (not used in UI)
@@ -320,6 +321,7 @@ data ChatResponse
   | CRChatStopped
   | CRChatSuspended
   | CRApiChats {user :: User, chats :: [AChat]}
+  | CRChats {chats :: [AChat]}
   | CRApiChat {user :: User, chat :: AChat}
   | CRChatItems {user :: User, chatItems :: [AChatItem]}
   | CRChatItemId User (Maybe ChatItemId)

src/Simplex/Chat/Help.hs

@@ -87,7 +87,7 @@ chatHelpInfo =
       indent <> highlight "/help <topic>    " <> " - help on: " <> listHighlight ["messages", "files", "groups", "address", "settings"],
       indent <> highlight "/profile         " <> " - show / update user profile",
       indent <> highlight "/delete <contact>" <> " - delete contact and all messages with them",
-      indent <> highlight "/contacts        " <> " - list contacts",
+      indent <> highlight "/chats           " <> " - most recent chats",
       indent <> highlight "/markdown        " <> " - supported markdown syntax",
       indent <> highlight "/version         " <> " - SimpleX Chat version",
       indent <> highlight "/quit            " <> " - quit chat",
@@ -153,7 +153,11 @@ messagesHelpInfo :: [StyledString]
 messagesHelpInfo =
   map
     styleMarkdown
-    [ green "Show recent messages",
+    [ green "Show recent chats",
+      indent <> highlight "/chats [N]      " <> " - the most recent N conversations (20 by default)",
+      indent <> highlight "/chats all      " <> " - all conversations",
+      "",
+      green "Show recent messages",
       indent <> highlight "/tail @alice [N]" <> " - the last N messages with alice (10 by default)",
       indent <> highlight "/tail #team [N] " <> " - the last N messages in the group team",
       indent <> highlight "/tail [N]       " <> " - the last N messages in all chats",

src/Simplex/Chat/Styled.hs

@@ -1,5 +1,6 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE OverloadedStrings #-}
 
 module Simplex.Chat.Styled
   ( StyledString (..),
@@ -9,6 +10,7 @@ module Simplex.Chat.Styled
     unStyle,
     sLength,
     sShow,
+    sTake,
   )
 where
 
@@ -25,7 +27,7 @@ data StyledString = Styled [SGR] String | StyledString :<>: StyledString
 
 instance Semigroup StyledString where (<>) = (:<>:)
 
-instance Monoid StyledString where mempty = plain ""
+instance Monoid StyledString where mempty = ""
 
 instance IsString StyledString where fromString = plain
 
@@ -34,7 +36,7 @@ styleMarkdown (s1 :|: s2) = styleMarkdown s1 <> styleMarkdown s2
 styleMarkdown (Markdown f s) = styleFormat f s
 
 styleMarkdownList :: MarkdownList -> StyledString
-styleMarkdownList [] = plain ""
+styleMarkdownList [] = ""
 styleMarkdownList [FormattedText f s] = styleFormat f s
 styleMarkdownList (FormattedText f s : ts) = styleFormat f s <> styleMarkdownList ts
 
@@ -82,3 +84,15 @@ unStyle (s1 :<>: s2) = unStyle s1 <> unStyle s2
 sLength :: StyledString -> Int
 sLength (Styled _ s) = length s
 sLength (s1 :<>: s2) = sLength s1 + sLength s2
+
+sTake :: Int -> StyledString -> StyledString
+sTake n = go Nothing 0
+  where
+    go res len = \case
+      Styled f s ->
+        let s' = Styled f $ take (n - len) s
+         in maybe id (<>) res s'
+      s1 :<>: s2 ->
+        let s1' = go res len s1
+            len' = sLength s1'
+         in if len' >= n then s1' else go (Just s1') len' s2

src/Simplex/Chat/View.hs

@@ -65,6 +65,7 @@ responseToView user_ ChatConfig {logLevel, testView} liveItems ts = \case
   CRChatStopped -> ["chat stopped"]
   CRChatSuspended -> ["chat suspended"]
   CRApiChats u chats -> ttyUser u $ if testView then testViewChats chats else [plain . bshow $ J.encode chats]
+  CRChats chats -> viewChats ts chats
   CRApiChat u chat -> ttyUser u $ if testView then testViewChat chat else [plain . bshow $ J.encode chat]
   CRApiParsedMarkdown ft -> [plain . bshow $ J.encode ft]
   CRUserSMPServers u smpServers _ -> ttyUser u $ viewSMPServers (L.toList smpServers) testView
@@ -288,6 +289,20 @@ showSMPServer = B.unpack . strEncode . host
 viewHostEvent :: AProtocolType -> TransportHost -> String
 viewHostEvent p h = map toUpper (B.unpack $ strEncode p) <> " host " <> B.unpack (strEncode h)
 
+viewChats :: CurrentTime -> [AChat] -> [StyledString]
+viewChats ts = concatMap chatPreview . reverse
+  where
+    chatPreview (AChat _ (Chat chat items _)) = case items of
+      CChatItem _ ci : _ -> case viewChatItem chat ci True ts of
+        s : _ -> [let s' = sTake 120 s in if sLength s' < sLength s then s' <> "..." else s']
+        _ -> chatName
+      _ -> chatName
+      where
+        chatName = case chat of
+          DirectChat ct -> ["      " <> ttyToContact' ct]
+          GroupChat g -> ["      " <> ttyToGroup g]
+          _ -> []
+
 viewChatItem :: forall c d. MsgDirectionI d => ChatInfo c -> ChatItem c d -> Bool -> CurrentTime -> [StyledString]
 viewChatItem chat ChatItem {chatDir, meta = meta@CIMeta {itemDeleted}, content, quotedItem, file} doShow ts =
   withItemDeleted <$> case chat of