Skip to content

Fix clearing of guests #9517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 2 commits into from
May 12, 2023
Merged

Fix clearing of guests #9517

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b82954
fix(participants): Fix clearing of inactive guests
nickvergessen May 11, 2023
80b96cf
fix(participants): Don't emit the _AFTER event when no guests were re…
nickvergessen May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions lib/Service/ParticipantService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,8 +1010,9 @@ public function cleanGuestParticipants(Room $room): void {
continue;
}

if ($row['permissions'] !== Attendee::PERMISSIONS_DEFAULT
|| $row['participant_type'] === Participant::GUEST_MODERATOR) {
if ((int) $row['participant_type'] !== Participant::GUEST
|| ((int) $row['permissions'] !== Attendee::PERMISSIONS_DEFAULT
&& (int) $row['permissions'] !== Attendee::PERMISSIONS_CUSTOM)) {
// Keep guests with non-default permissions in case they just reconnect
continue;
}
Expand All @@ -1021,6 +1022,10 @@ public function cleanGuestParticipants(Room $room): void {
}
$result->closeCursor();

if (empty($attendeeIds)) {
return;
}

$this->attendeeMapper->deleteByIds($attendeeIds);

$attendeeEvent = new AttendeesRemovedEvent($room, $attendees);
Expand Down