Auto-join host into live session when going live from green room.
Deploy Ladill Meet / deploy (push) Successful in 2m1s
Deploy Ladill Meet / deploy (push) Successful in 2m1s
Green room poll was racing go-live and sending the host to the ended page; carry participant session into the new live session instead. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -16,6 +16,7 @@ use App\Services\Meet\SecurityPolicyService;
|
||||
use App\Services\Meet\SessionService;
|
||||
use App\Services\Meet\SpaceService;
|
||||
use App\Services\Meet\StageLayoutService;
|
||||
use App\Services\Meet\TownHallService;
|
||||
use App\Services\Meet\TranscriptService;
|
||||
use App\Services\Meet\WebinarService;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
@@ -44,6 +45,12 @@ class MeetingRoomController extends Controller
|
||||
$kind = $room->isConference() ? 'conference' : 'meeting';
|
||||
|
||||
$participantUuid = $request->session()->get("meet.participant.{$session->uuid}");
|
||||
|
||||
if (! $participantUuid && $request->user() && $request->user()->ownerRef() === $room->host_user_ref) {
|
||||
$hostParticipant = $this->sessions->ensureJoinedParticipant($request, $session, $request->user(), 'host');
|
||||
$participantUuid = $hostParticipant->uuid;
|
||||
}
|
||||
|
||||
abort_unless($participantUuid, 403, "Please join the {$kind} first.");
|
||||
|
||||
$participant = Participant::where('uuid', $participantUuid)
|
||||
@@ -227,6 +234,27 @@ class MeetingRoomController extends Controller
|
||||
public function poll(Request $request, Session $session): JsonResponse
|
||||
{
|
||||
if (! $session->isLive()) {
|
||||
$townHall = app(TownHallService::class);
|
||||
$liveSession = $townHall->successorLiveSession($session);
|
||||
|
||||
if ($liveSession) {
|
||||
$participantUuid = $request->session()->get("meet.participant.{$session->uuid}");
|
||||
|
||||
if ($participantUuid) {
|
||||
$greenParticipant = Participant::where('uuid', $participantUuid)
|
||||
->where('session_id', $session->id)
|
||||
->first();
|
||||
|
||||
if ($greenParticipant && $this->sessions->transitionGreenRoomParticipant($request, $greenParticipant, $liveSession)) {
|
||||
return response()->json([
|
||||
'ended' => true,
|
||||
'redirect' => route('meet.room', $liveSession),
|
||||
'transition' => 'go_live',
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return response()->json([
|
||||
'ended' => true,
|
||||
'redirect' => route('meet.ended', $session),
|
||||
|
||||
Reference in New Issue
Block a user