Merge pull request #14395 from nextcloud/backport/14394/stable29

[stable29] fix(conversation): Only trigger event with users that really got removed

Author: nickvergessen

lib/Service/ParticipantService.php

@@ -927,10 +927,10 @@ public function removeGroupMembers(Room $room, Participant $removedGroupParticip
 				$participant = $this->getParticipant($room, $user->getUID());
 				$participantType = $participant->getAttendee()->getParticipantType();
 
-				$attendees[] = $participant->getAttendee();
 				if ($participantType === Participant::USER) {
 					// Only remove normal users, not moderators/admins
 					$this->removeAttendee($room, $participant, $reason, true);
+					$attendees[] = $participant->getAttendee();
 				}
 			} catch (ParticipantNotFoundException $e) {
 			}
@@ -990,10 +990,10 @@ public function removeCircleMembers(Room $room, Participant $removedCirclePartic
 				$participant = $this->getParticipant($room, $user->getUID());
 				$participantType = $participant->getAttendee()->getParticipantType();
 
-				$attendees[] = $participant->getAttendee();
 				if ($participantType === Participant::USER) {
 					// Only remove normal users, not moderators/admins
 					$this->removeAttendee($room, $participant, $reason, true);
+					$attendees[] = $participant->getAttendee();
 				}
 			} catch (ParticipantNotFoundException $e) {
 			}