fix: add perform-ability to leave

Author: blackheaven

libs/wire-subsystems/src/Wire/TeamCollaboratorsSubsystem/Interpreter.hs

@@ -108,29 +108,49 @@ updateTeamCollaboratorImpl ::
 updateTeamCollaboratorImpl zUser user team perms = do
   guardPermission (tUnqualified zUser) team TeamMember.UpdateTeamCollaborator InsufficientRights
   Store.updateTeamCollaborator user team perms
-  when (Set.null $ Set.intersection (Set.fromList [CreateTeamConversation, ImplicitConnection]) perms) $
-    internalLeavingConversationsFrom team user
 
   now <- get
-  let event = newEvent team now (EdCollaboratorUpdate user $ Set.toList perms)
   teamMembersList <- internalGetTeamAdmins team
   let teamMembers :: [UserId] = view TeamMember.userId <$> (teamMembersList ^. TeamMember.teamMembers)
+
+  extraNotifications <-
+    if Set.null $ Set.intersection (Set.fromList [CreateTeamConversation, ImplicitConnection]) perms
+      then do
+        leavingConversations <- internalLeaveConversationsFrom team user
+        pure $
+          leavingConversations.close <&> \convId ->
+            def
+              { origin = Just (tUnqualified zUser),
+                json = toJSONObject $ newEvent team now (EdConvDelete convId),
+                recipients =
+                  ( \uid ->
+                      Recipient
+                        { recipientUserId = uid,
+                          recipientClients = Push.RecipientClientsAll
+                        }
+                  )
+                    <$> teamMembers,
+                transient = False
+              }
+      else pure []
+
+  let event = newEvent team now (EdCollaboratorUpdate user $ Set.toList perms)
   -- TODO: Review the event's values
-  pushNotifications
-    [ def
-        { origin = Just (tUnqualified zUser),
-          json = toJSONObject $ event,
-          recipients =
-            ( \uid ->
-                Recipient
-                  { recipientUserId = uid,
-                    recipientClients = Push.RecipientClientsAll
-                  }
-            )
-              <$> teamMembers,
-          transient = False
-        }
-    ]
+  pushNotifications $
+    def
+      { origin = Just (tUnqualified zUser),
+        json = toJSONObject $ event,
+        recipients =
+          ( \uid ->
+              Recipient
+                { recipientUserId = uid,
+                  recipientClients = Push.RecipientClientsAll
+                }
+          )
+            <$> teamMembers,
+        transient = False
+      }
+      : extraNotifications
 
 internalRemoveTeamCollaboratorImpl ::
   ( Member Store.TeamCollaboratorsStore r