Merge branch 'master' into f/batch-send

tests/ChatClient.hs

@@ -275,8 +275,8 @@ getTermLine cc =
   5000000 `timeout` atomically (readTQueue $ termQ cc) >>= \case
     Just s -> do
       -- remove condition to always echo virtual terminal
+      -- when True $ do
       when (printOutput cc) $ do
-        -- when True $ do
         name <- userName cc
         putStrLn $ name <> ": " <> s
       pure s

tests/ChatTests.hs

@@ -1,5 +1,6 @@
 module ChatTests where
 
+import ChatTests.ChatList
 import ChatTests.Direct
 import ChatTests.Files
 import ChatTests.Groups
@@ -12,3 +13,4 @@ chatTests = do
   describe "group tests" chatGroupTests
   describe "file tests" chatFileTests
   describe "profile tests" chatProfileTests
+  describe "chat list pagination tests" chatListTests

tests/ChatTests/ChatList.hs

@@ -0,0 +1,227 @@
+module ChatTests.ChatList where
+
+import ChatClient
+import ChatTests.Utils
+import Data.Time.Clock (getCurrentTime)
+import Data.Time.Format.ISO8601 (iso8601Show)
+import Test.Hspec
+
+chatListTests :: SpecWith FilePath
+chatListTests = do
+  it "get last chats" testPaginationLast
+  it "get chats before/after timestamp" testPaginationTs
+  it "filter by search query" testFilterSearch
+  it "filter favorite" testFilterFavorite
+  it "filter unread" testFilterUnread
+  it "filter favorite or unread" testFilterFavoriteOrUnread
+  it "sort and filter chats of all types" testPaginationAllChatTypes
+
+testPaginationLast :: HasCallStack => FilePath -> IO ()
+testPaginationLast =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      connectUsers alice bob
+      alice <##> bob
+      connectUsers alice cath
+      cath <##> alice
+
+      alice ##> "/chats 0"
+      alice ##> "/chats 1"
+      alice <# "@cath hey"
+      alice ##> "/chats 2"
+      alice <# "bob> hey"
+      alice <# "@cath hey"
+
+testPaginationTs :: HasCallStack => FilePath -> IO ()
+testPaginationTs =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      tsStart <- iso8601Show <$> getCurrentTime
+      connectUsers alice bob
+      alice <##> bob
+      tsAliceBob <- iso8601Show <$> getCurrentTime
+      connectUsers alice cath
+      cath <##> alice
+      tsFinish <- iso8601Show <$> getCurrentTime
+      -- syntax smoke check
+      getChats_ alice "count=0" []
+      getChats_ alice ("after=" <> tsFinish <> " count=2") []
+      getChats_ alice ("before=" <> tsFinish <> " count=0") []
+      -- limited reads
+      getChats_ alice "count=1" [("@cath", "hey")]
+      getChats_ alice ("after=" <> tsStart <> " count=1") [("@bob", "hey")]
+      getChats_ alice ("before=" <> tsFinish <> " count=1") [("@cath", "hey")]
+      -- interval bounds
+      getChats_ alice ("after=" <> tsAliceBob <> " count=10") [("@cath", "hey")]
+      getChats_ alice ("before=" <> tsAliceBob <> " count=10") [("@bob", "hey")]
+
+getChats_ :: HasCallStack => TestCC -> String -> [(String, String)] -> Expectation
+getChats_ cc query expected = do
+  cc #$> ("/_get chats 1 pcc=on " <> query, chats, expected)
+
+testFilterSearch :: HasCallStack => FilePath -> IO ()
+testFilterSearch =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      connectUsers alice bob
+      alice <##> bob
+      connectUsers alice cath
+      cath <##> alice
+
+      let query s = "count=1 {\"type\": \"search\", \"search\": \"" <> s <> "\"}"
+
+      getChats_ alice (query "abc") []
+      getChats_ alice (query "alice") []
+      getChats_ alice (query "bob") [("@bob", "hey")]
+      getChats_ alice (query "Bob") [("@bob", "hey")]
+
+testFilterFavorite :: HasCallStack => FilePath -> IO ()
+testFilterFavorite =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      connectUsers alice bob
+      alice <##> bob
+      connectUsers alice cath
+      cath <##> alice
+
+      let query = "{\"type\": \"filters\", \"favorite\": true, \"unread\": false}"
+
+      -- no favorite chats
+      getChats_ alice query []
+
+      -- 1 favorite chat
+      alice ##> "/_settings @2 {\"enableNtfs\":\"all\",\"favorite\":true}"
+      alice <## "ok"
+      getChats_ alice query [("@bob", "hey")]
+
+      -- 1 favorite chat, unread chat not included
+      alice ##> "/_unread chat @3 on"
+      alice <## "ok"
+      getChats_ alice query [("@bob", "hey")]
+
+testFilterUnread :: HasCallStack => FilePath -> IO ()
+testFilterUnread =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      connectUsers alice bob
+      alice <##> bob
+      connectUsers alice cath
+      cath <##> alice
+
+      let query = "{\"type\": \"filters\", \"favorite\": false, \"unread\": true}"
+
+      -- no unread chats
+      getChats_ alice query []
+
+      -- 1 unread chat
+      alice ##> "/_unread chat @2 on"
+      alice <## "ok"
+      getChats_ alice query [("@bob", "hey")]
+
+      -- 1 unread chat, favorite chat not included
+      alice ##> "/_settings @3 {\"enableNtfs\":\"all\",\"favorite\":true}"
+      alice <## "ok"
+      getChats_ alice query [("@bob", "hey")]
+
+testFilterFavoriteOrUnread :: HasCallStack => FilePath -> IO ()
+testFilterFavoriteOrUnread =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      connectUsers alice bob
+      alice <##> bob
+      connectUsers alice cath
+      cath <##> alice
+
+      let query = "{\"type\": \"filters\", \"favorite\": true, \"unread\": true}"
+
+      -- no favorite or unread chats
+      getChats_ alice query []
+
+      -- 1 unread chat
+      alice ##> "/_unread chat @2 on"
+      alice <## "ok"
+      getChats_ alice query [("@bob", "hey")]
+
+      -- 1 favorite chat
+      alice ##> "/_unread chat @2 off"
+      alice <## "ok"
+      alice ##> "/_settings @3 {\"enableNtfs\":\"all\",\"favorite\":true}"
+      alice <## "ok"
+      getChats_ alice query [("@cath", "hey")]
+
+      -- 1 unread chat, 1 favorite chat
+      alice ##> "/_unread chat @2 on"
+      alice <## "ok"
+      getChats_ alice query [("@cath", "hey"), ("@bob", "hey")]
+
+testPaginationAllChatTypes :: HasCallStack => FilePath -> IO ()
+testPaginationAllChatTypes =
+  testChat4 aliceProfile bobProfile cathProfile danProfile $
+    \alice bob cath dan -> do
+      ts1 <- iso8601Show <$> getCurrentTime
+
+      -- @bob
+      connectUsers alice bob
+      alice <##> bob
+
+      ts2 <- iso8601Show <$> getCurrentTime
+
+      -- <@cath
+      alice ##> "/ad"
+      cLink <- getContactLink alice True
+      cath ##> ("/c " <> cLink)
+      alice <#? cath
+
+      ts3 <- iso8601Show <$> getCurrentTime
+
+      -- :3
+      alice ##> "/c"
+      _ <- getInvitation alice
+
+      ts4 <- iso8601Show <$> getCurrentTime
+
+      -- #team
+      alice ##> "/g team"
+      alice <## "group #team is created"
+      alice <## "to add members use /a team <name> or /create link #team"
+
+      ts5 <- iso8601Show <$> getCurrentTime
+
+      -- @dan
+      connectUsers alice dan
+      alice <##> dan
+
+      ts6 <- iso8601Show <$> getCurrentTime
+
+      getChats_ alice "count=10" [("@dan", "hey"), ("#team", ""), (":3", ""), ("<@cath", ""), ("@bob", "hey")]
+      getChats_ alice "count=3" [("@dan", "hey"), ("#team", ""), (":3", "")]
+      getChats_ alice ("after=" <> ts2 <> " count=2") [(":3", ""), ("<@cath", "")]
+      getChats_ alice ("before=" <> ts5 <> " count=2") [("#team", ""), (":3", "")]
+      getChats_ alice ("after=" <> ts3 <> " count=10") [("@dan", "hey"), ("#team", ""), (":3", "")]
+      getChats_ alice ("before=" <> ts4 <> " count=10") [(":3", ""), ("<@cath", ""), ("@bob", "hey")]
+      getChats_ alice ("after=" <> ts1 <> " count=10") [("@dan", "hey"), ("#team", ""), (":3", ""), ("<@cath", ""), ("@bob", "hey")]
+      getChats_ alice ("before=" <> ts6 <> " count=10") [("@dan", "hey"), ("#team", ""), (":3", ""), ("<@cath", ""), ("@bob", "hey")]
+      getChats_ alice ("after=" <> ts6 <> " count=10") []
+      getChats_ alice ("before=" <> ts1 <> " count=10") []
+
+      let queryFavorite = "{\"type\": \"filters\", \"favorite\": true, \"unread\": false}"
+      getChats_ alice queryFavorite []
+
+      alice ##> "/_settings @2 {\"enableNtfs\":\"all\",\"favorite\":true}"
+      alice <## "ok"
+      alice ##> "/_settings #1 {\"enableNtfs\":\"all\",\"favorite\":true}"
+      alice <## "ok"
+
+      getChats_ alice queryFavorite [("#team", ""), ("@bob", "hey")]
+      getChats_ alice ("before=" <> ts4 <> " count=1 " <> queryFavorite) [("@bob", "hey")]
+      getChats_ alice ("before=" <> ts5 <> " count=1 " <> queryFavorite) [("#team", "")]
+      getChats_ alice ("after=" <> ts1 <> " count=1 " <> queryFavorite) [("@bob", "hey")]
+      getChats_ alice ("after=" <> ts4 <> " count=1 " <> queryFavorite) [("#team", "")]
+
+      let queryUnread = "{\"type\": \"filters\", \"favorite\": false, \"unread\": true}"
+
+      getChats_ alice queryUnread [("<@cath", "")]
+      getChats_ alice ("before=" <> ts2 <> " count=10 " <> queryUnread) []
+      getChats_ alice ("before=" <> ts3 <> " count=10 " <> queryUnread) [("<@cath", "")]
+      getChats_ alice ("after=" <> ts2 <> " count=10 " <> queryUnread) [("<@cath", "")]
+      getChats_ alice ("after=" <> ts3 <> " count=10 " <> queryUnread) []

tests/ChatTests/Direct.hs

@@ -175,6 +175,8 @@ testAddContact = versionTestMatrix2 runTestAddContact
       bob #$> ("/_read chat @2 from=1 to=100", id, "ok")
       alice #$> ("/_read chat @2", id, "ok")
       bob #$> ("/_read chat @2", id, "ok")
+      alice #$> ("/read user", id, "ok")
+      alice #$> ("/_read user 1", id, "ok")
 
 testDuplicateContactsSeparate :: HasCallStack => FilePath -> IO ()
 testDuplicateContactsSeparate =

tests/SchemaDump.hs

@@ -75,7 +75,7 @@ skipComparisonForDownMigrations =
     -- on down migration idx_connections_via_contact_uri_hash index moves down to the end of the file
     "20231019_indexes",
     -- table and indexes move down to the end of the file
-    "20231206_recreate_msg_deliveries"
+    "20231208_recreate_msg_deliveries"
   ]
 
 getSchema :: FilePath -> FilePath -> IO String