Skip to content
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

fix(guests): Don't force remove guests but leave it to the "purge logic" #13980

Merged
merged 1 commit into from
Dec 11, 2024
Merged

fix(guests): Don't force remove guests but leave it to the "purge logic" #13980

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 1 addition & 10 deletions lib/Controller/SignalingController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

use GuzzleHttp\Exception\ConnectException;
use OCA\Talk\Config;
use OCA\Talk\Events\AAttendeeRemovedEvent;
use OCA\Talk\Events\BeforeSignalingResponseSentEvent;
use OCA\Talk\Exceptions\ForbiddenException;
use OCA\Talk\Exceptions\ParticipantNotFoundException;
Expand Down Expand Up @@ -924,15 +923,7 @@ private function backendRoom(array $roomRequest): DataResponse {
$this->sessionService->updateLastPing($participant->getSession(), $this->timeFactory->getTime());
}
} elseif ($action === 'leave') {
// Guests are removed completely as they don't reuse attendees,
// but this is only true for guests that joined directly.
// Emails are retained as their PIN needs to remain and stay
// valid.
if ($participant->getAttendee()->getActorType() === Attendee::ACTOR_GUESTS) {
$this->participantService->removeAttendee($room, $participant, AAttendeeRemovedEvent::REASON_LEFT);
} else {
$this->participantService->leaveRoomAsSession($room, $participant);
}
$this->participantService->leaveRoomAsSession($room, $participant);
}

$this->logger->debug('Room request to "{action}" room {token} by actor {actorType}/{actorId}', [
Expand Down
Loading