Re-enable multiple victim when removing members

This is useful to batch removals occurring after an access update to a
conversation.

Author: pcapriotti

libs/wire-api-federation/test/Test/Wire/API/Federation/Golden/ConversationUpdate.hs

@@ -70,5 +70,5 @@ testObject_ConversationUpdate2 =
       cuConvId =
         Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000006")),
       cuAlreadyPresentUsers = [chad, dee],
-      cuAction = ConversationActionRemoveMember (qAlice)
+      cuAction = ConversationActionRemoveMembers (pure qAlice)
     }

libs/wire-api/src/Wire/API/Conversation/Action.hs

@@ -38,7 +38,7 @@ import Wire.API.Util.Aeson (CustomEncoded (..))
 -- Used to send notifications to users and to remote backends.
 data ConversationAction
   = ConversationActionAddMembers (NonEmpty (Qualified UserId)) RoleName
-  | ConversationActionRemoveMember (Qualified UserId)
+  | ConversationActionRemoveMembers (NonEmpty (Qualified UserId))
   | ConversationActionRename ConversationRename
   | ConversationActionMessageTimerUpdate ConversationMessageTimerUpdate
   | ConversationActionReceiptModeUpdate ConversationReceiptModeUpdate
@@ -57,9 +57,9 @@ conversationActionToEvent ::
 conversationActionToEvent now quid qcnv (ConversationActionAddMembers newMembers role) =
   Event MemberJoin qcnv quid now $
     EdMembersJoin $ SimpleMembers (map (`SimpleMember` role) (toList newMembers))
-conversationActionToEvent now quid qcnv (ConversationActionRemoveMember removedMember) =
+conversationActionToEvent now quid qcnv (ConversationActionRemoveMembers removedMembers) =
   Event MemberLeave qcnv quid now $
-    EdMembersLeave (QualifiedUserIdList [removedMember])
+    EdMembersLeave (QualifiedUserIdList (toList removedMembers))
 conversationActionToEvent now quid qcnv (ConversationActionRename rename) =
   Event ConvRename qcnv quid now (EdConvRename rename)
 conversationActionToEvent now quid qcnv (ConversationActionMessageTimerUpdate update) =
@@ -74,8 +74,8 @@ conversationActionToEvent now quid qcnv (ConversationActionAccessUpdate update)
 
 conversationActionTag :: Qualified UserId -> ConversationAction -> Action
 conversationActionTag _ (ConversationActionAddMembers _ _) = AddConversationMember
-conversationActionTag qusr (ConversationActionRemoveMember victim)
-  | qusr == victim = LeaveConversation
+conversationActionTag qusr (ConversationActionRemoveMembers victims)
+  | pure qusr == victims = LeaveConversation
   | otherwise = RemoveConversationMember
 conversationActionTag _ (ConversationActionRename _) = ModifyConversationName
 conversationActionTag _ (ConversationActionMessageTimerUpdate _) = ModifyConversationMessageTimer

services/galley/src/Galley/API/Federation.hs

@@ -133,8 +133,8 @@ onConversationUpdated requestingDomain cu = do
       let localUsers = getLocalUsers localDomain toAdd
       Data.addLocalMembersToRemoteConv qconvId localUsers
       pure localUsers
-    ConversationActionRemoveMember toRemove -> do
-      let localUsers = getLocalUsers localDomain (pure toRemove)
+    ConversationActionRemoveMembers toRemove -> do
+      let localUsers = getLocalUsers localDomain toRemove
       Data.removeLocalMembersFromRemoteConv qconvId localUsers
       pure []
     ConversationActionRename _ -> pure []
@@ -175,7 +175,8 @@ leaveConversation requestingDomain lc = do
     . runMaybeT
     . void
     . API.updateLocalConversation lcnv leaver Nothing
-    . ConversationActionRemoveMember
+    . ConversationActionRemoveMembers
+    . pure
     $ leaver
 
 -- FUTUREWORK: report errors to the originating backend

services/galley/src/Galley/API/Update.hs

@@ -420,8 +420,8 @@ performAction ::
 performAction qusr conv action = case action of
   ConversationActionAddMembers members role ->
     performAddMemberAction qusr conv members role
-  ConversationActionRemoveMember member -> do
-    performRemoveMemberAction conv member
+  ConversationActionRemoveMembers members -> do
+    performRemoveMemberAction conv (toList members)
     pure (mempty, action)
   ConversationActionRename rename -> lift $ do
     cn <- rangeChecked (cupName rename)
@@ -650,7 +650,7 @@ performAddMemberAction qusr conv invited role = do
                 qvictim <- qUntagged <$> qualifyLocal (lmId mem)
                 void . runMaybeT $
                   updateLocalConversation lcnv qvictim Nothing $
-                    ConversationActionRemoveMember qvictim
+                    ConversationActionRemoveMembers (pure qvictim)
           else throwErrorDescriptionType @MissingLegalholdConsent
 
     checkLHPolicyConflictsRemote :: FutureWork 'LegalholdPlusFederationNotImplemented [Remote UserId] -> Galley ()
@@ -790,14 +790,16 @@ removeMemberFromRemoteConv (qUntagged -> qcnv) lusr _ victim
 
 performRemoveMemberAction ::
   Data.Conversation ->
-  Qualified UserId ->
+  [Qualified UserId] ->
   MaybeT Galley ()
-performRemoveMemberAction conv victim = do
+performRemoveMemberAction conv victims = do
   loc <- qualifyLocal ()
-  guard $ isConvMember loc conv victim
-  let removeLocal u c = Data.removeLocalMembersFromLocalConv c (pure (tUnqualified u))
-      removeRemote u c = Data.removeRemoteMembersFromLocalConv c (pure u)
-  lift $ foldQualified loc removeLocal removeRemote victim (Data.convId conv)
+  let presentVictims = filter (isConvMember loc conv) victims
+  guard . not . null $ presentVictims
+
+  let (lvictims, rvictims) = partitionQualified loc presentVictims
+  traverse_ (lift . Data.removeLocalMembersFromLocalConv (Data.convId conv)) (nonEmpty lvictims)
+  traverse_ (lift . Data.removeRemoteMembersFromLocalConv (Data.convId conv)) (nonEmpty rvictims)
 
 -- | Remove a member from a local conversation.
 removeMemberFromLocalConv ::
@@ -811,7 +813,8 @@ removeMemberFromLocalConv lcnv lusr con victim =
   fmap (maybe (Left RemoveFromConversationErrorUnchanged) Right)
     . runMaybeT
     . updateLocalConversation lcnv (qUntagged lusr) con
-    . ConversationActionRemoveMember
+    . ConversationActionRemoveMembers
+    . pure
     $ victim
 
 -- OTR

services/galley/test/integration/API/Federation.hs

@@ -216,7 +216,7 @@ removeLocalUser = do
             FedGalley.cuConvId = conv,
             FedGalley.cuAlreadyPresentUsers = [alice],
             FedGalley.cuAction =
-              ConversationActionRemoveMember qAlice
+              ConversationActionRemoveMembers (pure qAlice)
           }
 
   WS.bracketR c alice $ \ws -> do
@@ -278,7 +278,7 @@ removeRemoteUser = do
             FedGalley.cuConvId = conv,
             FedGalley.cuAlreadyPresentUsers = [alice, charlie, dee],
             FedGalley.cuAction =
-              ConversationActionRemoveMember user
+              ConversationActionRemoveMembers (pure user)
           }
 
   WS.bracketRN c [alice, charlie, dee, flo] $ \[wsA, wsC, wsD, wsF] -> do

services/galley/test/integration/API/Util.hs

@@ -1423,7 +1423,7 @@ assertRemoveUpdate req qconvId remover alreadyPresentUsers victim = liftIO $ do
   FederatedGalley.cuOrigUserId cu @?= remover
   FederatedGalley.cuConvId cu @?= qUnqualified qconvId
   sort (FederatedGalley.cuAlreadyPresentUsers cu) @?= sort alreadyPresentUsers
-  FederatedGalley.cuAction cu @?= ConversationActionRemoveMember victim
+  FederatedGalley.cuAction cu @?= ConversationActionRemoveMembers (pure victim)
 
 -------------------------------------------------------------------------------
 -- Helpers