Skip to content

Commit

Permalink
Merge pull request #13984 from nextcloud/backport/13980/stable30
Browse files Browse the repository at this point in the history
[stable30] fix(guests): Don't force remove guests but leave it to the "purge logic"
  • Loading branch information
miaulalala authored Dec 11, 2024
2 parents c0e5750 + c9e1b13 commit 541d1c6
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions lib/Controller/SignalingController.php
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 @@ -920,15 +919,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

0 comments on commit 541d1c6

Please sign in to comment.