Merge branch 'master' into master-ghc8107

tests/ChatClient.hs

@@ -5,6 +5,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE TypeApplications #-}
+{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
 
 module ChatClient where
 
@@ -273,7 +274,7 @@ getTermLine cc =
     Just s -> do
       -- remove condition to always echo virtual terminal
       when (printOutput cc) $ do
-      -- when True $ do
+        -- when True $ do
         name <- userName cc
         putStrLn $ name <> ": " <> s
       pure s

tests/ChatTests/Direct.hs

@@ -259,7 +259,6 @@ testPlanInvitationLinkOk =
 
       bob ##> ("/_connect plan 1 " <> inv)
       bob <## "invitation link: ok to connect" -- conn_req_inv is forgotten after connection
-
       alice <##> bob
 
 testPlanInvitationLinkOwn :: HasCallStack => FilePath -> IO ()
@@ -283,7 +282,6 @@ testPlanInvitationLinkOwn tmp =
 
     alice ##> ("/_connect plan 1 " <> inv)
     alice <## "invitation link: ok to connect" -- conn_req_inv is forgotten after connection
-
     alice @@@ [("@alice_1", lastChatFeature), ("@alice_2", lastChatFeature)]
     alice `send` "@alice_2 hi"
     alice
@@ -1213,31 +1211,34 @@ testMuteGroup =
       cath `send` "> #team (hello) hello too!"
       cath <# "#team > bob hello"
       cath <## "      hello too!"
-      concurrently_
-        (bob </)
-        ( do alice <# "#team cath> > bob hello"
-             alice <## "      hello too!"
-        )
+      concurrentlyN_
+        [ (bob </),
+          do
+            alice <# "#team cath> > bob hello"
+            alice <## "      hello too!"
+        ]
       bob ##> "/unmute mentions #team"
       bob <## "ok"
       alice `send` "> #team @bob (hello) hey bob!"
       alice <# "#team > bob hello"
       alice <## "      hey bob!"
-      concurrently_
-        ( do bob <# "#team alice> > bob hello"
-             bob <## "      hey bob!"
-        )
-        ( do cath <# "#team alice> > bob hello"
-             cath <## "      hey bob!"
-        )
+      concurrentlyN_
+        [ do
+            bob <# "#team alice> > bob hello"
+            bob <## "      hey bob!",
+          do
+            cath <# "#team alice> > bob hello"
+            cath <## "      hey bob!"
+        ]
       alice `send` "> #team @cath (hello) hey cath!"
       alice <# "#team > cath hello too!"
       alice <## "      hey cath!"
-      concurrently_
-        (bob </)
-        ( do cath <# "#team alice> > cath hello too!"
-             cath <## "      hey cath!"
-        )
+      concurrentlyN_
+        [ (bob </),
+          do
+            cath <# "#team alice> > cath hello too!"
+            cath <## "      hey cath!"
+        ]
       bob ##> "/gs"
       bob <## "#team (3 members, mentions only, you can /unmute #team)"
       bob ##> "/unmute #team"

tests/ChatTests/Files.hs

@@ -1,6 +1,7 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE PostfixOperators #-}
+{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
 
 module ChatTests.Files where
 

tests/ChatTests/Groups.hs

@@ -7,7 +7,7 @@ import ChatClient
 import ChatTests.Utils
 import Control.Concurrent (threadDelay)
 import Control.Concurrent.Async (concurrently_)
-import Control.Monad (when, void)
+import Control.Monad (void, when)
 import qualified Data.ByteString as B
 import Data.List (isInfixOf)
 import qualified Data.Text as T
@@ -122,7 +122,8 @@ chatGroupTests = do
     -- because host uses current code and sends version in MemberInfo
     testNoDirect vrMem2 vrMem3 noConns =
       it
-        ( "host " <> vRangeStr supportedChatVRange
+        ( "host "
+            <> vRangeStr supportedChatVRange
             <> (", 2nd mem " <> vRangeStr vrMem2)
             <> (", 3rd mem " <> vRangeStr vrMem3)
             <> (if noConns then " : 2 <!!> 3" else " : 2 <##> 3")
@@ -3859,11 +3860,9 @@ testMemberContactProfileUpdate =
       bob #> "#team hello too"
       alice <# "#team rob> hello too"
       cath <# "#team bob> hello too" -- not updated profile
-
       cath #> "#team hello there"
       alice <# "#team kate> hello there"
       bob <# "#team cath> hello there" -- not updated profile
-
       bob `send` "@cath hi"
       bob
         <### [ "member #team cath does not have direct connection, creating",
@@ -3903,7 +3902,6 @@ testMemberContactProfileUpdate =
       bob #> "#team hello too"
       alice <# "#team rob> hello too"
       cath <# "#team rob> hello too" -- updated profile
-
       cath #> "#team hello there"
       alice <# "#team kate> hello there"
       bob <# "#team kate> hello there" -- updated profile
@@ -3911,7 +3909,7 @@ testMemberContactProfileUpdate =
 testGroupMsgForward :: HasCallStack => FilePath -> IO ()
 testGroupMsgForward =
   testChat3 aliceProfile bobProfile cathProfile $
-    \alice bob cath ->  do
+    \alice bob cath -> do
       setupGroupForwarding3 "team" alice bob cath
 
       bob #> "#team hi there"
@@ -3941,7 +3939,6 @@ setupGroupForwarding3 gName alice bob cath = do
   createGroup3 gName alice bob cath
 
   threadDelay 1000000 -- delay so intro_status doesn't get overwritten to connected
-
   void $ withCCTransaction bob $ \db ->
     DB.execute_ db "UPDATE connections SET conn_status='deleted' WHERE group_member_id = 3"
   void $ withCCTransaction cath $ \db ->
@@ -3956,7 +3953,6 @@ testGroupMsgForwardDeduplicate =
       createGroup3 "team" alice bob cath
 
       threadDelay 1000000 -- delay so intro_status doesn't get overwritten to connected
-
       void $ withCCTransaction alice $ \db ->
         DB.execute_ db "UPDATE group_member_intros SET intro_status='fwd'"
 
@@ -3990,7 +3986,7 @@ testGroupMsgForwardDeduplicate =
 testGroupMsgForwardEdit :: HasCallStack => FilePath -> IO ()
 testGroupMsgForwardEdit =
   testChat3 aliceProfile bobProfile cathProfile $
-    \alice bob cath ->  do
+    \alice bob cath -> do
       setupGroupForwarding3 "team" alice bob cath
 
       bob #> "#team hi there"
@@ -4001,7 +3997,6 @@ testGroupMsgForwardEdit =
       bob <# "#team [edited] hello there"
       alice <# "#team bob> [edited] hello there"
       cath <# "#team bob> [edited] hello there" -- TODO show as forwarded
-
       alice ##> "/tail #team 1"
       alice <# "#team bob> hello there"
 
@@ -4014,7 +4009,7 @@ testGroupMsgForwardEdit =
 testGroupMsgForwardReaction :: HasCallStack => FilePath -> IO ()
 testGroupMsgForwardReaction =
   testChat3 aliceProfile bobProfile cathProfile $
-    \alice bob cath ->  do
+    \alice bob cath -> do
       setupGroupForwarding3 "team" alice bob cath
 
       bob #> "#team hi there"
@@ -4031,7 +4026,7 @@ testGroupMsgForwardReaction =
 testGroupMsgForwardDeletion :: HasCallStack => FilePath -> IO ()
 testGroupMsgForwardDeletion =
   testChat3 aliceProfile bobProfile cathProfile $
-    \alice bob cath ->  do
+    \alice bob cath -> do
       setupGroupForwarding3 "team" alice bob cath
 
       bob #> "#team hi there"
@@ -4073,7 +4068,7 @@ testGroupMsgForwardFile =
 testGroupMsgForwardChangeRole :: HasCallStack => FilePath -> IO ()
 testGroupMsgForwardChangeRole =
   testChat3 aliceProfile bobProfile cathProfile $
-    \alice bob cath ->  do
+    \alice bob cath -> do
       setupGroupForwarding3 "team" alice bob cath
 
       cath ##> "/mr #team bob member"
@@ -4084,7 +4079,7 @@ testGroupMsgForwardChangeRole =
 testGroupMsgForwardNewMember :: HasCallStack => FilePath -> IO ()
 testGroupMsgForwardNewMember =
   testChat4 aliceProfile bobProfile cathProfile danProfile $
-    \alice bob cath dan ->  do
+    \alice bob cath dan -> do
       setupGroupForwarding3 "team" alice bob cath
 
       connectUsers cath dan

tests/ChatTests/Profiles.hs

@@ -7,16 +7,16 @@ import ChatClient
 import ChatTests.Utils
 import Control.Concurrent (threadDelay)
 import Control.Concurrent.Async (concurrently_)
+import Control.Monad
 import Control.Monad.Except
 import qualified Data.Attoparsec.ByteString.Char8 as A
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Text as T
+import Simplex.Chat.Store.Shared (createContact)
 import Simplex.Chat.Types (ConnStatus (..), GroupMemberRole (..), Profile (..))
+import Simplex.Messaging.Encoding.String (StrEncoding (..))
 import System.Directory (copyFile, createDirectoryIfMissing)
 import Test.Hspec
-import Simplex.Chat.Store.Shared (createContact)
-import Control.Monad
-import Simplex.Messaging.Encoding.String (StrEncoding(..))
 
 chatProfileTests :: SpecWith FilePath
 chatProfileTests = do
@@ -633,7 +633,7 @@ testPlanAddressOwn tmp =
     alice <## "alice_1 (Alice) wants to connect to you!"
     alice <## "to accept: /ac alice_1"
     alice <## "to reject: /rc alice_1 (the sender will NOT be notified)"
-    alice @@@ [("<@alice_1", ""), (":2","")]
+    alice @@@ [("<@alice_1", ""), (":2", "")]
     alice ##> "/ac alice_1"
     alice <## "alice_1 (Alice): accepting contact request..."
     alice

tests/ChatTests/Utils.hs

@@ -310,7 +310,7 @@ getInAnyOrder f cc ls = do
       Predicate p -> p l
     filterFirst :: (a -> Bool) -> [a] -> [a]
     filterFirst _ [] = []
-    filterFirst p (x:xs)
+    filterFirst p (x : xs)
       | p x = xs
       | otherwise = x : filterFirst p xs
 
@@ -593,7 +593,7 @@ vRangeStr (VersionRange minVer maxVer) = "(" <> show minVer <> ", " <> show maxV
 linkAnotherSchema :: String -> String
 linkAnotherSchema link
   | "https://simplex.chat/" `isPrefixOf` link =
-    T.unpack $ T.replace "https://simplex.chat/" "simplex:/" $ T.pack link
+      T.unpack $ T.replace "https://simplex.chat/" "simplex:/" $ T.pack link
   | "simplex:/" `isPrefixOf` link =
-    T.unpack $ T.replace "simplex:/" "https://simplex.chat/" $ T.pack link
+      T.unpack $ T.replace "simplex:/" "https://simplex.chat/" $ T.pack link
   | otherwise = error "link starts with neither https://simplex.chat/ nor simplex:/"

tests/Test.hs

@@ -13,8 +13,8 @@ import RemoteTests
 import SchemaDump
 import Test.Hspec
 import UnliftIO.Temporary (withTempDirectory)
-import ViewTests
 import ValidNames
+import ViewTests
 import WebRTCTests
 
 main :: IO ()