groups when in status invited - list as invitations on /gs; do not list on start (#173)

src/Simplex/Chat.hs

@@ -305,7 +305,7 @@ processChatCommand user@User {userId, profile} = \case
   ListMembers gName -> do
     group <- withStore $ \st -> getGroup st user gName
     showGroupMembers group
-  ListGroups -> withStore (`getUserGroupNames` userId) >>= showGroupsList
+  ListGroups -> withStore (`getUserGroupDetails` userId) >>= showGroupsList
   SendGroupMessage gName msg -> do
     -- TODO save pending message delivery for members without connections
     Group {members, membership} <- withStore $ \st -> getGroup st user gName
@@ -446,15 +446,18 @@ subscribeUserConnections = void . runExceptT $ do
       groups <- withStore (`getUserGroups` user)
       forM_ groups $ \Group {members, membership, localDisplayName = g} -> do
         let connectedMembers = mapMaybe (\m -> (m,) <$> memberConnId m) members
-        if null connectedMembers
-          then
-            if memberActive membership
-              then showGroupEmpty g
-              else showGroupRemoved g
-          else do
-            forM_ connectedMembers $ \(GroupMember {localDisplayName = c}, cId) ->
-              subscribe cId `catchError` showMemberSubError g c
-            showGroupSubscribed g
+        if memberStatus membership == GSMemInvited
+          then pure ()
+          else
+            if null connectedMembers
+              then
+                if memberActive membership
+                  then showGroupEmpty g
+                  else showGroupRemoved g
+              else do
+                forM_ connectedMembers $ \(GroupMember {localDisplayName = c}, cId) ->
+                  subscribe cId `catchError` showMemberSubError g c
+                showGroupSubscribed g
     subscribeFiles user = do
       withStore (`getLiveSndFileTransfers` user) >>= mapM_ subscribeSndFile
       withStore (`getLiveRcvFileTransfers` user) >>= mapM_ subscribeRcvFile

src/Simplex/Chat/Store.hs

@@ -49,7 +49,7 @@ module Simplex.Chat.Store
     getGroup,
     deleteGroup,
     getUserGroups,
-    getUserGroupNames,
+    getUserGroupDetails,
     getGroupInvitation,
     createContactGroupMember,
     createMemberConnection,
@@ -982,16 +982,17 @@ getUserGroups st user@User {userId} =
     groupNames <- map fromOnly <$> DB.query db "SELECT local_display_name FROM groups WHERE user_id = ?" (Only userId)
     map fst . rights <$> mapM (runExceptT . getGroup_ db user) groupNames
 
-getUserGroupNames :: MonadUnliftIO m => SQLiteStore -> UserId -> m [(GroupName, Text)]
-getUserGroupNames st userId =
+getUserGroupDetails :: MonadUnliftIO m => SQLiteStore -> UserId -> m [(GroupName, Text, GroupMemberStatus)]
+getUserGroupDetails st userId =
   liftIO . withTransaction st $ \db ->
     DB.query
       db
       [sql|
-        SELECT g.local_display_name, p.full_name
+        SELECT g.local_display_name, p.full_name, m.member_status
         FROM groups g
         JOIN group_profiles p USING (group_profile_id)
-        WHERE g.user_id = ?
+        JOIN group_members m USING (group_id)
+        WHERE g.user_id = ? AND m.member_category = 'user'
       |]
       (Only userId)
 

src/Simplex/Chat/View.hs

@@ -297,7 +297,7 @@ showLeftMember = printToView .: leftMember
 showGroupMembers :: ChatReader m => Group -> m ()
 showGroupMembers = printToView . groupMembers
 
-showGroupsList :: ChatReader m => [(GroupName, Text)] -> m ()
+showGroupsList :: ChatReader m => [(GroupName, Text, GroupMemberStatus)] -> m ()
 showGroupsList = printToView . groupsList
 
 showContactsMerged :: ChatReader m => Contact -> Contact -> m ()
@@ -492,11 +492,19 @@ groupMembers Group {membership, members} = map groupMember . filter (not . remov
       GSMemCreator -> "created group"
       _ -> ""
 
-groupsList :: [(GroupName, Text)] -> [StyledString]
+groupsList :: [(GroupName, Text, GroupMemberStatus)] -> [StyledString]
 groupsList [] = ["you have no groups!", "to create: " <> highlight' "/g <name>"]
 groupsList gs = map groupNames $ sort gs
   where
-    groupNames (displayName, fullName) = ttyGroup displayName <> optFullName displayName fullName
+    groupNames (displayName, fullName, GSMemInvited) =
+      ttyGroup displayName
+        <> optFullName displayName fullName
+        <> " - you are invited ("
+        <> highlight' ("/j " <> T.unpack displayName)
+        <> " to join, "
+        <> highlight' ("/d #" <> T.unpack displayName)
+        <> " to delete invitation)"
+    groupNames (displayName, fullName, _) = ttyGroup displayName <> optFullName displayName fullName
 
 contactsMerged :: Contact -> Contact -> [StyledString]
 contactsMerged _to@Contact {localDisplayName = c1} _from@Contact {localDisplayName = c2} =