fix: rebase

Author: blackheaven

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

@@ -85,7 +85,7 @@ createAppImpl lusr tid new = do
   Store.createUser u Nothing
 
   -- generate a team event
-  generateTeamEvent creator.id tid (EdAppCreate u.id)
+  generateTeamEvents creator.id tid [EdAppCreate u.id]
 
   c :: Cookie (Token U) <- newCookie u.id Nothing PersistentCookie (Just "app")
   pure

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

@@ -69,7 +69,7 @@ createTeamCollaboratorImpl zUser user team perms = do
   Store.createTeamCollaborator user team perms
 
   -- TODO: Review the event's values
-  generateTeamEvent (tUnqualified zUser) team (EdCollaboratorAdd user (Set.toList perms))
+  generateTeamEvents (tUnqualified zUser) team [EdCollaboratorAdd user (Set.toList perms)]
 
 getAllTeamCollaboratorsImpl ::
   ( Member TeamSubsystem r,
@@ -109,48 +109,15 @@ updateTeamCollaboratorImpl zUser user team perms = do
   guardPermission (tUnqualified zUser) team TeamMember.UpdateTeamCollaborator InsufficientRights
   Store.updateTeamCollaborator user team perms
 
-  now <- get
-  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
-              }
+        pure $ EdConvDelete <$> leavingConversations.close
       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
-      }
-      : extraNotifications
+  generateTeamEvents (tUnqualified zUser) team (EdCollaboratorAdd user (Set.toList perms) : extraNotifications)
 
 internalRemoveTeamCollaboratorImpl ::
   ( Member Store.TeamCollaboratorsStore r

libs/wire-subsystems/src/Wire/TeamSubsystem/Util.hs

@@ -13,24 +13,24 @@ import Wire.NotificationSubsystem
 import Wire.Sem.Now
 import Wire.TeamSubsystem
 
--- | Generate a team event and send it to all team admins
-generateTeamEvent ::
+-- | Generate team events and send them to all team admins
+generateTeamEvents ::
   ( Member Now r,
     Member TeamSubsystem r,
     Member NotificationSubsystem r
   ) =>
   UserId ->
   TeamId ->
-  EventData ->
+  [EventData] ->
   Sem r ()
-generateTeamEvent uid tid edata = do
+generateTeamEvents uid tid eventsData = do
   now <- get
-  let event = newEvent tid now edata
   admins <- internalGetTeamAdmins tid
-  pushNotifications
-    [ def
+  pushNotifications $
+    eventsData <&> \eData ->
+      def
         { origin = Just uid,
-          json = toJSONObject $ event,
+          json = toJSONObject $ newEvent tid now eData,
           recipients =
             [ Recipient
                 { recipientUserId = u,
@@ -40,4 +40,3 @@ generateTeamEvent uid tid edata = do
             ],
           transient = False
         }
-    ]