Merge pull request #14394 from nextcloud/bugfix/14390/only-trigger-event-with-really-removed-users

nickvergessen · web-flow · commit e34c22302609 · 2025-02-14T16:11:12.000+01:00
fix(conversation): Only trigger event with users that really got removed
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
@@ -1007,10 +1007,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) {
 			}
@@ -1070,10 +1070,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) {
 			}

Original file line number	Diff line number	Diff line change
`@@ -1007,10 +1007,10 @@ public function removeGroupMembers(Room $room, Participant $removedGroupParticip`
`1007`	`1007`	`$participant = $this->getParticipant($room, $user->getUID());`
`1008`	`1008`	`$participantType = $participant->getAttendee()->getParticipantType();`
`1009`	`1009`
`1010`		`- $attendees[] = $participant->getAttendee();`
`1011`	`1010`	`if ($participantType === Participant::USER) {`
`1012`	`1011`	`// Only remove normal users, not moderators/admins`
`1013`	`1012`	`$this->removeAttendee($room, $participant, $reason, true);`
	`1013`	`+ $attendees[] = $participant->getAttendee();`
`1014`	`1014`	`}`
`1015`	`1015`	`} catch (ParticipantNotFoundException $e) {`
`1016`	`1016`	`}`
`@@ -1070,10 +1070,10 @@ public function removeCircleMembers(Room $room, Participant $removedCirclePartic`
`1070`	`1070`	`$participant = $this->getParticipant($room, $user->getUID());`
`1071`	`1071`	`$participantType = $participant->getAttendee()->getParticipantType();`
`1072`	`1072`
`1073`		`- $attendees[] = $participant->getAttendee();`
`1074`	`1073`	`if ($participantType === Participant::USER) {`
`1075`	`1074`	`// Only remove normal users, not moderators/admins`
`1076`	`1075`	`$this->removeAttendee($room, $participant, $reason, true);`
	`1076`	`+ $attendees[] = $participant->getAttendee();`
`1077`	`1077`	`}`
`1078`	`1078`	`} catch (ParticipantNotFoundException $e) {`
`1079`	`1079`	`}`