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

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Feb 14, 2025 · 02d5b5b · 02d5b5b
1 parent 6b085e9
commit 02d5b5b
Showing 1 changed file with 2 additions and 2 deletions.
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) {
 			}