Compare commits

18 Commits
Author SHA1 Message Date
Twyco 4dfe79ce5c kick forever
CI/CD / test_and_check_app (push) Successful in 2m19s
CI/CD / Publish immutable image (push) Successful in 1m16s
2026-09-24 14:38:18 +02:00
Twyco b190ff719e audit fix
CI/CD / Publish immutable image (push) Successful in 2m28s
CI/CD / test_and_check_app (push) Successful in 3m43s
2026-09-10 19:16:00 +02:00
Twyco 54d23c3660 Merge pull request #10 from ericasch6/codex/guest-play
CI/CD / Publish immutable image (push) Canceled after 0s
CI/CD / test_and_check_app (push) Canceled after 17s
2026-09-10 17:09:18 +02:00
Twyco 640a2970c3 Handle authenticated room instance takeover
CI/CD / test_and_check_app (push) Failing after 2m7s
CI/CD / Publish immutable image (push) Skipped
2026-09-10 16:33:13 +02:00
Twyco 2ab95cebdf do not need login 2026-09-10 16:33:13 +02:00
Twyco 6ca91f3fe9 Merge pull request #11 from ericasch6/kick-player-from-room-styleFixes-pb-function
CI/CD / test_and_check_app (push) Failing after 1m59s
CI/CD / Publish immutable image (push) Skipped
feat: added settings in room to kick
2026-09-10 16:12:05 +02:00
Twyco 2f6cdcf591 fix app version
CI/CD / test_and_check_app (push) Successful in 3m33s
CI/CD / Publish immutable image (push) Successful in 2m20s
2026-09-07 12:10:56 +02:00
Twyco f44d822fa3 test auto update flux
CI/CD / test_and_check_app (push) Successful in 3m36s
CI/CD / Publish immutable image (push) Successful in 2m16s
2026-09-07 11:58:19 +02:00
Eric 817b1ce1cb feat: added settings in room to kick 2026-09-06 16:06:12 +02:00
Twyco 1e0f5cf143 nginex fix
CI/CD / Publish immutable image (push) Canceled after 0s
CI/CD / test_and_check_app (push) Canceled after 3m45s
2026-09-03 15:02:24 +02:00
Twyco 3377a817a3 Merge pull request #7 from ericasch6/codex/remove-moderator-throw-throttle
CI/CD / test_and_check_app (push) Successful in 3m38s
CI/CD / Publish immutable image (push) Successful in 2m18s
removed throttle for mod
2026-09-03 13:39:35 +02:00
Eric 6586ea8ec8 Merge pull request #9 from ericasch6/codex/room-player-kick
CI/CD / test_and_check_app (push) Successful in 3m42s
CI/CD / Publish immutable image (push) Successful in 2m23s
Add room participant moderation
2026-09-03 13:24:39 +02:00
Twyco d2042fb95b removed throttle for mod
CI/CD / test_and_check_app (push) Successful in 3m39s
CI/CD / Publish immutable image (push) Skipped
2026-09-03 13:21:46 +02:00
Eric 164658dae2 Merge pull request #6 from ericasch6/feature/intern-app-integration
Added inern app integration
2026-09-03 13:21:44 +02:00
Twyco 2f05e56089 Add room participant moderation 2026-09-03 11:35:05 +02:00
Twyco e30d2e61aa get color from app
CI/CD / test_and_check_app (push) Successful in 3m30s
CI/CD / Publish immutable image (push) Skipped
2026-09-03 11:18:49 +02:00
Twyco e58a398c07 Added inern app integration 2026-09-02 09:37:11 +02:00
Twyco 8aa6428089 removed nightwatch mcp
CI/CD / test_and_check_app (push) Successful in 34m1s
CI/CD / Publish immutable image (push) Successful in 1h12m39s
2026-09-01 11:59:54 +02:00
67 changed files with 2693 additions and 724 deletions
-4
View File
@@ -1,7 +1,3 @@
[mcp_servers.laravel-boost]
command = "php"
args = ["artisan", "boost:mcp"]
[mcp_servers.nightwatch]
command = "npx"
args = ["-y", "mcp-remote", "https://nightwatch.laravel.com/mcp"]
+1 -1
View File
@@ -49,7 +49,7 @@ jobs:
printf -v run_attempt '%03d' "${GITHUB_RUN_ATTEMPT}"
tag="main-${GITHUB_RUN_NUMBER}-${run_attempt}-${GITHUB_SHA:0:12}"
environment="staging"
vite_app_version="staging-${GITHUB_SHA:0:12}"
vite_app_version="main-${GITHUB_SHA:0:12}"
vite_reverb_app_key="1af96b48d2ef78983e4ef281eed3a48b"
vite_reverb_host="scrum-poker.twyco-staging.de"
;;
+1
View File
@@ -1,3 +1,4 @@
# Scrumpoker without AD's
trigger workflow
+4
View File
@@ -5,6 +5,9 @@ namespace App\Enums;
enum RoomStateChange: string
{
case PlayerJoined = 'player_joined';
case PlayerUpdated = 'player_updated';
case PlayerKicked = 'player_kicked';
case PlayerInstanceReplaced = 'player_instance_replaced';
case VoteChanged = 'vote_changed';
case CardsRevealed = 'cards_revealed';
case VotesReset = 'votes_reset';
@@ -12,4 +15,5 @@ enum RoomStateChange: string
case RoomReopened = 'room_reopened';
case RoomClosed = 'room_closed';
case RoomDeleted = 'room_deleted';
case RoomSettingsUpdated = 'room_settings_updated';
}
+1 -3
View File
@@ -17,7 +17,6 @@ class PaperBallThrown implements ShouldBroadcastNow
public readonly string $roomId,
public readonly int $fromPlayerId,
public readonly int $targetPlayerId,
public readonly int $chargeLevel,
) {}
public function broadcastOn(): Channel
@@ -31,7 +30,7 @@ class PaperBallThrown implements ShouldBroadcastNow
}
/**
* @return array{id: string, from_player_id: int, target_player_id: int, charge_level: int}
* @return array{id: string, from_player_id: int, target_player_id: int}
*/
public function broadcastWith(): array
{
@@ -39,7 +38,6 @@ class PaperBallThrown implements ShouldBroadcastNow
'id' => $this->id,
'from_player_id' => $this->fromPlayerId,
'target_player_id' => $this->targetPlayerId,
'charge_level' => $this->chargeLevel,
];
}
}
+14 -2
View File
@@ -21,6 +21,8 @@ class RoomStateChanged implements ShouldBroadcastNow
public readonly int $version,
public readonly RoomStateChange $change,
public readonly ?array $state = null,
public readonly ?int $affectedPlayerId = null,
public readonly ?string $affectedInstanceId = null,
) {}
public function broadcastOn(): Channel
@@ -34,14 +36,24 @@ class RoomStateChanged implements ShouldBroadcastNow
}
/**
* @return array{version: int, change: string, state: array<string, mixed>|null}
* @return array{version: int, change: string, state: array<string, mixed>|null, affected_player_id?: int, affected_instance_id?: string}
*/
public function broadcastWith(): array
{
return [
$payload = [
'version' => $this->version,
'change' => $this->change->value,
'state' => $this->state,
];
if ($this->affectedPlayerId !== null) {
$payload['affected_player_id'] = $this->affectedPlayerId;
}
if ($this->affectedInstanceId !== null) {
$payload['affected_instance_id'] = $this->affectedInstanceId;
}
return $payload;
}
}
@@ -0,0 +1,45 @@
<?php
namespace App\Http\Controllers;
use App\Models\Room;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class EmbeddedLogoutController extends Controller
{
/**
* Handle the incoming request.
*/
public function __invoke(Request $request): RedirectResponse
{
$joinCode = $request->string('join_code')->trim()->upper()->toString();
$playerName = $request->string('player_name')->trim()->toString();
$room = Room::query()->where('join_code', $joinCode)->first();
$playerId = null;
if ($room !== null) {
$sessionPlayerId = $request->session()->get("room_players.{$room->id}");
if (is_numeric($sessionPlayerId)) {
$playerId = $room->players()
->whereKey((int) $sessionPlayerId)
->value('id');
}
}
Auth::guard('web')->logout();
$request->session()->invalidate();
$request->session()->regenerateToken();
if ($room !== null && is_numeric($playerId)) {
$request->session()->put("room_players.{$room->id}", (int) $playerId);
}
return to_route('embedded.room', [
'join_code' => $joinCode,
'player_name' => $playerName,
]);
}
}
@@ -0,0 +1,53 @@
<?php
namespace App\Http\Controllers;
use App\Http\Requests\ShowEmbeddedRoomRequest;
use App\Http\Resources\CurrentPlayerResource;
use App\Http\Resources\RoomResource;
use App\Models\Room;
use App\Services\Rooms\RoomPageService;
use App\Services\Rooms\RoomParticipationService;
use App\Services\Rooms\RoomPlayerInstanceService;
use Inertia\Inertia;
use Inertia\Response;
class EmbeddedRoomController extends Controller
{
public function __construct(
private readonly RoomParticipationService $roomParticipation,
private readonly RoomPageService $roomPage,
private readonly RoomPlayerInstanceService $playerInstances,
) {}
public function __invoke(ShowEmbeddedRoomRequest $request): Response
{
/** @var array{join_code: string, player_name: string} $validated */
$validated = $request->validated();
$user = $request->user();
$room = Room::query()
->where('join_code', $validated['join_code'])
->firstOrFail();
$player = $this->roomParticipation->joinEmbedded(
$room,
$user,
$validated['player_name'],
$request->session()->get("room_players.{$room->id}"),
);
$player = $this->roomParticipation->activateInstance(
$room,
$player,
$this->playerInstances->for($request),
);
$request->session()->put("room_players.{$room->id}", $player->id);
$pageData = $this->roomPage->prepare($room, $player, $user);
return Inertia::render('embedded/Room', [
'room' => (new RoomResource($pageData))->resolve($request),
'currentPlayer' => (new CurrentPlayerResource($pageData))->resolve($request),
]);
}
}
+5
View File
@@ -10,6 +10,7 @@ use App\Models\Player;
use App\Models\Room;
use App\Services\Rooms\RoomCreationService;
use App\Services\Rooms\RoomPageService;
use App\Services\Rooms\RoomPlayerInstanceService;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Inertia\Inertia;
@@ -20,6 +21,7 @@ class RoomController extends Controller
public function __construct(
private readonly RoomCreationService $roomCreation,
private readonly RoomPageService $roomPage,
private readonly RoomPlayerInstanceService $playerInstances,
) {}
public function create(Request $request): Response
@@ -40,6 +42,9 @@ class RoomController extends Controller
$validated,
$request->user(),
);
$player->update([
'active_instance_id' => $this->playerInstances->for($request),
]);
$request->session()->put(
"room_players.{$room->id}",
@@ -27,7 +27,6 @@ class RoomEmoteController extends Controller
$room,
$player,
(int) $request->validated('target_player_id'),
(int) ($request->validated('charge_percentage') ?? 0),
);
return response()->noContent();
@@ -32,7 +32,6 @@ class RoomJoinController extends Controller
$room !== null
&& ! $room->isClosed()
&& $existingPlayer instanceof Player
&& $existingPlayer->inactive_at === null
) {
return to_route('room.show', $room);
}
@@ -4,12 +4,14 @@ namespace App\Http\Controllers;
use App\Http\Requests\JoinRoomRequest;
use App\Services\Rooms\RoomParticipationService;
use App\Services\Rooms\RoomPlayerInstanceService;
use Illuminate\Http\RedirectResponse;
class RoomPlayerController extends Controller
{
public function __construct(
private readonly RoomParticipationService $roomParticipation,
private readonly RoomPlayerInstanceService $playerInstances,
) {}
public function join(JoinRoomRequest $request): RedirectResponse
@@ -23,6 +25,11 @@ class RoomPlayerController extends Controller
$request->user(),
is_array($sessionPlayerIds) ? $sessionPlayerIds : [],
);
$player = $this->roomParticipation->activateInstance(
$room,
$player,
$this->playerInstances->for($request),
);
$request->session()->put(
"room_players.{$room->id}",
@@ -0,0 +1,34 @@
<?php
namespace App\Http\Controllers;
use App\Http\Requests\KickRoomPlayerRequest;
use App\Models\Player;
use App\Models\Room;
use App\Services\Rooms\RoomParticipationService;
use Illuminate\Http\RedirectResponse;
use Inertia\Inertia;
class RoomPlayerKickController extends Controller
{
public function __construct(
private readonly RoomParticipationService $roomParticipation,
) {}
public function __invoke(KickRoomPlayerRequest $request, Room $room, Player $player): RedirectResponse
{
$this->roomParticipation->kick(
$room,
$player,
$request->user(),
$request->currentPlayer($room),
);
Inertia::flash('toast', [
'type' => 'success',
'message' => "{$player->name} wurde aus dem Raum entfernt.",
]);
return back();
}
}
@@ -0,0 +1,52 @@
<?php
namespace App\Http\Controllers;
use App\Http\Requests\UpdateRoomSettingsRequest;
use App\Models\Room;
use App\Models\User;
use App\Services\Rooms\RoomSettingsService;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Inertia\Inertia;
use Inertia\Response;
class RoomSettingsController extends Controller
{
public function __construct(
private readonly RoomSettingsService $roomSettings,
) {}
public function edit(Room $room, Request $request): Response
{
abort_unless($request->user()?->id === $room->owner_id, 403);
return Inertia::render('rooms/Settings', [
'room' => [
'id' => $room->id,
'title' => $room->title,
'join_code' => $room->join_code,
'allow_participants_to_manage_rounds' => $room->allow_participants_to_manage_rounds,
'is_persistent' => $room->is_persistent,
],
]);
}
public function update(UpdateRoomSettingsRequest $request, Room $room): RedirectResponse
{
$user = $request->user();
abort_unless($user instanceof User, 403);
/** @var array{allow_participants_to_manage_rounds: bool, is_persistent: bool} $settings */
$settings = $request->validated();
$this->roomSettings->update($room, $user, $settings);
Inertia::flash('toast', [
'type' => 'success',
'message' => 'Die Raumeinstellungen wurden gespeichert.',
]);
return back();
}
}
+5 -5
View File
@@ -16,7 +16,7 @@ class RoundController extends Controller
public function reset(Request $request, Room $room): Response
{
$this->ensureModerator($request, $room);
$this->ensureCanManageRounds($request, $room);
$this->rounds->reset($room);
return response()->noContent();
@@ -24,7 +24,7 @@ class RoundController extends Controller
public function reveal(Request $request, Room $room): Response
{
$this->ensureModerator($request, $room);
$this->ensureCanManageRounds($request, $room);
$this->rounds->reveal($room);
return response()->noContent();
@@ -32,20 +32,20 @@ class RoundController extends Controller
public function nextRound(Request $request, Room $room): Response
{
$this->ensureModerator($request, $room);
$this->ensureCanManageRounds($request, $room);
$this->rounds->startNext($room);
return response()->noContent();
}
private function ensureModerator(Request $request, Room $room): void
private function ensureCanManageRounds(Request $request, Room $room): void
{
$player = $request->attributes->get('currentPlayer');
abort_unless(
$player instanceof Player
&& $player->room_id === $room->id
&& $player->is_moderator,
&& ($player->is_moderator || $room->allow_participants_to_manage_rounds),
403,
);
}
+44 -8
View File
@@ -3,6 +3,8 @@
namespace App\Http\Middleware;
use App\Models\Room;
use App\Services\Rooms\RoomParticipationService;
use App\Services\Rooms\RoomPlayerInstanceService;
use Closure;
use Illuminate\Http\Request;
use Inertia\Inertia;
@@ -10,6 +12,11 @@ use Symfony\Component\HttpFoundation\Response;
class EnsureRoomParticipant
{
public function __construct(
private readonly RoomParticipationService $roomParticipation,
private readonly RoomPlayerInstanceService $playerInstances,
) {}
/**
* Handle an incoming request.
*
@@ -44,13 +51,43 @@ class EnsureRoomParticipant
}
$playerId = $request->session()->get($sessionKey);
$hasSessionPlayer = is_numeric($playerId);
$instanceId = $this->playerInstances->for($request);
$player = is_numeric($playerId)
$player = $hasSessionPlayer
? $room->players()->find((int) $playerId)
: null;
if ($player === null && $playerId) {
if ($player === null && $hasSessionPlayer) {
$request->session()->forget($sessionKey);
return to_route('room.join', [
'join_code' => $room->join_code,
])->withErrors([
'join_code' => 'Diese Spieler-Instanz ist nicht mehr aktiv.',
]);
}
if (
$player !== null
&& $player->active_instance_id !== null
&& $player->active_instance_id !== $instanceId
) {
$request->session()->forget($sessionKey);
return to_route('room.join', [
'join_code' => $room->join_code,
])->withErrors([
'join_code' => 'Dein Account ist diesem Raum in einer anderen Instanz beigetreten.',
]);
}
if ($player !== null) {
$player = $this->roomParticipation->activateInstance(
$room,
$player,
$instanceId,
);
}
if ($player === null && $request->user() !== null) {
@@ -59,6 +96,11 @@ class EnsureRoomParticipant
->first();
if ($player !== null) {
$player = $this->roomParticipation->activateInstance(
$room,
$player,
$instanceId,
);
$request->session()->put($sessionKey, $player->id);
}
}
@@ -71,12 +113,6 @@ class EnsureRoomParticipant
]);
}
if ($player->inactive_at !== null) {
return to_route('room.join', [
'join_code' => $room->join_code,
]);
}
$player->markAsSeen();
$request->attributes->set('currentPlayer', $player);
@@ -0,0 +1,63 @@
<?php
namespace App\Http\Requests;
use App\Models\Player;
use App\Models\Room;
use Illuminate\Foundation\Http\FormRequest;
class KickRoomPlayerRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
$room = $this->route('room');
$targetPlayer = $this->route('player');
if (
! $room instanceof Room
|| ! $targetPlayer instanceof Player
|| $targetPlayer->room_id !== $room->id
|| $targetPlayer->is_moderator
|| ($room->owner_id !== null && $targetPlayer->user_id === $room->owner_id)
) {
return false;
}
$user = $this->user();
if ($user !== null && $user->id === $room->owner_id) {
return true;
}
$currentPlayer = $this->currentPlayer($room);
return ! $room->isClosed()
&& $currentPlayer !== null
&& $currentPlayer->id !== $targetPlayer->id
&& ($currentPlayer->is_moderator || $room->allow_participants_to_manage_rounds);
}
public function currentPlayer(Room $room): ?Player
{
$playerId = $this->session()->get("room_players.{$room->id}");
if (! is_numeric($playerId)) {
return null;
}
return $room->players()->find((int) $playerId);
}
/**
* Get the validation rules that apply to the request.
*
* @return array<string, array<int, string>>
*/
public function rules(): array
{
return [];
}
}
@@ -0,0 +1,134 @@
<?php
namespace App\Http\Requests;
use App\Models\Player;
use App\Models\Room;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Contracts\Validation\Validator;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Http\Exceptions\HttpResponseException;
use Illuminate\Validation\Rule;
use Inertia\Inertia;
class ShowEmbeddedRoomRequest extends FormRequest
{
private const string PLAYER_NAME_TAKEN_MESSAGE = 'Dieser Anzeigename ist in dem Raum bereits vorhanden.';
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return true;
}
protected function prepareForValidation(): void
{
$this->merge([
'join_code' => $this->string('join_code')->trim()->upper()->toString(),
'player_name' => $this->string('player_name')->trim()->toString(),
]);
}
/**
* Get the validation rules that apply to the request.
*
* @return array<string, ValidationRule|array<mixed>|string>
*/
public function rules(): array
{
return [
'join_code' => [
'bail',
'required',
'string',
'size:6',
Rule::exists(Room::class, 'join_code')->whereNull('deleted_at'),
],
'player_name' => ['required', 'string', 'max:50'],
];
}
/** @return array<callable(Validator): void> */
public function after(): array
{
return [
function (Validator $validator): void {
if ($validator->errors()->has('join_code')) {
return;
}
$room = Room::query()
->where('join_code', $this->input('join_code'))
->first();
if ($room?->isClosed()) {
$validator->errors()->add('join_code', 'Dieser Raum ist geschlossen.');
return;
}
if ($room === null) {
return;
}
$sessionPlayerId = $this->session()->get("room_players.{$room->id}");
$existingPlayer = null;
if ($this->user() !== null) {
$existingPlayer = $room->players()
->where('user_id', $this->user()->id)
->first();
}
if ($existingPlayer === null && is_numeric($sessionPlayerId)) {
$existingPlayer = $room->players()->find((int) $sessionPlayerId);
}
$nameIsTaken = Player::query()
->where('room_id', $room->id)
->where('name', $this->input('player_name'))
->when(
$existingPlayer !== null,
fn ($query) => $query->whereKeyNot($existingPlayer->id),
)
->exists();
if ($nameIsTaken) {
$validator->errors()->add(
'player_name',
self::PLAYER_NAME_TAKEN_MESSAGE,
);
}
},
];
}
public function messages(): array
{
return [
'join_code.exists' => 'Dieser Raumcode existiert nicht.',
'join_code.size' => 'Der Raumcode muss aus sechs Zeichen bestehen.',
'player_name.required' => 'Bitte hinterlege in der Hub-App einen Anzeigenamen.',
];
}
protected function failedValidation(Validator $validator): never
{
$message = $validator->errors()->first();
$showLoginAction = $this->user() === null
&& $message === self::PLAYER_NAME_TAKEN_MESSAGE;
if ($showLoginAction) {
$this->session()->put('url.intended', $this->fullUrl());
}
throw new HttpResponseException(
Inertia::render('embedded/Error', [
'message' => $message,
'showLoginAction' => $showLoginAction,
])->toResponse($this)->setStatusCode(422),
);
}
}
@@ -19,7 +19,6 @@ class ThrowPaperBallRequest extends FormRequest
{
return [
'target_player_id' => ['required', 'integer'],
'charge_percentage' => ['sometimes', 'integer', 'between:0,300'],
];
}
}
@@ -0,0 +1,33 @@
<?php
namespace App\Http\Requests;
use App\Models\Room;
use Illuminate\Foundation\Http\FormRequest;
class UpdateRoomSettingsRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
$room = $this->route('room');
return $room instanceof Room
&& $this->user()?->id === $room->owner_id;
}
/**
* Get the validation rules that apply to the request.
*
* @return array<string, array<int, string>>
*/
public function rules(): array
{
return [
'allow_participants_to_manage_rounds' => ['required', 'boolean'],
'is_persistent' => ['required', 'boolean'],
];
}
}
@@ -19,6 +19,7 @@ class CurrentPlayerResource extends JsonResource
return [
'id' => $player->id,
'instance_id' => $player->active_instance_id,
'name' => $player->name,
'is_moderator' => $player->is_moderator,
'current_vote' => $pageData->currentVote,
+11 -1
View File
@@ -18,7 +18,17 @@ class DashboardRoomResource extends JsonResource
'join_code' => $this->resource->join_code,
'current_round' => $this->resource->current_round,
'players_count' => $this->resource->players_count,
'active_player_count' => $this->resource->active_player_count,
'players' => $this->resource->relationLoaded('players')
? $this->resource->players
->map(fn ($player): array => [
'id' => $player->id,
'name' => $player->name,
'is_moderator' => $player->is_moderator,
'is_owner' => $player->user_id === $this->resource->owner_id,
])
->values()
->all()
: [],
'last_activity_at' => $this->resource->last_activity_at?->toIso8601String(),
'closed_at' => $this->resource->closed_at?->toIso8601String(),
];
+2
View File
@@ -26,6 +26,8 @@ class RoomResource extends JsonResource
'current_round' => $room->current_round,
'revealed' => $room->revealed_at !== null,
'state_version' => $room->state_version,
'allow_participants_to_manage_rounds' => $room->allow_participants_to_manage_rounds,
'is_persistent' => $room->is_persistent,
'statistics' => $pageData->statistics,
'deck' => (new RoomDeckResource($room->deck_config))->resolve($request),
'players' => $room->players
+7 -1
View File
@@ -21,6 +21,7 @@ class CloseInactiveRooms implements ShouldQueue
Room::query()
->whereNull('closed_at')
->where('is_persistent', false)
->where(function ($query) use ($guestCutoff, $accountCutoff): void {
$query
->where(function ($query) use ($guestCutoff): void {
@@ -40,7 +41,12 @@ class CloseInactiveRooms implements ShouldQueue
->lockForUpdate()
->find((string) $roomId);
if ($room === null || $room->isClosed() || $room->last_activity_at === null) {
if (
$room === null
|| $room->isClosed()
|| $room->is_persistent
|| $room->last_activity_at === null
) {
return null;
}
-22
View File
@@ -1,22 +0,0 @@
<?php
namespace App\Jobs;
use App\Models\Player;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Queue\Queueable;
class MarkInactivePlayers implements ShouldQueue
{
use Queueable;
public function handle(): void
{
Player::query()
->whereNull('inactive_at')
->where('last_seen_at', '<=', now()->subHour())
->update([
'inactive_at' => now(),
]);
}
}
+76
View File
@@ -0,0 +1,76 @@
<?php
namespace App\Jobs;
use App\Enums\RoomStateChange;
use App\Events\RoomStateChanged;
use App\Models\Player;
use App\Models\Room;
use App\Services\Rooms\RoomRealtimeStateService;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Queue\Queueable;
use Illuminate\Support\Facades\DB;
class RemoveAbsentPlayers implements ShouldQueue
{
use Queueable;
public function handle(RoomRealtimeStateService $realtimeState): void
{
$cutoff = now()->subHour();
Player::query()
->where(function ($query) use ($cutoff): void {
$query->where('last_seen_at', '<=', $cutoff)
->orWhere(function ($query) use ($cutoff): void {
$query->whereNull('last_seen_at')
->where('created_at', '<=', $cutoff);
});
})
->select(['id', 'room_id'])
->chunkById(100, function ($players) use ($cutoff, $realtimeState): void {
foreach ($players as $player) {
$room = DB::transaction(function () use ($player, $cutoff): ?Room {
$room = Room::withTrashed()
->lockForUpdate()
->find($player->room_id);
if ($room === null) {
return null;
}
$currentPlayer = $room->players()
->lockForUpdate()
->find($player->id);
if ($currentPlayer === null) {
return null;
}
$lastActivity = $currentPlayer->last_seen_at ?? $currentPlayer->created_at;
if ($lastActivity === null || $lastActivity->greaterThan($cutoff)) {
return null;
}
$currentPlayer->delete();
$room->update([
'state_version' => $room->state_version + 1,
]);
return $room;
});
if ($room !== null && ! $room->trashed()) {
RoomStateChanged::dispatch(
$room->id,
$room->state_version,
RoomStateChange::PlayerKicked,
$realtimeState->for($room),
$player->id,
);
}
}
});
}
}
+2 -14
View File
@@ -2,7 +2,6 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -12,10 +11,10 @@ use Illuminate\Support\Carbon;
* @property int $id
* @property string $room_id
* @property int|null $user_id
* @property string|null $active_instance_id
* @property string $name
* @property bool $is_moderator
* @property Carbon|null $last_seen_at
* @property Carbon|null $inactive_at
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property-read Room $room
@@ -25,10 +24,10 @@ class Player extends Model
protected $fillable = [
'room_id',
'user_id',
'active_instance_id',
'name',
'is_moderator',
'last_seen_at',
'inactive_at',
];
protected function casts(): array
@@ -36,7 +35,6 @@ class Player extends Model
return [
'is_moderator' => 'boolean',
'last_seen_at' => 'datetime',
'inactive_at' => 'datetime',
];
}
@@ -83,14 +81,4 @@ class Player extends Model
'last_seen_at' => now(),
]);
}
/**
* @param Builder<Player> $query
* @return Builder<Player>
*/
public function scopeActive(Builder $query): Builder
{
return $query->whereNull('inactive_at');
}
}
+11 -6
View File
@@ -22,6 +22,8 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @property CarbonImmutable|null $last_activity_at
* @property CarbonImmutable|null $closed_at
* @property CarbonImmutable|null $deleted_at
* @property bool $allow_participants_to_manage_rounds
* @property bool $is_persistent
* @property int $players_count
*/
class Room extends Model
@@ -37,6 +39,13 @@ class Room extends Model
'state_version',
'last_activity_at',
'closed_at',
'allow_participants_to_manage_rounds',
'is_persistent',
];
protected $attributes = [
'allow_participants_to_manage_rounds' => false,
'is_persistent' => false,
];
protected function casts(): array
@@ -48,6 +57,8 @@ class Room extends Model
'last_activity_at' => 'immutable_datetime',
'closed_at' => 'immutable_datetime',
'deck_config' => 'array',
'allow_participants_to_manage_rounds' => 'boolean',
'is_persistent' => 'boolean',
];
}
@@ -82,12 +93,6 @@ class Room extends Model
}
/** @return HasMany<Player, $this> */
public function activePlayers(): HasMany
{
return $this->hasMany(Player::class)->whereNull('inactive_at');
}
/** @return BelongsTo<User, $this> */
public function owner(): BelongsTo
{
+6 -2
View File
@@ -15,8 +15,13 @@ class DashboardRoomService
{
$ownedRooms = $user
->ownedRooms()
->with([
'players' => fn ($query) => $query
->select(['id', 'room_id', 'user_id', 'name', 'is_moderator', 'created_at'])
->orderByDesc('is_moderator')
->orderBy('created_at'),
])
->withCount('players')
->withCount(['activePlayers as active_player_count'])
->orderByRaw('closed_at IS NOT NULL')
->orderByDesc('last_activity_at')
->get();
@@ -24,7 +29,6 @@ class DashboardRoomService
$favoriteRooms = $user
->favoriteRooms()
->withCount('players')
->withCount(['activePlayers as active_player_count'])
->orderByRaw('closed_at IS NOT NULL')
->orderByDesc('last_activity_at')
->get();
+11 -21
View File
@@ -11,12 +11,8 @@ use Illuminate\Validation\ValidationException;
class RoomEmoteService
{
public function throwPaperBall(
Room $room,
Player $player,
int $targetPlayerId,
int $chargePercentage,
): void {
public function throwPaperBall(Room $room, Player $player, int $targetPlayerId): void
{
if ($targetPlayerId === $player->id) {
throw ValidationException::withMessages([
'target_player_id' => 'Du kannst dich nicht selbst abwerfen.',
@@ -33,29 +29,23 @@ class RoomEmoteService
]);
}
$rateLimitKey = "room-emote:{$room->id}:{$player->id}";
if (! $player->isModerator()) {
$rateLimitKey = "room-emote:{$room->id}:{$player->id}";
abort_if(
RateLimiter::tooManyAttempts($rateLimitKey, 10),
429,
'Bitte warte kurz, bevor du erneut wirfst.',
);
abort_if(
RateLimiter::tooManyAttempts($rateLimitKey, 10),
429,
'Bitte warte kurz, bevor du erneut wirfst.',
);
RateLimiter::hit($rateLimitKey, 10);
$chargeLevel = match (true) {
$chargePercentage >= 300 => 3,
$chargePercentage >= 200 => 2,
$chargePercentage >= 100 => 1,
default => 0,
};
RateLimiter::hit($rateLimitKey, 10);
}
PaperBallThrown::dispatch(
Str::uuid()->toString(),
$room->id,
$player->id,
$targetPlayerId,
$chargeLevel,
);
}
}
-1
View File
@@ -20,7 +20,6 @@ class RoomPageService
$room->load([
'players' => fn ($query) => $query
->active()
->select(['id', 'room_id', 'user_id', 'name', 'is_moderator', 'created_at'])
->orderByDesc('is_moderator')
->orderBy('created_at'),
+225 -1
View File
@@ -80,7 +80,6 @@ class RoomParticipationService
} else {
$player->update([
'last_seen_at' => now(),
'inactive_at' => null,
]);
}
@@ -101,4 +100,229 @@ class RoomParticipationService
return [$room, $player];
}
public function joinEmbedded(
Room $room,
?User $user,
string $playerName,
mixed $sessionPlayerId,
): Player {
[$player, $change, $stateVersion] = DB::transaction(function () use ($room, $user, $playerName, $sessionPlayerId): array {
$lockedRoom = Room::query()
->lockForUpdate()
->findOrFail($room->id);
if ($lockedRoom->isClosed()) {
throw ValidationException::withMessages([
'join_code' => 'Dieser Raum ist geschlossen.',
]);
}
$player = $this->findExistingEmbeddedPlayer(
$lockedRoom,
$user,
$sessionPlayerId,
);
$nameIsTaken = $lockedRoom->players()
->where('name', $playerName)
->when(
$player !== null,
fn ($query) => $query->whereKeyNot($player->id),
)
->exists();
if ($nameIsTaken) {
throw ValidationException::withMessages([
'player_name' => 'Dieser Anzeigename ist in dem Raum bereits vorhanden.',
]);
}
$change = null;
if ($player === null) {
$player = $lockedRoom->players()->create([
'user_id' => $user?->id,
'name' => $playerName,
'is_moderator' => false,
'last_seen_at' => now(),
]);
$change = RoomStateChange::PlayerJoined;
} else {
if ($player->name !== $playerName) {
$change = RoomStateChange::PlayerUpdated;
}
$updates = [
'name' => $playerName,
'last_seen_at' => now(),
];
if (
$user !== null
&& $player->user_id === null
&& ! $lockedRoom->players()
->where('user_id', $user->id)
->whereKeyNot($player->id)
->exists()
) {
$updates['user_id'] = $user->id;
}
$player->update($updates);
}
if ($change === null) {
return [$player, null, null];
}
$lockedRoom->update([
'last_activity_at' => now(),
'state_version' => $lockedRoom->state_version + 1,
]);
return [$player, $change, $lockedRoom->state_version];
});
if ($change instanceof RoomStateChange && is_int($stateVersion)) {
RoomStateChanged::dispatch(
$room->id,
$stateVersion,
$change,
$this->realtimeState->for($room),
);
}
return $player;
}
private function findExistingEmbeddedPlayer(
Room $room,
?User $user,
mixed $sessionPlayerId,
): ?Player {
if ($user !== null) {
$userPlayer = $room->players()
->where('user_id', $user->id)
->lockForUpdate()
->first();
if ($userPlayer !== null) {
return $userPlayer;
}
}
if (is_numeric($sessionPlayerId)) {
$sessionPlayer = $room->players()
->whereKey((int) $sessionPlayerId)
->lockForUpdate()
->first();
if ($sessionPlayer !== null) {
return $sessionPlayer;
}
}
return null;
}
public function activateInstance(Room $room, Player $player, string $instanceId): Player
{
[$activePlayer, $replacedInstanceId, $stateVersion] = DB::transaction(function () use ($room, $player, $instanceId): array {
$lockedRoom = Room::query()
->lockForUpdate()
->findOrFail($room->id);
$lockedPlayer = $lockedRoom->players()
->lockForUpdate()
->findOrFail($player->id);
if ($lockedPlayer->active_instance_id === $instanceId) {
return [$lockedPlayer, null, null];
}
$replacedInstanceId = $lockedPlayer->active_instance_id;
$lockedPlayer->update([
'active_instance_id' => $instanceId,
'last_seen_at' => now(),
]);
if ($replacedInstanceId === null) {
return [$lockedPlayer, null, null];
}
$lockedRoom->update([
'last_activity_at' => now(),
'state_version' => $lockedRoom->state_version + 1,
]);
return [$lockedPlayer, $replacedInstanceId, $lockedRoom->state_version];
});
if (is_string($replacedInstanceId) && is_int($stateVersion)) {
RoomStateChanged::dispatch(
$room->id,
$stateVersion,
RoomStateChange::PlayerInstanceReplaced,
$this->realtimeState->for($room),
$activePlayer->id,
$replacedInstanceId,
);
}
return $activePlayer;
}
public function kick(
Room $room,
Player $player,
?User $user,
?Player $currentPlayer,
): void {
$stateVersion = DB::transaction(function () use ($room, $player, $user, $currentPlayer): int {
$lockedRoom = Room::query()
->lockForUpdate()
->findOrFail($room->id);
$lockedCurrentPlayer = $currentPlayer === null
? null
: $lockedRoom->players()
->lockForUpdate()
->find($currentPlayer->id);
$isOwner = $user !== null && $lockedRoom->owner_id === $user->id;
$participantCanManage = ! $lockedRoom->isClosed()
&& $lockedCurrentPlayer !== null
&& ($lockedCurrentPlayer->is_moderator
|| $lockedRoom->allow_participants_to_manage_rounds);
abort_unless($isOwner || $participantCanManage, 403);
$lockedPlayer = $lockedRoom->players()
->lockForUpdate()
->findOrFail($player->id);
abort_if(
$lockedPlayer->is_moderator
|| ($lockedRoom->owner_id !== null
&& $lockedPlayer->user_id === $lockedRoom->owner_id)
|| $lockedCurrentPlayer?->id === $lockedPlayer->id,
403,
);
$lockedPlayer->delete();
$lockedRoom->update([
'last_activity_at' => now(),
'state_version' => $lockedRoom->state_version + 1,
]);
return $lockedRoom->state_version;
});
RoomStateChanged::dispatch(
$room->id,
$stateVersion,
RoomStateChange::PlayerKicked,
$this->realtimeState->for($room),
$player->id,
);
}
}
@@ -0,0 +1,25 @@
<?php
namespace App\Services\Rooms;
use Illuminate\Http\Request;
use Illuminate\Support\Str;
class RoomPlayerInstanceService
{
private const string SESSION_KEY = 'room_player_instance_id';
public function for(Request $request): string
{
$instanceId = $request->session()->get(self::SESSION_KEY);
if (is_string($instanceId) && Str::isUuid($instanceId)) {
return $instanceId;
}
$instanceId = (string) Str::uuid();
$request->session()->put(self::SESSION_KEY, $instanceId);
return $instanceId;
}
}
@@ -15,6 +15,7 @@ class RoomRealtimeStateService
* current_round: int,
* revealed: bool,
* state_version: int,
* allow_participants_to_manage_rounds: bool,
* statistics: array{average: string|null, median: string|null}|null,
* players: array<int, array{
* id: int,
@@ -31,7 +32,6 @@ class RoomRealtimeStateService
$room->refresh();
$room->load([
'players' => fn ($query) => $query
->active()
->select(['id', 'room_id', 'user_id', 'name', 'is_moderator', 'created_at'])
->orderByDesc('is_moderator')
->orderBy('created_at'),
@@ -44,6 +44,7 @@ class RoomRealtimeStateService
'current_round' => $room->current_round,
'revealed' => $room->revealed_at !== null,
'state_version' => $room->state_version,
'allow_participants_to_manage_rounds' => $room->allow_participants_to_manage_rounds,
'statistics' => $this->statistics->currentRound($room),
'players' => $room->players
->map(function ($player) use ($room): array {
@@ -0,0 +1,50 @@
<?php
namespace App\Services\Rooms;
use App\Enums\RoomStateChange;
use App\Events\RoomStateChanged;
use App\Models\Room;
use App\Models\User;
use Illuminate\Support\Facades\DB;
class RoomSettingsService
{
public function __construct(
private readonly RoomRealtimeStateService $realtimeState,
) {}
/** @param array{allow_participants_to_manage_rounds: bool, is_persistent: bool} $settings */
public function update(Room $room, User $user, array $settings): void
{
$stateVersion = DB::transaction(function () use ($room, $user, $settings): ?int {
$lockedRoom = Room::query()
->lockForUpdate()
->findOrFail($room->id);
abort_unless($lockedRoom->owner_id === $user->id, 403);
$lockedRoom->fill($settings);
if (! $lockedRoom->isDirty()) {
return null;
}
$lockedRoom->state_version++;
$lockedRoom->save();
return $lockedRoom->state_version;
});
if ($stateVersion === null) {
return;
}
RoomStateChanged::dispatch(
$room->id,
$stateVersion,
RoomStateChange::RoomSettingsUpdated,
$this->realtimeState->for($room),
);
}
}
@@ -0,0 +1,32 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('rooms', function (Blueprint $table) {
$table->boolean('allow_participants_to_manage_rounds')->default(false);
$table->boolean('is_persistent')->default(false);
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('rooms', function (Blueprint $table) {
$table->dropColumn([
'allow_participants_to_manage_rounds',
'is_persistent',
]);
});
}
};
@@ -0,0 +1,28 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('players', function (Blueprint $table) {
$table->uuid('active_instance_id')->nullable()->after('user_id');
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('players', function (Blueprint $table) {
$table->dropColumn('active_instance_id');
});
}
};
@@ -0,0 +1,42 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
$cutoff = now()->subHour();
DB::table('players')
->where(function ($query) use ($cutoff): void {
$query->whereNotNull('inactive_at')
->orWhere('last_seen_at', '<=', $cutoff)
->orWhere(function ($query) use ($cutoff): void {
$query->whereNull('last_seen_at')
->where('created_at', '<=', $cutoff);
});
})
->delete();
Schema::table('players', function (Blueprint $table): void {
$table->dropColumn('inactive_at');
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('players', function (Blueprint $table): void {
$table->timestamp('inactive_at')->nullable()->after('last_seen_at');
});
}
};
+2
View File
@@ -38,6 +38,8 @@ http {
location = /index.php {
include /etc/nginx/fastcgi_params;
fastcgi_buffer_size 32k;
fastcgi_buffers 8 32k;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param HTTP_PROXY '';
fastcgi_param HTTP_X_FORWARDED_FOR $http_x_forwarded_for;
+4 -3
View File
@@ -4,6 +4,7 @@
"requires": true,
"packages": {
"": {
"name": "scrum-poker-internal",
"dependencies": {
"@inertiajs/vite": "^3.0.0",
"@inertiajs/vue3": "^3.0.0",
@@ -4959,9 +4960,9 @@
}
},
"node_modules/js-yaml": {
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.1.tgz",
"integrity": "sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==",
"version": "4.3.2",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.2.tgz",
"integrity": "sha512-SFNOvSJ+Dgf/9An904Yx+CgSlIPCkIpao4qo51lpee25TIRejdH3rhR4EZMGoNx3/TP3O+wzWuiTFl4sqbltzA==",
"dev": true,
"funding": [
{
+2 -2
View File
@@ -9,8 +9,8 @@ const appName = import.meta.env.VITE_APP_NAME || 'Laravel';
createInertiaApp({
title: (title) => (title ? `${title} - ${appName}` : appName),
layout: () => {
return PublicLayout;
layout: (name) => {
return name.startsWith('embedded/') ? null : PublicLayout;
},
progress: {
+139 -2
View File
@@ -1,6 +1,12 @@
<script setup lang="ts">
import { Link, useForm } from '@inertiajs/vue3';
import { DoorOpen, Plus, Trash2 } from '@lucide/vue';
import {
DoorOpen,
Plus,
Settings as SettingsIcon,
Trash2,
UserMinus,
} from '@lucide/vue';
import { ref } from 'vue';
import DashboardRoomCard from '@/components/dashboard/DashboardRoomCard.vue';
@@ -13,12 +19,23 @@ import {
DialogTitle,
} from '@/components/ui/dialog';
import { create, destroy, reopen, show } from '@/routes/room';
import type { DashboardRoom, OwnedRoomListProps } from '@/types/dashboard';
import { destroy as kickRoomPlayer } from '@/routes/room/player';
import { edit as roomSettings } from '@/routes/room/settings';
import type {
DashboardRoom,
DashboardRoomPlayer,
OwnedRoomListProps,
} from '@/types/dashboard';
defineProps<OwnedRoomListProps>();
const selectedRoom = ref<DashboardRoom | null>(null);
const selectedPlayer = ref<{
room: DashboardRoom;
player: DashboardRoomPlayer;
} | null>(null);
const deleteForm = useForm({});
const kickForm = useForm({});
function setDeleteDialogOpen(open: boolean): void {
if (!open && !deleteForm.processing) {
@@ -26,6 +43,12 @@ function setDeleteDialogOpen(open: boolean): void {
}
}
function setKickDialogOpen(open: boolean): void {
if (!open && !kickForm.processing) {
selectedPlayer.value = null;
}
}
function deleteRoom(): void {
if (selectedRoom.value === null || deleteForm.processing) {
return;
@@ -38,6 +61,25 @@ function deleteRoom(): void {
},
});
}
function kickPlayer(): void {
if (selectedPlayer.value === null || kickForm.processing) {
return;
}
kickForm.delete(
kickRoomPlayer({
room: selectedPlayer.value.room.id,
player: selectedPlayer.value.player.id,
}).url,
{
preserveScroll: true,
onSuccess: () => {
selectedPlayer.value = null;
},
},
);
}
</script>
<template>
@@ -91,6 +133,14 @@ function deleteRoom(): void {
Raum öffnen
</Link>
<Link
:href="roomSettings(room.id)"
class="inline-flex items-center gap-2 rounded-md px-3 py-2 text-sm font-semibold transition hover:bg-slate-700"
>
<SettingsIcon class="size-4" />
Einstellungen
</Link>
<button
type="button"
class="inline-flex items-center gap-2 rounded-md px-3 py-2 text-sm font-semibold text-rose-300 transition hover:bg-rose-500/80"
@@ -99,6 +149,56 @@ function deleteRoom(): void {
<Trash2 class="size-4" />
Raum löschen
</button>
<div
class="mt-2 w-full rounded-md border border-slate-700 bg-slate-900/40 p-3"
>
<h3 class="text-sm font-semibold">Teilnehmer</h3>
<ul
v-if="room.players.length > 0"
class="mt-2 flex flex-col gap-2"
>
<li
v-for="player in room.players"
:key="player.id"
class="flex items-center justify-between gap-3 rounded-md bg-slate-800 px-3 py-2"
>
<span class="min-w-0">
<span
class="block truncate text-sm"
:class="
player.is_moderator
? 'text-amber-300'
: 'text-slate-100'
"
>
{{ player.name }}
</span>
</span>
<span
v-if="player.is_owner"
class="shrink-0 text-xs text-slate-400"
>
Du
</span>
<button
v-else
type="button"
class="inline-flex shrink-0 items-center gap-1.5 rounded-md px-2.5 py-1.5 text-xs font-semibold text-rose-300 transition hover:bg-rose-500/20 hover:text-rose-200"
@click="selectedPlayer = { room, player }"
>
<UserMinus class="size-3.5" />
Kicken
</button>
</li>
</ul>
<p v-else class="mt-2 text-sm text-slate-400">
Aktuell sind keine Teilnehmer im Raum.
</p>
</div>
</template>
</DashboardRoomCard>
</div>
@@ -164,5 +264,42 @@ function deleteRoom(): void {
</DialogFooter>
</DialogContent>
</Dialog>
<Dialog
:open="selectedPlayer !== null"
@update:open="setKickDialogOpen"
>
<DialogContent
class="border-slate-700 bg-slate-800 text-slate-100 sm:max-w-md"
>
<DialogHeader>
<DialogTitle>Teilnehmer wirklich kicken?</DialogTitle>
<DialogDescription class="text-slate-300">
{{ selectedPlayer?.player.name }} wird aus „{{
selectedPlayer?.room.title ?? 'Scrum Poker'
}}“ entfernt und zur Startseite weitergeleitet.
</DialogDescription>
</DialogHeader>
<DialogFooter class="gap-6 space-x-4 sm:gap-0">
<button
type="button"
class="rounded-md border border-slate-600 px-4 py-2 text-sm font-semibold text-slate-200 transition hover:bg-slate-700"
:disabled="kickForm.processing"
@click="selectedPlayer = null"
>
Abbrechen
</button>
<button
type="button"
class="rounded-md bg-rose-600 px-4 py-2 text-sm font-semibold text-white transition hover:bg-rose-500 disabled:opacity-50"
:disabled="kickForm.processing"
@click="kickPlayer"
>
{{ kickForm.processing ? 'Wird entfernt …' : 'Kicken' }}
</button>
</DialogFooter>
</DialogContent>
</Dialog>
</section>
</template>
@@ -47,8 +47,7 @@ function formatDate(value: string | null): string {
<div class="mt-5 grid grid-cols-2 gap-3 text-sm text-muted-foreground">
<span class="inline-flex items-center gap-2">
<Users class="size-4" />
{{ room.players_count }} Spieler /
{{ room.active_player_count }} aktiv
{{ room.players_count }} Spieler
</span>
<span>Runde {{ room.current_round }}</span>
<span class="col-span-2 inline-flex items-center gap-2">
@@ -0,0 +1,98 @@
<script setup lang="ts">
import { Head, usePage } from '@inertiajs/vue3';
import { computed, ref } from 'vue';
import RoomHeader from '@/components/rooms/RoomHeader.vue';
import RoomRetentionNotice from '@/components/rooms/RoomRetentionNotice.vue';
import RoomTable from '@/components/rooms/RoomTable.vue';
import RoomVoteDeck from '@/components/rooms/RoomVoteDeck.vue';
import { useRoomRealtime } from '@/composables/useRoomRealtime';
import type { RoomExperienceProps } from '@/types/room';
const props = withDefaults(defineProps<RoomExperienceProps>(), {
embedded: false,
});
const page = usePage();
const presenterMode = ref(false);
const roomNotice = computed(() => page.props.roomNotice);
const isAuthenticated = computed(() => page.props.auth.user !== null);
const embeddedBackgroundColor = computed(() => {
if (!props.embedded) {
return undefined;
}
const backgroundColor = new URL(
page.url,
'https://embedded.invalid',
).searchParams.get('background_color');
return backgroundColor && /^#[0-9a-f]{6}$/i.test(backgroundColor)
? backgroundColor
: undefined;
});
const canFavorite = computed(
() => !props.embedded && page.props.auth.user?.id != props.room.owner_id,
);
const {
room: realtimeRoom,
currentPlayer: realtimeCurrentPlayer,
setCurrentVote,
} = useRoomRealtime(
() => props.room,
() => props.currentPlayer,
);
</script>
<template>
<Head :title="realtimeRoom.title ?? 'Scrum Poker'" />
<main
class="min-h-svh bg-slate-900 px-3 py-6 text-white sm:px-6 md:flex md:min-h-0 md:flex-col md:overflow-hidden lg:px-10"
:style="
embeddedBackgroundColor
? { backgroundColor: embeddedBackgroundColor }
: undefined
"
:class="
embedded
? 'md:h-dvh'
: '-m-6 min-h-[calc(100svh-4rem)] md:h-[calc(100dvh-4rem-1px)]'
"
>
<RoomRetentionNotice v-if="roomNotice" :notice="roomNotice" />
<RoomHeader
:id="realtimeRoom.id"
:title="realtimeRoom.title"
:join_code="realtimeRoom.join_code"
:is_favorite="realtimeRoom.is_favorite"
:players="realtimeRoom.players"
:can-favorite="canFavorite"
:can-manage-participants="
realtimeCurrentPlayer.is_moderator ||
realtimeRoom.allow_participants_to_manage_rounds
"
:current-player-id="realtimeCurrentPlayer.id"
:can-logout="embedded && isAuthenticated"
:player-name="realtimeCurrentPlayer.name"
v-model:presenter-mode="presenterMode"
/>
<RoomTable
:room="realtimeRoom"
:current-player="realtimeCurrentPlayer"
:presenter-mode="presenterMode"
/>
<RoomVoteDeck
:room-id="realtimeRoom.id"
:revealed="realtimeRoom.revealed"
:cards="realtimeRoom.deck.cards"
:current-vote="realtimeCurrentPlayer.current_vote"
:presenter-mode="presenterMode"
@vote-changed="setCurrentVote"
/>
</main>
</template>
+269 -56
View File
@@ -1,16 +1,65 @@
<script setup lang="ts">
import { Link } from '@inertiajs/vue3';
import { Check, Copy } from '@lucide/vue';
import { Link, useForm } from '@inertiajs/vue3';
import { Check, Copy, LogOut, Settings, UserMinus, Users } from '@lucide/vue';
import { ref } from 'vue';
import { Checkbox } from '@/components/ui/checkbox';
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
} from '@/components/ui/dialog';
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuLabel,
DropdownMenuTrigger,
} from '@/components/ui/dropdown-menu';
import { logout as embeddedLogout } from '@/routes/embedded';
import { favorite } from '@/routes/room';
import type { RoomHeaderEmits, RoomHeaderProps } from '@/types/room';
import { destroy as kickRoomPlayer } from '@/routes/room/player';
import type {
RoomHeaderEmits,
RoomHeaderProps,
RoomPlayer,
} from '@/types/room';
const props = defineProps<RoomHeaderProps>();
const emit = defineEmits<RoomHeaderEmits>();
const copied = ref(false);
const participantsDialogOpen = ref(false);
const selectedPlayer = ref<RoomPlayer | null>(null);
const kickForm = useForm({});
function kickPlayer(): void {
if (selectedPlayer.value === null || kickForm.processing) {
return;
}
kickForm.delete(
kickRoomPlayer({
room: props.id,
player: selectedPlayer.value.id,
}).url,
{
preserveScroll: true,
onSuccess: () => {
selectedPlayer.value = null;
},
},
);
}
function setKickDialogOpen(open: boolean): void {
if (!open && !kickForm.processing) {
selectedPlayer.value = null;
}
}
async function copyInviteLink(): Promise<void> {
const inviteUrl = new URL('/room/join', window.location.origin);
@@ -25,61 +74,225 @@ async function copyInviteLink(): Promise<void> {
</script>
<template>
<header
class="mx-auto flex w-full max-w-6xl flex-col gap-4 sm:flex-row sm:items-center sm:justify-between"
>
<div>
<h1 class="text-2xl font-bold sm:text-3xl">
{{ title ?? 'Scrum Poker' }}
</h1>
<div class="contents">
<header
class="mx-auto flex w-full max-w-6xl flex-col gap-4 sm:flex-row sm:items-center sm:justify-between"
>
<div>
<h1 class="text-2xl font-bold sm:text-3xl">
{{ title ?? 'Scrum Poker' }}
</h1>
<Link
v-if="canFavorite"
:href="favorite(id)"
method="post"
as="button"
class="mt-2 inline-flex items-center gap-2"
>
<span>Favorit</span>
<span class="material-icons" aria-hidden="true">
{{ is_favorite ? 'favorite' : 'favorite_border' }}
</span>
</Link>
</div>
<div class="flex flex-col items-end gap-2">
<button
type="button"
class="flex w-fit items-center gap-3 rounded-xl border border-slate-700 bg-slate-800 px-4 py-2.5 text-left transition hover:bg-slate-700 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-cyan-300"
@click="copyInviteLink"
>
<span>
<span
class="block text-sm tracking-[0.18em] text-slate-400"
>
Raumcode
<Link
v-if="canFavorite"
:href="favorite(id)"
method="post"
as="button"
class="mt-2 inline-flex items-center gap-2"
>
<span>Favorit</span>
<span class="material-icons" aria-hidden="true">
{{ is_favorite ? 'favorite' : 'favorite_border' }}
</span>
<strong class="font-mono text-lg tracking-[0.2em]">
{{ join_code }}
</strong>
</span>
<Check v-if="copied" class="size-5 text-emerald-300" />
<Copy v-else class="size-5 text-slate-300" />
</button>
</Link>
</div>
<label
for="presenter-mode"
class="flex cursor-pointer items-center gap-2 text-sm text-slate-300"
>
<Checkbox
id="presenter-mode"
:model-value="presenterMode"
@update:model-value="
emit('update:presenterMode', $event === true)
<div class="flex flex-col items-end gap-2">
<Link
v-if="canLogout"
:href="
embeddedLogout({
query: {
join_code,
player_name: playerName,
},
})
"
/>
<span>Präsentatormodus</span>
</label>
</div>
</header>
method="post"
as="button"
class="inline-flex items-center gap-2 text-sm text-slate-300 transition hover:text-white"
>
<LogOut class="size-4" />
Abmelden
</Link>
<div class="flex items-center gap-2">
<DropdownMenu v-if="canManageParticipants">
<DropdownMenuTrigger :as-child="true">
<button
type="button"
class="inline-flex size-11 items-center justify-center rounded-xl border border-slate-700 bg-slate-800 text-slate-300 transition hover:bg-slate-700 hover:text-white focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-cyan-300"
aria-label="Raumeinstellungen öffnen"
>
<Settings class="size-5" />
</button>
</DropdownMenuTrigger>
<DropdownMenuContent
align="end"
class="w-52 border-slate-700 bg-slate-800 text-slate-100"
>
<DropdownMenuLabel class="text-slate-400">
Einstellungen
</DropdownMenuLabel>
<DropdownMenuItem
class="focus:bg-slate-700 focus:text-white"
@select="participantsDialogOpen = true"
>
<Users class="size-4" />
Teilnehmer
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
<button
type="button"
class="flex w-fit items-center gap-3 rounded-xl border border-slate-700 bg-slate-800 px-4 py-2.5 text-left transition hover:bg-slate-700 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-cyan-300"
@click="copyInviteLink"
>
<span>
<span
class="block text-sm tracking-[0.18em] text-slate-400"
>
Raumcode
</span>
<strong class="font-mono text-lg tracking-[0.2em]">
{{ join_code }}
</strong>
</span>
<Check v-if="copied" class="size-5 text-emerald-300" />
<Copy v-else class="size-5 text-slate-300" />
</button>
</div>
<label
for="presenter-mode"
class="flex cursor-pointer items-center gap-2 text-sm text-slate-300"
>
<Checkbox
id="presenter-mode"
:model-value="presenterMode"
@update:model-value="
emit('update:presenterMode', $event === true)
"
/>
<span>Präsentatormodus</span>
</label>
</div>
</header>
<Dialog v-model:open="participantsDialogOpen">
<DialogContent
class="max-h-[calc(100dvh-2rem)] overflow-hidden border-slate-700 bg-slate-800 text-slate-100 sm:max-w-xl"
overlay-class="bg-black/70 backdrop-blur-sm"
>
<DialogHeader>
<DialogTitle>Teilnehmer</DialogTitle>
<DialogDescription class="text-slate-300">
Verwalte die aktiven Teilnehmer in diesem Raum.
</DialogDescription>
</DialogHeader>
<ul
v-if="players.length > 0"
class="flex max-h-[min(60dvh,32rem)] flex-col gap-2 overflow-y-auto pr-1"
>
<li
v-for="player in players"
:key="player.id"
class="flex items-center justify-between gap-3 rounded-md bg-slate-900/60 px-3 py-2"
>
<span class="min-w-0">
<span
class="block truncate text-sm"
:class="
player.is_moderator
? 'text-amber-300'
: 'text-slate-100'
"
>
{{ player.name }}
</span>
</span>
<span
v-if="
player.id === currentPlayerId ||
player.is_moderator
"
class="shrink-0 text-xs text-slate-400"
>
{{
player.id === currentPlayerId
? player.is_moderator
? 'Du · Admin'
: 'Du'
: 'Admin'
}}
</span>
<button
v-else
type="button"
class="inline-flex shrink-0 items-center gap-1.5 rounded-md px-2.5 py-1.5 text-xs font-semibold text-rose-300 transition hover:bg-rose-500/20 hover:text-rose-200"
@click="selectedPlayer = player"
>
<UserMinus class="size-3.5" />
Kicken
</button>
</li>
</ul>
<p v-else class="text-sm text-slate-400">
Aktuell sind keine Teilnehmer im Raum.
</p>
<DialogFooter>
<button
type="button"
class="rounded-md border border-slate-600 px-4 py-2 text-sm font-semibold text-slate-200 transition hover:bg-slate-700"
@click="participantsDialogOpen = false"
>
Schließen
</button>
</DialogFooter>
</DialogContent>
</Dialog>
<Dialog
:open="selectedPlayer !== null"
@update:open="setKickDialogOpen"
>
<DialogContent
class="border-slate-700 bg-slate-800 text-slate-100 sm:max-w-md"
overlay-class="bg-black/70 backdrop-blur-sm"
>
<DialogHeader>
<DialogTitle>Teilnehmer wirklich kicken?</DialogTitle>
<DialogDescription class="text-slate-300">
{{ selectedPlayer?.name }} wird aus „{{
title ?? 'Scrum Poker'
}}“ entfernt und zur Startseite weitergeleitet.
</DialogDescription>
</DialogHeader>
<DialogFooter class="gap-6 space-x-4 sm:gap-0">
<button
type="button"
class="rounded-md border border-slate-600 px-4 py-2 text-sm font-semibold text-slate-200 transition hover:bg-slate-700"
:disabled="kickForm.processing"
@click="selectedPlayer = null"
>
Abbrechen
</button>
<button
type="button"
class="rounded-md bg-rose-600 px-4 py-2 text-sm font-semibold text-white transition hover:bg-rose-500 disabled:opacity-50"
:disabled="kickForm.processing"
@click="kickPlayer"
>
{{ kickForm.processing ? 'Wird entfernt …' : 'Kicken' }}
</button>
</DialogFooter>
</DialogContent>
</Dialog>
</div>
</template>
+24 -283
View File
@@ -1,181 +1,14 @@
<script setup lang="ts">
import { CircleUserRound, Crown } from '@lucide/vue';
import { computed, onBeforeUnmount, ref } from 'vue';
import type { CSSProperties } from 'vue';
import { CircleUserRound } from '@lucide/vue';
import type { RoomSeatProps } from '@/types/room';
const props = defineProps<RoomSeatProps>();
const emit = defineEmits<{
throwPaperBall: [playerId: number, chargePercentage: number];
throwPaperBall: [playerId: number];
}>();
const MAX_CHARGE_PERCENTAGE = 300;
const CHARGE_DURATION = 3_000;
const chargePercentage = ref(0);
const chargeStartedAt = ref<number | null>(null);
let chargeAnimationFrame: number | null = null;
let ignoreClickTimer: number | null = null;
let ignoreNextClick = false;
const isCharging = computed(() => chargeStartedAt.value !== null);
const seatStyle = computed<CSSProperties>(() => ({
...props.player.seatStyle,
'--paper-ball-knockback-x': `${props.paperBallKnockback.x}px`,
'--paper-ball-knockback-y': `${props.paperBallKnockback.y}px`,
}));
function updateCharge(timestamp: number): void {
if (chargeStartedAt.value === null) {
return;
}
chargePercentage.value = Math.min(
MAX_CHARGE_PERCENTAGE,
((timestamp - chargeStartedAt.value) / CHARGE_DURATION) *
MAX_CHARGE_PERCENTAGE,
);
if (chargePercentage.value < MAX_CHARGE_PERCENTAGE) {
chargeAnimationFrame = window.requestAnimationFrame(updateCharge);
} else {
chargeAnimationFrame = null;
}
}
function startCharging(): void {
if (props.throwDisabled || chargeStartedAt.value !== null) {
return;
}
chargePercentage.value = 0;
chargeStartedAt.value = performance.now();
chargeAnimationFrame = window.requestAnimationFrame(updateCharge);
}
function stopChargeAnimation(): void {
if (chargeAnimationFrame !== null) {
window.cancelAnimationFrame(chargeAnimationFrame);
chargeAnimationFrame = null;
}
}
function resetCharge(): void {
stopChargeAnimation();
chargeStartedAt.value = null;
chargePercentage.value = 0;
}
function finishCharging(): void {
if (chargeStartedAt.value === null) {
return;
}
updateCharge(performance.now());
const releasedChargePercentage = Math.min(
MAX_CHARGE_PERCENTAGE,
Math.floor(chargePercentage.value),
);
resetCharge();
emit('throwPaperBall', props.player.id, releasedChargePercentage);
ignoreNextClick = true;
if (ignoreClickTimer !== null) {
window.clearTimeout(ignoreClickTimer);
}
ignoreClickTimer = window.setTimeout(() => {
ignoreNextClick = false;
ignoreClickTimer = null;
});
}
function startPointerCharge(event: PointerEvent): void {
if (event.button !== 0) {
return;
}
(event.currentTarget as HTMLButtonElement).setPointerCapture(
event.pointerId,
);
startCharging();
}
function finishPointerCharge(event: PointerEvent): void {
const button = event.currentTarget as HTMLButtonElement;
if (button.hasPointerCapture(event.pointerId)) {
button.releasePointerCapture(event.pointerId);
}
finishCharging();
}
function cancelPointerCharge(): void {
resetCharge();
}
function handleKeyDown(event: KeyboardEvent): void {
if (!['Enter', ' '].includes(event.key)) {
return;
}
event.preventDefault();
event.stopPropagation();
if (!event.repeat) {
startCharging();
}
}
function handleKeyUp(event: KeyboardEvent): void {
if (!['Enter', ' '].includes(event.key)) {
return;
}
event.preventDefault();
event.stopPropagation();
finishCharging();
}
function handleClick(): void {
if (ignoreNextClick) {
ignoreNextClick = false;
return;
}
emit('throwPaperBall', props.player.id, 0);
}
function chargeSegmentProgress(segment: number): number {
return Math.min(100, Math.max(0, chargePercentage.value - segment * 100));
}
function chargeColor(): string {
if (chargePercentage.value > 200) {
return '#ef4444';
}
if (chargePercentage.value > 100) {
return '#f97316';
}
return '#22c55e';
}
onBeforeUnmount(() => {
stopChargeAnimation();
if (ignoreClickTimer !== null) {
window.clearTimeout(ignoreClickTimer);
}
});
function cardLabel(value: string | null): string {
if (value === null) {
return '–';
@@ -197,7 +30,7 @@ function playerVote(): string | null {
<article
class="player-seat"
:class="{ 'is-paper-ball-hit': isPaperBallHit }"
:style="seatStyle"
:style="player.seatStyle"
:data-player-id="player.id"
>
<div
@@ -242,22 +75,18 @@ function playerVote(): string | null {
:class="{ 'player-details-above': player.isTopSeat }"
>
<p
class="player-name max-w-32 text-center text-sm leading-tight font-semibold text-slate-100"
class="player-name max-w-32 text-center text-sm leading-tight font-semibold"
:class="
player.is_moderator ? 'text-amber-300' : 'text-slate-100'
"
>
{{ player.name }}
</p>
<div
v-if="player.is_moderator || isCurrentPlayer()"
v-if="isCurrentPlayer()"
class="flex flex-wrap items-center justify-center gap-x-2 gap-y-0.5 text-[11px]"
>
<span
v-if="player.is_moderator"
class="inline-flex items-center gap-1 text-amber-300"
>
<Crown class="size-3 fill-amber-300" aria-hidden="true" />
Moderator
</span>
<span v-if="isCurrentPlayer()" class="text-cyan-300">Du</span>
<span class="text-cyan-300">Du</span>
</div>
</div>
@@ -265,52 +94,12 @@ function playerVote(): string | null {
v-if="!isCurrentPlayer()"
type="button"
class="throw-paper-ball"
:class="{ 'is-charging': isCharging }"
:disabled="throwDisabled"
:aria-label="`Papierknäuel auf ${player.name} werfen – gedrückt halten zum Aufladen${isCharging ? `, ${Math.floor(chargePercentage)} Prozent geladen` : ''}`"
:aria-pressed="isCharging"
:title="`Papierknäuel auf ${player.name} werfen – gedrückt halten zum Aufladen`"
@pointerdown.stop.prevent="startPointerCharge"
@pointerup.stop.prevent="finishPointerCharge"
@pointercancel="cancelPointerCharge"
@keydown="handleKeyDown"
@keyup="handleKeyUp"
@blur="cancelPointerCharge"
@click.stop.prevent="handleClick"
:aria-label="`Papierknäuel auf ${player.name} werfen`"
:title="`Papierknäuel auf ${player.name} werfen`"
@click.stop="emit('throwPaperBall', player.id)"
>
<svg
v-if="isCharging"
class="charge-rings"
viewBox="0 0 48 48"
aria-hidden="true"
>
<g
v-for="segment in 3"
v-show="chargePercentage > (segment - 1) * 100"
:key="segment"
>
<circle
class="charge-ring-track"
cx="24"
cy="24"
:r="8 + segment * 4"
/>
<circle
class="charge-ring"
cx="24"
cy="24"
:r="8 + segment * 4"
pathLength="100"
:stroke="chargeColor()"
:stroke-dashoffset="
100 - chargeSegmentProgress(segment - 1)
"
/>
</g>
</svg>
<span class="throw-paper-ball-surface" aria-hidden="true">
<span class="paper-ball-mini"></span>
</span>
<span class="paper-ball-mini" aria-hidden="true"></span>
</button>
</article>
</template>
@@ -320,11 +109,7 @@ function playerVote(): string | null {
position: absolute;
z-index: 2;
width: 8rem;
transform: translate(-50%, -50%)
translate(
var(--paper-ball-knockback-x, 0),
var(--paper-ball-knockback-y, 0)
);
transform: translate(-50%, -50%);
text-align: center;
}
@@ -338,22 +123,23 @@ function playerVote(): string | null {
.throw-paper-ball {
position: absolute;
top: 0.15rem;
right: -0.15rem;
top: 0.65rem;
right: 0.35rem;
z-index: 8;
display: grid;
width: 3rem;
height: 3rem;
width: 2rem;
height: 2rem;
place-items: center;
border: 0;
background: transparent;
border: 1px solid #64748b;
border-radius: 0.5rem;
background: #334155;
opacity: 0;
transform: translateY(0.25rem) rotate(-8deg);
pointer-events: none;
touch-action: none;
transition:
opacity 140ms ease,
transform 140ms ease;
transform 140ms ease,
background-color 140ms ease;
}
.player-seat:hover .throw-paper-ball,
@@ -363,14 +149,9 @@ function playerVote(): string | null {
pointer-events: auto;
}
.throw-paper-ball:hover:not(:disabled) .throw-paper-ball-surface,
.throw-paper-ball:focus-visible .throw-paper-ball-surface,
.throw-paper-ball.is-charging .throw-paper-ball-surface {
background: #475569;
}
.throw-paper-ball:hover:not(:disabled),
.throw-paper-ball:focus-visible {
background: #475569;
transform: translateY(-0.1rem) rotate(4deg);
}
@@ -385,46 +166,6 @@ function playerVote(): string | null {
pointer-events: none;
}
.throw-paper-ball-surface {
position: relative;
z-index: 1;
display: grid;
width: 2rem;
height: 2rem;
place-items: center;
border: 1px solid #64748b;
border-radius: 0.5rem;
background: #334155;
transition: background-color 140ms ease;
}
.charge-rings {
position: absolute;
inset: 0;
width: 100%;
height: 100%;
overflow: visible;
filter: drop-shadow(0 0 0.2rem rgb(15 23 42 / 75%));
}
.charge-ring-track,
.charge-ring {
fill: none;
stroke-width: 2.25;
}
.charge-ring-track {
stroke: rgb(148 163 184 / 32%);
}
.charge-ring {
transform: rotate(-90deg);
transform-origin: 24px 24px;
stroke-linecap: round;
stroke-dasharray: 100;
transition: stroke 100ms linear;
}
.paper-ball-mini {
display: block;
width: 0.95rem;
+13 -31
View File
@@ -17,17 +17,13 @@ const hasCompactHeight = useMediaQuery(
);
const gameBoard = ref<HTMLElement | null>(null);
const {
activePaperBalls,
hitPlayerIds,
paperBallKnockbacks,
throwingAtPlayerId,
throwPaperBall,
} = usePaperBallToss({
roomId: () => props.room.id,
currentPlayerId: () => props.currentPlayer.id,
board: gameBoard,
});
const { activePaperBalls, hitPlayerIds, throwingAtPlayerId, throwPaperBall } =
usePaperBallToss({
roomId: () => props.room.id,
currentPlayerId: () => props.currentPlayer.id,
currentPlayerIsModerator: () => props.currentPlayer.is_moderator,
board: gameBoard,
});
const positionedPlayers = computed<PositionedRoomPlayer[]>(() => {
const currentPlayerIndex = props.room.players.findIndex(
@@ -104,7 +100,6 @@ const voteCount = computed(
v-for="paperBall in activePaperBalls"
:key="paperBall.id"
class="paper-ball-flight"
:class="`paper-ball-level-${paperBall.chargeLevel}`"
:style="paperBall.style"
aria-hidden="true"
>
@@ -121,15 +116,17 @@ const voteCount = computed(
:revealed="room.revealed"
:presenter-mode="presenterMode"
:is-paper-ball-hit="hitPlayerIds.includes(player.id)"
:paper-ball-knockback="
paperBallKnockbacks[player.id] ?? { x: 0, y: 0 }
:throw-disabled="
!currentPlayer.is_moderator && throwingAtPlayerId !== null
"
:throw-disabled="throwingAtPlayerId !== null"
@throw-paper-ball="throwPaperBall"
/>
<RoomModeratorControls
v-if="currentPlayer.is_moderator"
v-if="
currentPlayer.is_moderator ||
room.allow_participants_to_manage_rounds
"
:room-id="room.id"
:revealed="room.revealed"
:has-votes="voteCount > 0"
@@ -198,21 +195,6 @@ const voteCount = computed(
animation: paper-ball-flight 780ms linear forwards;
}
.paper-ball-flight.paper-ball-level-1 {
width: 2.05rem;
height: 2.05rem;
}
.paper-ball-flight.paper-ball-level-2 {
width: 2.5rem;
height: 2.5rem;
}
.paper-ball-flight.paper-ball-level-3 {
width: 3rem;
height: 3rem;
}
.paper-ball {
display: block;
width: 100%;
@@ -16,19 +16,26 @@ defineOptions({
inheritAttrs: false,
})
const props = withDefaults(defineProps<DialogContentProps & { class?: HTMLAttributes["class"], showCloseButton?: boolean }>(), {
showCloseButton: true,
})
const props = withDefaults(
defineProps<DialogContentProps & {
class?: HTMLAttributes["class"]
overlayClass?: HTMLAttributes["class"]
showCloseButton?: boolean
}>(),
{
showCloseButton: true,
},
)
const emits = defineEmits<DialogContentEmits>()
const delegatedProps = reactiveOmit(props, "class")
const delegatedProps = reactiveOmit(props, "class", "overlayClass", "showCloseButton")
const forwarded = useForwardPropsEmits(delegatedProps, emits)
</script>
<template>
<DialogPortal>
<DialogOverlay />
<DialogOverlay :class="props.overlayClass" />
<DialogContent
data-slot="dialog-content"
v-bind="{ ...$attrs, ...forwarded }"
+14 -119
View File
@@ -4,9 +4,7 @@ import { toast } from 'vue-sonner';
import { useRoomEmotes } from '@/composables/useRoomEmotes';
import { store as throwPaperBallRoute } from '@/routes/room/emote/paper-ball';
import type {
PaperBallChargeLevel,
PaperBallFlight,
PaperBallKnockback,
PaperBallThrowError,
PaperBallThrownPayload,
PaperBallTossOptions,
@@ -15,28 +13,18 @@ import type {
const PAPER_BALL_FLIGHT_DURATION = 780;
const SEEN_EVENT_RETENTION = 5_000;
const THROW_BUTTON_COOLDOWN = 550;
const MAX_KNOCKBACK_DISTANCE = 72;
const KNOCKBACK_RETURN_SPEED = 58;
const KNOCKBACK_FORCE: Record<PaperBallChargeLevel, number> = {
0: 0,
1: 18,
2: 32,
3: 48,
};
export function usePaperBallToss({
roomId,
currentPlayerId,
currentPlayerIsModerator,
board,
}: PaperBallTossOptions) {
const activePaperBalls = ref<PaperBallFlight[]>([]);
const hitPlayerIds = ref<number[]>([]);
const paperBallKnockbacks = ref<Record<number, PaperBallKnockback>>({});
const throwingAtPlayerId = ref<number | null>(null);
const seenPaperBallIds = new Set<string>();
const timers = new Set<number>();
let knockbackAnimationFrame: number | null = null;
let previousKnockbackFrameTime: number | null = null;
function schedule(callback: () => void, delay: number): void {
const timer = window.setTimeout(() => {
@@ -47,90 +35,12 @@ export function usePaperBallToss({
timers.add(timer);
}
function animateKnockbacks(timestamp: number): void {
const elapsed = Math.min(
timestamp - (previousKnockbackFrameTime ?? timestamp),
32,
);
const returnDistance = (KNOCKBACK_RETURN_SPEED * elapsed) / 1_000;
const nextKnockbacks: Record<number, PaperBallKnockback> = {};
async function throwPaperBall(targetPlayerId: number): Promise<void> {
const shouldApplyCooldown = !currentPlayerIsModerator();
Object.entries(paperBallKnockbacks.value).forEach(
([playerId, knockback]) => {
const distance = Math.hypot(knockback.x, knockback.y);
const nextDistance = Math.max(0, distance - returnDistance);
if (nextDistance > 0.1) {
const scale = nextDistance / distance;
nextKnockbacks[Number(playerId)] = {
x: knockback.x * scale,
y: knockback.y * scale,
};
}
},
);
paperBallKnockbacks.value = nextKnockbacks;
previousKnockbackFrameTime = timestamp;
if (Object.keys(nextKnockbacks).length > 0) {
knockbackAnimationFrame =
window.requestAnimationFrame(animateKnockbacks);
return;
}
knockbackAnimationFrame = null;
previousKnockbackFrameTime = null;
}
function applyKnockback(
playerId: number,
directionX: number,
directionY: number,
chargeLevel: PaperBallChargeLevel,
): void {
const force = KNOCKBACK_FORCE[chargeLevel];
if (force === 0) {
return;
}
const currentKnockback = paperBallKnockbacks.value[playerId] ?? {
x: 0,
y: 0,
};
let nextX = currentKnockback.x + directionX * force;
let nextY = currentKnockback.y + directionY * force;
const nextDistance = Math.hypot(nextX, nextY);
if (nextDistance > MAX_KNOCKBACK_DISTANCE) {
const scale = MAX_KNOCKBACK_DISTANCE / nextDistance;
nextX *= scale;
nextY *= scale;
}
paperBallKnockbacks.value = {
...paperBallKnockbacks.value,
[playerId]: { x: nextX, y: nextY },
};
if (knockbackAnimationFrame === null) {
previousKnockbackFrameTime = null;
knockbackAnimationFrame =
window.requestAnimationFrame(animateKnockbacks);
}
}
async function throwPaperBall(
targetPlayerId: number,
chargePercentage = 0,
): Promise<void> {
if (
targetPlayerId === currentPlayerId() ||
throwingAtPlayerId.value !== null
(shouldApplyCooldown && throwingAtPlayerId.value !== null)
) {
return;
}
@@ -145,7 +55,9 @@ export function usePaperBallToss({
return;
}
throwingAtPlayerId.value = targetPlayerId;
if (shouldApplyCooldown) {
throwingAtPlayerId.value = targetPlayerId;
}
try {
const response = await fetch(throwPaperBallRoute(roomId()).url, {
@@ -159,7 +71,6 @@ export function usePaperBallToss({
},
body: JSON.stringify({
target_player_id: targetPlayerId,
charge_percentage: chargePercentage,
}),
});
@@ -185,11 +96,13 @@ export function usePaperBallToss({
} catch {
toast.error('Der Papierknäuel konnte nicht geworfen werden.');
} finally {
schedule(() => {
if (throwingAtPlayerId.value === targetPlayerId) {
throwingAtPlayerId.value = null;
}
}, THROW_BUTTON_COOLDOWN);
if (shouldApplyCooldown) {
schedule(() => {
if (throwingAtPlayerId.value === targetPlayerId) {
throwingAtPlayerId.value = null;
}
}, THROW_BUTTON_COOLDOWN);
}
}
}
@@ -200,9 +113,6 @@ export function usePaperBallToss({
typeof payload.id !== 'string' ||
!Number.isInteger(payload.from_player_id) ||
!Number.isInteger(payload.target_player_id) ||
!Number.isInteger(payload.charge_level) ||
payload.charge_level < 0 ||
payload.charge_level > 3 ||
seenPaperBallIds.has(payload.id)
) {
return;
@@ -239,12 +149,9 @@ export function usePaperBallToss({
targetRect.top + targetRect.height / 2 - boardRect.top - startY;
const distance = Math.hypot(travelX, travelY);
const arcHeight = Math.min(130, Math.max(55, distance * 0.22));
const knockbackDirectionX = distance === 0 ? 1 : travelX / distance;
const knockbackDirectionY = distance === 0 ? 0 : travelY / distance;
activePaperBalls.value.push({
id: payload.id,
chargeLevel: payload.charge_level,
style: {
left: `${startX}px`,
top: `${startY}px`,
@@ -263,13 +170,6 @@ export function usePaperBallToss({
if (!hitPlayerIds.value.includes(payload.target_player_id)) {
hitPlayerIds.value.push(payload.target_player_id);
}
applyKnockback(
payload.target_player_id,
knockbackDirectionX,
knockbackDirectionY,
payload.charge_level,
);
}, PAPER_BALL_FLIGHT_DURATION - 80);
schedule(() => {
@@ -290,16 +190,11 @@ export function usePaperBallToss({
onScopeDispose(() => {
timers.forEach((timer) => window.clearTimeout(timer));
timers.clear();
if (knockbackAnimationFrame !== null) {
window.cancelAnimationFrame(knockbackAnimationFrame);
}
});
return {
activePaperBalls,
hitPlayerIds,
paperBallKnockbacks,
throwingAtPlayerId,
throwPaperBall,
};
@@ -33,6 +33,25 @@ export function useRoomRealtime(
return;
}
if (
payload.change === 'player_kicked' &&
payload.affected_player_id === currentPlayer.value.id
) {
router.visit(home().url, { replace: true });
return;
}
if (
payload.change === 'player_instance_replaced' &&
payload.affected_player_id === currentPlayer.value.id &&
payload.affected_instance_id === currentPlayer.value.instance_id
) {
router.visit(home().url, { replace: true });
return;
}
if (payload.change === 'room_closed') {
router.visit(
join({ query: { join_code: room.value.join_code } }).url,
+38
View File
@@ -0,0 +1,38 @@
<script setup lang="ts">
import { Head, Link } from '@inertiajs/vue3';
import { CircleAlert } from '@lucide/vue';
import { login } from '@/routes';
defineProps<{
message: string;
showLoginAction: boolean;
}>();
</script>
<template>
<Head title="Scrum Poker nicht verfügbar" />
<main
class="grid min-h-svh place-items-center bg-slate-900 p-8 text-slate-100"
>
<section
class="flex max-w-lg flex-col items-center gap-4 rounded-2xl border border-slate-700 bg-slate-800 p-8 text-center shadow-xl"
>
<CircleAlert class="size-10 text-amber-300" />
<h1 class="text-2xl font-bold">Raum kann nicht geöffnet werden</h1>
<p class="text-slate-300">{{ message }}</p>
<Link
v-if="showLoginAction"
:href="login()"
class="inline-flex rounded-lg bg-white px-4 py-2 font-semibold text-slate-900 transition hover:bg-slate-200 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-white"
>
Anmelden
</Link>
<p class="text-sm text-slate-400">
Bitte ändere Raumcode oder Anzeigename auf der Home-Seite der
Fillibri Hub App und öffne Scrum Poker erneut.
</p>
</section>
</main>
</template>
+14
View File
@@ -0,0 +1,14 @@
<script setup lang="ts">
import RoomExperience from '@/components/rooms/RoomExperience.vue';
import type { RoomPageProps } from '@/types/room';
const props = defineProps<RoomPageProps>();
</script>
<template>
<RoomExperience
:room="props.room"
:current-player="props.currentPlayer"
embedded
/>
</template>
+105
View File
@@ -0,0 +1,105 @@
<script setup lang="ts">
import { Head, Link, useForm } from '@inertiajs/vue3';
import { ArrowLeft } from '@lucide/vue';
import InputError from '@/components/InputError.vue';
import { Checkbox } from '@/components/ui/checkbox';
import { dashboard } from '@/routes';
import { update as updateSettings } from '@/routes/room/settings';
import type { RoomSettingsPageProps } from '@/types/room';
const props = defineProps<RoomSettingsPageProps>();
const form = useForm({
allow_participants_to_manage_rounds:
props.room.allow_participants_to_manage_rounds,
is_persistent: props.room.is_persistent,
});
function submit(): void {
form.patch(updateSettings(props.room.id).url, {
preserveScroll: true,
});
}
</script>
<template>
<Head title="Raumeinstellungen" />
<main
class="flex min-h-[calc(100svh-4rem)] justify-center bg-slate-900 p-4 text-slate-100 sm:p-8"
>
<section class="flex w-full max-w-2xl flex-col gap-6">
<Link
:href="dashboard()"
class="inline-flex w-fit items-center gap-2 text-sm text-slate-300 transition hover:text-white"
>
<ArrowLeft class="size-4" />
Zurück zu meinen Räumen
</Link>
<div>
<h1 class="text-2xl font-bold">Raumeinstellungen</h1>
<p class="mt-1 text-sm text-slate-400">
{{ room.title ?? 'Scrum Poker' }} · {{ room.join_code }}
</p>
</div>
<form
class="flex flex-col gap-6 rounded-xl border border-slate-700 bg-slate-800 p-6"
@submit.prevent="submit"
>
<label class="flex cursor-pointer items-center gap-4">
<Checkbox
:model-value="form.allow_participants_to_manage_rounds"
class="border-white"
@update:model-value="
form.allow_participants_to_manage_rounds =
$event === true
"
/>
<span>
<strong class="block"
>Alle dürfen den Raum verwalten</strong
>
<span class="mt-1 block text-sm text-slate-400">
Alle aktiven Teilnehmer, auch Gäste, dürfen Runden
steuern und andere Teilnehmer aus dem Raum
entfernen.
</span>
</span>
</label>
<InputError
:message="form.errors.allow_participants_to_manage_rounds"
/>
<label class="flex cursor-pointer items-center gap-4">
<Checkbox
:model-value="form.is_persistent"
class="border-white"
@update:model-value="
form.is_persistent = $event === true
"
/>
<span>
<strong class="block"
>Raum dauerhaft offen halten</strong
>
<span class="mt-1 block text-sm text-slate-400">
Der Raum wird auch nach längerer Inaktivität nicht
automatisch geschlossen.
</span>
</span>
</label>
<InputError :message="form.errors.is_persistent" />
<button
type="submit"
class="inline-flex w-fit rounded-md bg-primary px-4 py-2 text-sm font-semibold text-primary-foreground transition hover:bg-primary/90 disabled:opacity-50"
:disabled="form.processing"
>
{{ form.processing ? 'Wird gespeichert …' : 'Speichern' }}
</button>
</form>
</section>
</main>
</template>
+2 -55
View File
@@ -1,63 +1,10 @@
<script setup lang="ts">
import { Head, usePage } from '@inertiajs/vue3';
import { computed, ref } from 'vue';
import RoomHeader from '@/components/rooms/RoomHeader.vue';
import RoomRetentionNotice from '@/components/rooms/RoomRetentionNotice.vue';
import RoomTable from '@/components/rooms/RoomTable.vue';
import RoomVoteDeck from '@/components/rooms/RoomVoteDeck.vue';
import { useRoomRealtime } from '@/composables/useRoomRealtime';
import RoomExperience from '@/components/rooms/RoomExperience.vue';
import type { RoomPageProps } from '@/types/room';
const props = defineProps<RoomPageProps>();
const page = usePage();
const presenterMode = ref(false);
const roomNotice = computed(() => page.props.roomNotice);
const canFavorite = computed(
() => page.props.auth.user?.id != props.room.owner_id,
);
const {
room: realtimeRoom,
currentPlayer: realtimeCurrentPlayer,
setCurrentVote,
} = useRoomRealtime(
() => props.room,
() => props.currentPlayer,
);
</script>
<template>
<Head :title="realtimeRoom.title ?? 'Scrum Poker'" />
<main
class="-m-6 min-h-[calc(100svh-4rem)] bg-slate-900 px-3 py-6 text-white sm:px-6 md:flex md:h-[calc(100dvh-4rem-1px)] md:min-h-0 md:flex-col md:overflow-hidden lg:px-10"
>
<RoomRetentionNotice v-if="roomNotice" :notice="roomNotice" />
<RoomHeader
:id="realtimeRoom.id"
:title="realtimeRoom.title"
:join_code="realtimeRoom.join_code"
:is_favorite="realtimeRoom.is_favorite"
:can-favorite="canFavorite"
v-model:presenter-mode="presenterMode"
/>
<RoomTable
:room="realtimeRoom"
:current-player="realtimeCurrentPlayer"
:presenter-mode="presenterMode"
/>
<RoomVoteDeck
:room-id="realtimeRoom.id"
:revealed="realtimeRoom.revealed"
:cards="realtimeRoom.deck.cards"
:current-vote="realtimeCurrentPlayer.current_vote"
:presenter-mode="presenterMode"
@vote-changed="setCurrentVote"
/>
</main>
<RoomExperience :room="props.room" :current-player="props.currentPlayer" />
</template>
+8 -1
View File
@@ -1,10 +1,17 @@
export type DashboardRoomPlayer = {
id: number;
name: string;
is_moderator: boolean;
is_owner: boolean;
};
export type DashboardRoom = {
id: string;
title: string | null;
join_code: string;
current_round: number;
players_count: number;
active_player_count: number;
players: DashboardRoomPlayer[];
last_activity_at: string | null;
closed_at: string | null;
};
+1 -9
View File
@@ -1,12 +1,9 @@
import type { Ref, CSSProperties } from 'vue';
export type PaperBallChargeLevel = 0 | 1 | 2 | 3;
export type PaperBallThrownPayload = {
id: string;
from_player_id: number;
target_player_id: number;
charge_level: PaperBallChargeLevel;
};
export type PaperBallFlightStyle = CSSProperties & {
@@ -22,18 +19,13 @@ export type PaperBallFlightStyle = CSSProperties & {
export type PaperBallFlight = {
id: string;
chargeLevel: PaperBallChargeLevel;
style: PaperBallFlightStyle;
};
export type PaperBallKnockback = {
x: number;
y: number;
};
export type PaperBallTossOptions = {
roomId: () => string;
currentPlayerId: () => number;
currentPlayerIsModerator: () => boolean;
board: Ref<HTMLElement | null>;
};
+38 -6
View File
@@ -1,7 +1,5 @@
import type { CSSProperties } from 'vue';
import type { PaperBallKnockback } from '@/types/emote';
export type PokerCard = {
key: string;
label: string;
@@ -32,6 +30,7 @@ export type RoomPlayer = {
export type CurrentRoomPlayer = {
id: number;
instance_id: string;
name: string;
is_moderator: boolean;
current_vote: string | null;
@@ -46,6 +45,8 @@ export type PokerRoom = {
current_round: number;
revealed: boolean;
state_version: number;
allow_participants_to_manage_rounds: boolean;
is_persistent: boolean;
statistics: RoomStatistics | null;
deck: RoomDeck;
players: RoomPlayer[];
@@ -66,6 +67,23 @@ export type RoomPageProps = {
currentPlayer: CurrentRoomPlayer;
};
export type RoomExperienceProps = RoomPageProps & {
embedded?: boolean;
};
export type RoomSettings = Pick<
PokerRoom,
| 'id'
| 'title'
| 'join_code'
| 'allow_participants_to_manage_rounds'
| 'is_persistent'
>;
export type RoomSettingsPageProps = {
room: RoomSettings;
};
export type CreateRoomPageProps = {
decks: SelectableDeck[];
defaultPlayerName: string | null;
@@ -93,10 +111,14 @@ export type RoomRetentionNoticeProps = {
export type RoomHeaderProps = Pick<
PokerRoom,
'id' | 'title' | 'join_code' | 'is_favorite'
'id' | 'title' | 'join_code' | 'is_favorite' | 'players'
> & {
canFavorite: boolean;
canManageParticipants: boolean;
currentPlayerId: number;
presenterMode: boolean;
canLogout: boolean;
playerName: string;
};
export type RoomHeaderEmits = {
@@ -117,7 +139,6 @@ export type RoomSeatProps = {
revealed: boolean;
presenterMode: boolean;
isPaperBallHit: boolean;
paperBallKnockback: PaperBallKnockback;
throwDisabled: boolean;
};
@@ -141,21 +162,32 @@ export type RoomVoteDeckEmits = {
export type RoomStateChange =
| 'player_joined'
| 'player_updated'
| 'player_kicked'
| 'player_instance_replaced'
| 'vote_changed'
| 'cards_revealed'
| 'votes_reset'
| 'next_round'
| 'room_reopened'
| 'room_closed'
| 'room_deleted';
| 'room_deleted'
| 'room_settings_updated';
export type RoomStateChangedPayload = {
version: number;
change: RoomStateChange;
state: RoomRealtimeState | null;
affected_player_id?: number;
affected_instance_id?: string;
};
export type RoomRealtimeState = Pick<
PokerRoom,
'current_round' | 'revealed' | 'state_version' | 'statistics' | 'players'
| 'current_round'
| 'revealed'
| 'state_version'
| 'allow_participants_to_manage_rounds'
| 'statistics'
| 'players'
>;
+2 -2
View File
@@ -1,7 +1,7 @@
<?php
use App\Jobs\CloseInactiveRooms;
use App\Jobs\MarkInactivePlayers;
use App\Jobs\RemoveAbsentPlayers;
use Illuminate\Foundation\DevCommands;
use Illuminate\Support\Facades\Schedule;
@@ -11,6 +11,6 @@ Schedule::job(new CloseInactiveRooms)
->weeklyOn(1, '02:00')
->withoutOverlapping();
Schedule::job(new MarkInactivePlayers)
Schedule::job(new RemoveAbsentPlayers)
->everyFiveMinutes()
->withoutOverlapping();
+18
View File
@@ -1,11 +1,15 @@
<?php
use App\Http\Controllers\EmbeddedLogoutController;
use App\Http\Controllers\EmbeddedRoomController;
use App\Http\Controllers\FavoriteRoomController;
use App\Http\Controllers\RoomController;
use App\Http\Controllers\RoomEmoteController;
use App\Http\Controllers\RoomJoinController;
use App\Http\Controllers\RoomLifecycleController;
use App\Http\Controllers\RoomPlayerController;
use App\Http\Controllers\RoomPlayerKickController;
use App\Http\Controllers\RoomSettingsController;
use App\Http\Controllers\RoundController;
use App\Http\Controllers\VoteController;
use App\Models\Room;
@@ -21,7 +25,18 @@ Route::get('/room/join', RoomJoinController::class)->name('room.join');
Route::post('room/join', [RoomPlayerController::class, 'join'])->name('room.code');
Route::post('/room', [RoomController::class, 'store'])->name('room.store');
Route::get('/embedded/scrum-poker', EmbeddedRoomController::class)
->name('embedded.room');
Route::post('/embedded/scrum-poker/logout', EmbeddedLogoutController::class)
->middleware('auth')
->name('embedded.logout');
Route::middleware(['auth', 'verified'])->group(function () {
Route::get('/rooms/{room}/settings', [RoomSettingsController::class, 'edit'])
->name('room.settings.edit');
Route::patch('/rooms/{room}/settings', [RoomSettingsController::class, 'update'])
->name('room.settings.update');
Route::post('/rooms/{room}/reopen', [RoomLifecycleController::class, 'reopen'])
->name('room.reopen');
Route::delete('/rooms/{room}', [RoomLifecycleController::class, 'destroy'])
@@ -30,6 +45,9 @@ Route::middleware(['auth', 'verified'])->group(function () {
->name('room.favorite');
});
Route::delete('/rooms/{room}/players/{player}', RoomPlayerKickController::class)
->name('room.player.destroy');
Route::middleware('room.player')->group(function () {
Route::get('/rooms/{room}', [RoomController::class, 'show'])->name('room.show');
Route::post('/rooms/{room}/votes', [VoteController::class, 'store'])
+94
View File
@@ -0,0 +1,94 @@
<?php
use App\Enums\RoomStateChange;
use App\Events\RoomStateChanged;
use App\Jobs\RemoveAbsentPlayers;
use App\Models\Room;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Event;
use Illuminate\Support\Facades\Schema;
test('the player table no longer stores an inactive status', function () {
expect(Schema::hasColumn('players', 'inactive_at'))->toBeFalse();
});
test('the migration removes old inactive and absent players while keeping present players', function () {
Schema::table('players', function (Blueprint $table): void {
$table->timestamp('inactive_at')->nullable();
});
$room = Room::create([
'title' => 'Planning',
'deck_config' => ['name' => 'Fibonacci', 'cards' => []],
]);
$previouslyInactive = $room->players()->create([
'name' => 'Inactive',
'last_seen_at' => now(),
]);
$absent = $room->players()->create([
'name' => 'Nico',
'last_seen_at' => now()->subHours(2),
]);
$present = $room->players()->create([
'name' => 'Anna',
'last_seen_at' => now(),
]);
DB::table('players')->where('id', $previouslyInactive->id)->update(['inactive_at' => now()]);
$migration = require database_path('migrations/2026_09_24_123048_remove_previously_inactive_players.php');
$migration->up();
$this->assertModelMissing($previouslyInactive);
$this->assertModelMissing($absent);
$this->assertModelExists($present);
expect(Schema::hasColumn('players', 'inactive_at'))->toBeFalse();
});
test('the timeout removes absent players and their votes but keeps recent players', function () {
$room = Room::create([
'title' => 'Planning',
'current_round' => 1,
'deck_config' => ['name' => 'Fibonacci', 'cards' => []],
]);
$absentPlayer = $room->players()->create([
'name' => 'Nico',
'last_seen_at' => now()->subHour(),
]);
$recentPlayer = $room->players()->create([
'name' => 'Anna',
'last_seen_at' => now()->subHour()->addSecond(),
]);
$vote = $absentPlayer->votes()->create([
'room_id' => $room->id,
'round' => $room->current_round,
'value' => '3',
]);
$previousVersion = $room->fresh()->state_version;
Event::fake([RoomStateChanged::class]);
app()->call([new RemoveAbsentPlayers, 'handle']);
app()->call([new RemoveAbsentPlayers, 'handle']);
$this->assertModelMissing($absentPlayer);
$this->assertModelMissing($vote);
$this->assertModelExists($recentPlayer);
expect($room->fresh()->state_version)->toBe($previousVersion + 1);
Event::assertDispatched(
RoomStateChanged::class,
fn (RoomStateChanged $event): bool => $event->change === RoomStateChange::PlayerKicked
&& $event->affectedPlayerId === $absentPlayer->id
&& collect($event->state['players'])->doesntContain('id', $absentPlayer->id),
);
Event::assertDispatchedTimes(RoomStateChanged::class, 1);
$this->post(route('room.code'), [
'join_code' => $room->join_code,
'player_name' => 'Nico',
])->assertRedirect(route('room.show', $room));
expect($room->players()->where('name', 'Nico')->sole()->id)->not->toBe($absentPlayer->id);
});
+246
View File
@@ -0,0 +1,246 @@
<?php
use App\Enums\RoomStateChange;
use App\Events\RoomStateChanged;
use App\Models\Room;
use App\Models\User;
use Illuminate\Support\Facades\Event;
use Inertia\Testing\AssertableInertia as Assert;
function createEmbeddedRoom(array $attributes = []): Room
{
return Room::create([
'title' => 'Fillibri Planning',
'deck_config' => [
'name' => 'Fibonacci',
'cards' => [
['key' => '3', 'label' => '3'],
['key' => '5', 'label' => '5'],
],
],
...$attributes,
]);
}
test('a guest automatically joins the embedded room', function () {
$room = createEmbeddedRoom();
$response = $this->get(route('embedded.room', [
'join_code' => strtolower($room->join_code),
'player_name' => ' Nico ',
]))
->assertOk()
->assertInertia(fn (Assert $page) => $page
->component('embedded/Room')
->where('room.id', $room->id)
->where('currentPlayer.name', 'Nico'));
$player = $room->players()->sole();
expect($player->user_id)->toBeNull()
->and($player->is_moderator)->toBeFalse();
$response->assertSessionHas("room_players.{$room->id}", $player->id);
});
test('embedded guest access reuses the session player and applies a changed display name', function () {
$room = createEmbeddedRoom();
$player = $room->players()->create([
'name' => 'Old name',
]);
$this->withSession(["room_players.{$room->id}" => $player->id])
->get(route('embedded.room', [
'join_code' => $room->join_code,
'player_name' => 'New name',
]))
->assertOk();
expect($room->players()->count())->toBe(1)
->and($player->fresh()->name)->toBe('New name');
});
test('an authenticated user automatically joins the embedded room', function () {
$user = User::factory()->create();
$room = createEmbeddedRoom(['allow_participants_to_manage_rounds' => true]);
$this->actingAs($user)
->get(route('embedded.room', [
'join_code' => strtolower($room->join_code),
'player_name' => ' Nico ',
]))
->assertOk()
->assertInertia(fn (Assert $page) => $page
->component('embedded/Room')
->where('room.id', $room->id)
->where('room.allow_participants_to_manage_rounds', true)
->where('currentPlayer.name', 'Nico'))
->assertSessionHas("room_players.{$room->id}");
$this->assertDatabaseHas('players', [
'room_id' => $room->id,
'user_id' => $user->id,
'name' => 'Nico',
'is_moderator' => false,
]);
});
test('embedded access reuses the user player and applies a changed display name', function () {
$user = User::factory()->create();
$room = createEmbeddedRoom();
$player = $room->players()->create([
'user_id' => $user->id,
'name' => 'Old name',
]);
$this->actingAs($user)
->get(route('embedded.room', [
'join_code' => $room->join_code,
'player_name' => 'New name',
]))
->assertOk();
expect($room->players()->count())->toBe(1)
->and($player->fresh()->name)->toBe('New name');
});
test('an embedded guest keeps the same player after logging in separately', function () {
$user = User::factory()->create([
'email' => 'nico@example.com',
]);
$room = createEmbeddedRoom();
$url = route('embedded.room', [
'join_code' => $room->join_code,
'player_name' => 'Nico',
]);
$this->get($url)->assertOk();
$player = $room->players()->sole();
$this->post(route('login.store'), [
'email' => 'nico@example.com',
'password' => 'password',
])->assertRedirect();
$this->get($url)->assertOk();
expect($room->players()->count())->toBe(1)
->and($player->fresh()->user_id)->toBe($user->id);
});
test('embedded guest access shows a dedicated error when the display name is taken', function () {
$user = User::factory()->create([
'email' => 'nico@example.com',
]);
$room = createEmbeddedRoom();
$room->players()->create([
'user_id' => $user->id,
'name' => 'Nico',
]);
$url = route('embedded.room', [
'join_code' => $room->join_code,
'player_name' => 'Nico',
]);
$this->get($url)
->assertUnprocessable()
->assertInertia(fn (Assert $page) => $page
->component('embedded/Error')
->where('message', 'Dieser Anzeigename ist in dem Raum bereits vorhanden.')
->where('showLoginAction', true))
->assertSessionHas('url.intended', $url);
$this->post(route('login.store'), [
'email' => 'nico@example.com',
'password' => 'password',
])->assertRedirect($url);
$this->get($url)
->assertOk()
->assertInertia(fn (Assert $page) => $page
->component('embedded/Room')
->where('currentPlayer.name', 'Nico'));
});
test('a new account instance takes over the embedded player and kicks the previous instance', function () {
Event::fake([RoomStateChanged::class]);
$user = User::factory()->create();
$room = createEmbeddedRoom();
$player = $room->players()->create([
'user_id' => $user->id,
'name' => 'Nico',
'active_instance_id' => '019b8f80-37c4-71a3-b415-5f2697332c16',
]);
$url = route('embedded.room', [
'join_code' => $room->join_code,
'player_name' => 'Nico',
]);
$this->actingAs($user)
->withSession([
'room_player_instance_id' => '019b8f80-37c4-71a3-b415-5f2697332c17',
])
->get($url)
->assertOk()
->assertInertia(fn (Assert $page) => $page
->where('currentPlayer.id', $player->id)
->where('currentPlayer.instance_id', '019b8f80-37c4-71a3-b415-5f2697332c17'));
expect($player->fresh()->active_instance_id)
->toBe('019b8f80-37c4-71a3-b415-5f2697332c17');
Event::assertDispatched(
RoomStateChanged::class,
fn (RoomStateChanged $event): bool => $event->change === RoomStateChange::PlayerInstanceReplaced
&& $event->affectedPlayerId === $player->id
&& $event->affectedInstanceId === '019b8f80-37c4-71a3-b415-5f2697332c16',
);
$this->withSession([
"room_players.{$room->id}" => $player->id,
'room_player_instance_id' => '019b8f80-37c4-71a3-b415-5f2697332c16',
])
->post(route('room.vote.store', $room), ['value' => '5'])
->assertRedirect(route('room.join', ['join_code' => $room->join_code]));
$this->assertDatabaseCount('votes', 0);
});
test('embedded access shows a dedicated error for an unknown room code', function () {
$this->get(route('embedded.room', [
'join_code' => 'ABC234',
'player_name' => 'Nico',
]))
->assertUnprocessable()
->assertInertia(fn (Assert $page) => $page
->component('embedded/Error')
->where('message', 'Dieser Raumcode existiert nicht.')
->where('showLoginAction', false));
});
test('embedded logout returns to the same room as a guest without duplicating the player', function () {
$user = User::factory()->create();
$room = createEmbeddedRoom();
$url = route('embedded.room', [
'join_code' => $room->join_code,
'player_name' => 'Nico',
]);
$this->actingAs($user)->get($url)->assertOk();
$player = $room->players()->sole();
$this
->followingRedirects()
->post(route('embedded.logout', [
'join_code' => $room->join_code,
'player_name' => 'Nico',
]))
->assertOk()
->assertInertia(fn (Assert $page) => $page
->component('embedded/Room')
->where('currentPlayer.id', $player->id));
$this->assertGuest()
->assertDatabaseCount('players', 1);
});
+19
View File
@@ -45,6 +45,25 @@ test('room state broadcasts synchronously expose sanitized state', function () {
]);
});
test('player instance replacement broadcasts the displaced instance', function () {
$event = new RoomStateChanged(
'019b8f80-37c4-71a3-b415-5f2697332c16',
8,
RoomStateChange::PlayerInstanceReplaced,
null,
42,
'019b8f80-37c4-71a3-b415-5f2697332c17',
);
expect($event->broadcastWith())->toBe([
'version' => 8,
'change' => 'player_instance_replaced',
'state' => null,
'affected_player_id' => 42,
'affected_instance_id' => '019b8f80-37c4-71a3-b415-5f2697332c17',
]);
});
test('joining a room broadcasts the new room version', function () {
Event::fake([RoomStateChanged::class]);
$room = createBroadcastRoom();
+32 -41
View File
@@ -20,6 +20,7 @@ function createEmoteRoom(array $attributes = []): Room
}
test('a participant can throw a realtime paper ball at another player', function () {
Event::fake([PaperBallThrown::class]);
$room = createEmoteRoom(['last_activity_at' => now()->subDay()]);
$sender = $room->players()->create([
'name' => 'Eric',
@@ -32,7 +33,6 @@ test('a participant can throw a realtime paper ball at another player', function
$room->refresh();
$activity = $room->last_activity_at;
$stateVersion = $room->state_version;
Event::fake([PaperBallThrown::class]);
$this->withSession(["room_players.{$room->id}" => $sender->id])
->postJson(route('room.emote.paper-ball.store', $room), [
@@ -44,14 +44,12 @@ test('a participant can throw a realtime paper ball at another player', function
return $event->roomId === $room->id
&& $event->fromPlayerId === $sender->id
&& $event->targetPlayerId === $target->id
&& $event->chargeLevel === 0
&& $event->broadcastOn()->name === "rooms.{$room->id}"
&& $event->broadcastAs() === 'room.emote.thrown'
&& array_keys($event->broadcastWith()) === [
'id',
'from_player_id',
'target_player_id',
'charge_level',
];
});
@@ -61,9 +59,10 @@ test('a participant can throw a realtime paper ball at another player', function
->and($room->state_version)->toBe($stateVersion);
});
test('paper ball charge percentages map to the expected level', function (int $chargePercentage, int $expectedLevel) {
test('moderator paper ball throws are not rate limited', function () {
Event::fake([PaperBallThrown::class]);
$room = createEmoteRoom();
$sender = $room->players()->create([
$moderator = $room->players()->create([
'name' => 'Eric',
'is_moderator' => true,
]);
@@ -71,54 +70,46 @@ test('paper ball charge percentages map to the expected level', function (int $c
'name' => 'Anna',
'is_moderator' => false,
]);
for ($throwCount = 0; $throwCount < 11; $throwCount++) {
$this->withSession(["room_players.{$room->id}" => $moderator->id])
->postJson(route('room.emote.paper-ball.store', $room), [
'target_player_id' => $target->id,
])
->assertNoContent();
}
Event::assertDispatchedTimes(PaperBallThrown::class, 11);
});
test('participant paper ball throws remain rate limited', function () {
Event::fake([PaperBallThrown::class]);
$this->withSession(["room_players.{$room->id}" => $sender->id])
->postJson(route('room.emote.paper-ball.store', $room), [
'target_player_id' => $target->id,
'charge_percentage' => $chargePercentage,
])
->assertNoContent();
Event::assertDispatched(
PaperBallThrown::class,
fn (PaperBallThrown $event): bool => $event->chargeLevel === $expectedLevel,
);
})->with([
'uncharged' => [0, 0],
'just below level one' => [99, 0],
'level one threshold' => [100, 1],
'top of level one' => [199, 1],
'level two threshold' => [200, 2],
'top of level two' => [299, 2],
'level three threshold and cap' => [300, 3],
]);
test('paper ball charge percentages outside the supported range are rejected', function (int $chargePercentage) {
$room = createEmoteRoom();
$sender = $room->players()->create([
$moderator = $room->players()->create([
'name' => 'Eric',
'is_moderator' => true,
]);
$target = $room->players()->create([
$participant = $room->players()->create([
'name' => 'Anna',
'is_moderator' => false,
]);
Event::fake([PaperBallThrown::class]);
$this->withSession(["room_players.{$room->id}" => $sender->id])
for ($throwCount = 0; $throwCount < 10; $throwCount++) {
$this->withSession(["room_players.{$room->id}" => $participant->id])
->postJson(route('room.emote.paper-ball.store', $room), [
'target_player_id' => $moderator->id,
])
->assertNoContent();
}
$this->withSession(["room_players.{$room->id}" => $participant->id])
->postJson(route('room.emote.paper-ball.store', $room), [
'target_player_id' => $target->id,
'charge_percentage' => $chargePercentage,
'target_player_id' => $moderator->id,
])
->assertUnprocessable()
->assertJsonValidationErrors('charge_percentage');
->assertTooManyRequests();
Event::assertNotDispatched(PaperBallThrown::class);
})->with([
'below zero' => -1,
'above the cap' => 301,
]);
Event::assertDispatchedTimes(PaperBallThrown::class, 10);
});
test('a participant cannot throw a paper ball at themselves', function () {
Event::fake([PaperBallThrown::class]);
+1 -7
View File
@@ -20,11 +20,6 @@ test('favorited rooms are presented on the dashboard with player counts', functi
'name' => 'Active player',
'last_seen_at' => now(),
]);
$room->players()->create([
'name' => 'Inactive player',
'last_seen_at' => now()->subHour(),
'inactive_at' => now(),
]);
$this->actingAs($user)
->post(route('room.favorite', $room))
@@ -39,8 +34,7 @@ test('favorited rooms are presented on the dashboard with player counts', functi
->assertInertia(fn (Assert $page) => $page
->has('favoriteRooms', 1)
->where('favoriteRooms.0.id', $room->id)
->where('favoriteRooms.0.players_count', 2)
->where('favoriteRooms.0.active_player_count', 1));
->where('favoriteRooms.0.players_count', 1));
});
test('the room resource exposes favorite and owner state', function () {
+38 -4
View File
@@ -1,11 +1,14 @@
<?php
use App\Enums\RoomStateChange;
use App\Events\RoomStateChanged;
use App\Jobs\CloseInactiveRooms;
use App\Models\Deck;
use App\Models\Room;
use App\Models\User;
use App\Models\Vote;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Event;
use Inertia\Testing\AssertableInertia as Assert;
function createLifecycleRoom(array $attributes = []): Room
@@ -156,6 +159,36 @@ test('an authenticated player rejoins with the existing room identity', function
$response->assertSessionHas("room_players.{$room->id}", $player->id);
});
test('a new account instance takes over the player during a regular room join', function () {
$user = User::factory()->create();
$room = createLifecycleRoom();
$player = $room->players()->create([
'user_id' => $user->id,
'name' => 'Room nickname',
'active_instance_id' => '019b8f80-37c4-71a3-b415-5f2697332c16',
]);
Event::fake([RoomStateChanged::class]);
$this->actingAs($user)
->withSession([
'room_player_instance_id' => '019b8f80-37c4-71a3-b415-5f2697332c17',
])
->post(route('room.code'), [
'join_code' => $room->join_code,
'player_name' => 'Room nickname',
])
->assertRedirect(route('room.show', $room));
expect($player->fresh()->active_instance_id)
->toBe('019b8f80-37c4-71a3-b415-5f2697332c17');
Event::assertDispatched(
RoomStateChanged::class,
fn (RoomStateChanged $event): bool => $event->change === RoomStateChange::PlayerInstanceReplaced
&& $event->affectedPlayerId === $player->id,
);
});
test('an authenticated player can restore room access without the previous session', function () {
$user = User::factory()->create();
$room = createLifecycleRoom(['owner_id' => $user->id]);
@@ -183,15 +216,16 @@ test('an active guest with a room session skips the join form', function () {
->assertRedirect(route('room.show', $room));
});
test('an inactive guest is sent through join and reuses the existing player', function () {
test('a removed guest joins again with a new player identity', function () {
$room = createLifecycleRoom();
$player = $room->players()->create([
'name' => 'Returning guest',
'last_seen_at' => now()->subHours(2),
'inactive_at' => now()->subHour(),
]);
$session = ["room_players.{$room->id}" => $player->id];
$player->delete();
$this->withSession($session)
->get(route('room.show', $room))
->assertRedirect(route('room.join', ['join_code' => $room->join_code]));
@@ -200,7 +234,7 @@ test('an inactive guest is sent through join and reuses the existing player', fu
->get(route('room.join', ['join_code' => $room->join_code]))
->assertInertia(fn (Assert $page) => $page
->component('rooms/Join')
->where('defaultPlayerName', 'Returning guest'));
->where('defaultPlayerName', null));
$this->withSession($session)
->post(route('room.code'), [
@@ -210,7 +244,7 @@ test('an inactive guest is sent through join and reuses the existing player', fu
->assertRedirect(route('room.show', $room));
expect($room->players()->count())->toBe(1)
->and($player->fresh()->inactive_at)->toBeNull();
->and($room->players()->sole()->id)->not->toBe($player->id);
});
test('showing or polling a room does not count as room activity', function () {
+255
View File
@@ -0,0 +1,255 @@
<?php
use App\Enums\RoomStateChange;
use App\Events\RoomStateChanged;
use App\Models\Player;
use App\Models\Room;
use App\Models\User;
use Illuminate\Support\Facades\Event;
use Inertia\Testing\AssertableInertia as Assert;
function createRoomForPlayerKick(User $owner, array $attributes = []): Room
{
return Room::create([
'owner_id' => $owner->id,
'title' => 'Team Planning',
'current_round' => 1,
'deck_config' => [
'name' => 'Fibonacci',
'cards' => [
['key' => '3', 'label' => '3'],
['key' => '5', 'label' => '5'],
],
],
...$attributes,
]);
}
function addPlayerToKickRoom(
Room $room,
string $name,
?User $user = null,
bool $isModerator = false,
): Player {
return $room->players()->create([
'user_id' => $user?->id,
'name' => $name,
'is_moderator' => $isModerator,
'last_seen_at' => now(),
]);
}
test('the room owner sees active room players on the dashboard', function () {
$owner = User::factory()->create();
$room = createRoomForPlayerKick($owner);
$moderator = addPlayerToKickRoom($room, 'Moderator', $owner, true);
$participant = addPlayerToKickRoom($room, 'Anna');
$this->actingAs($owner)
->get(route('dashboard'))
->assertInertia(fn (Assert $page) => $page
->has('rooms.0.players', 2)
->where('rooms.0.players.0.id', $moderator->id)
->where('rooms.0.players.0.is_moderator', true)
->where('rooms.0.players.0.is_owner', true)
->where('rooms.0.players.1.id', $participant->id)
->where('rooms.0.players.1.is_moderator', false)
->where('rooms.0.players.1.is_owner', false));
});
test('the room owner can kick an active participant', function () {
$owner = User::factory()->create();
$room = createRoomForPlayerKick($owner);
addPlayerToKickRoom($room, 'Moderator', $owner, true);
$participant = addPlayerToKickRoom($room, 'Anna');
$remainingPlayer = addPlayerToKickRoom($room, 'Ben');
$remainingPlayer->votes()->create([
'room_id' => $room->id,
'round' => $room->current_round,
'value' => '5',
]);
$previousVersion = $room->fresh()->state_version;
Event::fake([RoomStateChanged::class]);
$this->actingAs($owner)
->delete(route('room.player.destroy', [$room, $participant]))
->assertRedirect();
$this->assertModelMissing($participant);
expect($room->fresh()->state_version)->toBe($previousVersion + 1);
Event::assertDispatched(
RoomStateChanged::class,
function (RoomStateChanged $event) use ($participant, $remainingPlayer, $room): bool {
if (
$event->roomId !== $room->id
|| $event->change !== RoomStateChange::PlayerKicked
|| $event->affectedPlayerId !== $participant->id
|| $event->state === null
) {
return false;
}
$remainingPlayerState = collect($event->state['players'])
->firstWhere('id', $remainingPlayer->id);
return collect($event->state['players'])->doesntContain('id', $participant->id)
&& $remainingPlayerState['has_voted'] === true
&& $remainingPlayerState['vote'] === null
&& $event->broadcastWith()['affected_player_id'] === $participant->id;
},
);
Event::assertDispatchedTimes(RoomStateChanged::class, 1);
});
test('a kicked guest loses their votes and their name becomes available', function () {
$owner = User::factory()->create();
$room = createRoomForPlayerKick($owner);
addPlayerToKickRoom($room, 'Moderator', $owner, true);
$guest = addPlayerToKickRoom($room, 'Nico');
$vote = $guest->votes()->create([
'room_id' => $room->id,
'round' => $room->current_round,
'value' => '3',
]);
$this->actingAs($owner)
->delete(route('room.player.destroy', [$room, $guest]))
->assertRedirect();
$this->assertModelMissing($guest);
$this->assertModelMissing($vote);
auth()->logout();
$this->withSession(["room_players.{$room->id}" => $guest->id])
->post(route('room.code'), [
'join_code' => $room->join_code,
'player_name' => 'Nico',
])
->assertRedirect(route('room.show', $room));
expect($room->players()->where('name', 'Nico')->sole()->id)->not->toBe($guest->id);
});
test('the room moderator can kick an active participant without shared management', function () {
$owner = User::factory()->create();
$room = createRoomForPlayerKick($owner, ['owner_id' => null]);
$moderator = addPlayerToKickRoom($room, 'Moderator', null, true);
$target = addPlayerToKickRoom($room, 'Anna');
Event::fake([RoomStateChanged::class]);
$this->withSession(["room_players.{$room->id}" => $moderator->id])
->delete(route('room.player.destroy', [$room, $target]))
->assertRedirect();
$this->assertModelMissing($target);
Event::assertDispatchedTimes(RoomStateChanged::class, 1);
});
test('a participant cannot kick another player when participant management is disabled', function () {
$owner = User::factory()->create();
$participantUser = User::factory()->create();
$room = createRoomForPlayerKick($owner);
addPlayerToKickRoom($room, 'Moderator', $owner, true);
$participant = addPlayerToKickRoom($room, 'Anna', $participantUser);
$target = addPlayerToKickRoom($room, 'Ben');
Event::fake([RoomStateChanged::class]);
$this->actingAs($participantUser)
->withSession(["room_players.{$room->id}" => $participant->id])
->delete(route('room.player.destroy', [$room, $target]))
->assertForbidden();
$this->assertModelExists($target);
Event::assertNotDispatched(RoomStateChanged::class);
});
test('a participant can kick another player when participant management is enabled', function () {
$owner = User::factory()->create();
$room = createRoomForPlayerKick($owner, [
'allow_participants_to_manage_rounds' => true,
]);
addPlayerToKickRoom($room, 'Moderator', $owner, true);
$participant = addPlayerToKickRoom($room, 'Anna');
$target = addPlayerToKickRoom($room, 'Ben');
Event::fake([RoomStateChanged::class]);
$this->withSession(["room_players.{$room->id}" => $participant->id])
->delete(route('room.player.destroy', [$room, $target]))
->assertRedirect();
$this->assertModelMissing($target);
Event::assertDispatched(RoomStateChanged::class);
});
test('a participant cannot kick themselves when participant management is enabled', function () {
$owner = User::factory()->create();
$room = createRoomForPlayerKick($owner, [
'allow_participants_to_manage_rounds' => true,
]);
$participant = addPlayerToKickRoom($room, 'Anna');
Event::fake([RoomStateChanged::class]);
$this->withSession(["room_players.{$room->id}" => $participant->id])
->delete(route('room.player.destroy', [$room, $participant]))
->assertForbidden();
$this->assertModelExists($participant);
Event::assertNotDispatched(RoomStateChanged::class);
});
test('an anonymous visitor without a room session cannot kick from an ownerless room', function () {
$owner = User::factory()->create();
$room = createRoomForPlayerKick($owner, [
'owner_id' => null,
'allow_participants_to_manage_rounds' => true,
]);
addPlayerToKickRoom($room, 'Moderator', null, true);
$target = addPlayerToKickRoom($room, 'Ben');
Event::fake([RoomStateChanged::class]);
$this->delete(route('room.player.destroy', [$room, $target]))
->assertForbidden();
$this->assertModelExists($target);
Event::assertNotDispatched(RoomStateChanged::class);
});
test('the room owner cannot kick their own player', function () {
$owner = User::factory()->create();
$room = createRoomForPlayerKick($owner);
$moderator = addPlayerToKickRoom($room, 'Moderator', $owner, true);
Event::fake([RoomStateChanged::class]);
$this->actingAs($owner)
->delete(route('room.player.destroy', [$room, $moderator]))
->assertForbidden();
$this->assertModelExists($moderator);
Event::assertNotDispatched(RoomStateChanged::class);
});
test('the room owner cannot kick a player from another room', function () {
$owner = User::factory()->create();
$otherOwner = User::factory()->create();
$room = createRoomForPlayerKick($owner);
$otherRoom = createRoomForPlayerKick($otherOwner, ['title' => 'Other room']);
$target = addPlayerToKickRoom($otherRoom, 'Anna');
Event::fake([RoomStateChanged::class]);
$this->actingAs($owner)
->delete(route('room.player.destroy', [$room, $target]))
->assertForbidden();
$this->assertModelExists($target);
Event::assertNotDispatched(RoomStateChanged::class);
});
+158
View File
@@ -0,0 +1,158 @@
<?php
use App\Enums\RoomStateChange;
use App\Events\RoomStateChanged;
use App\Jobs\CloseInactiveRooms;
use App\Models\Room;
use App\Models\User;
use Illuminate\Support\Facades\Event;
use Inertia\Testing\AssertableInertia as Assert;
function createSettingsRoom(array $attributes = []): Room
{
return Room::create([
'title' => 'Teamraum',
'deck_config' => [
'name' => 'Fibonacci',
'cards' => [
['key' => '3', 'label' => '3'],
['key' => '5', 'label' => '5'],
],
],
...$attributes,
]);
}
test('room settings default to moderator control and normal retention', function () {
$room = createSettingsRoom();
expect($room->allow_participants_to_manage_rounds)->toBeFalse()
->and($room->is_persistent)->toBeFalse();
});
test('the owner can view and update room settings', function () {
$owner = User::factory()->create();
$room = createSettingsRoom(['owner_id' => $owner->id]);
$this->actingAs($owner)
->get(route('room.settings.edit', $room))
->assertInertia(fn (Assert $page) => $page
->component('rooms/Settings')
->where('room.id', $room->id)
->where('room.allow_participants_to_manage_rounds', false)
->where('room.is_persistent', false));
Event::fake();
$this->actingAs($owner)
->patch(route('room.settings.update', $room), [
'allow_participants_to_manage_rounds' => true,
'is_persistent' => true,
])
->assertRedirect();
$room->refresh();
expect($room->allow_participants_to_manage_rounds)->toBeTrue()
->and($room->is_persistent)->toBeTrue()
->and($room->state_version)->toBe(2);
Event::assertDispatched(
RoomStateChanged::class,
fn (RoomStateChanged $event): bool => $event->change === RoomStateChange::RoomSettingsUpdated
&& $event->state['allow_participants_to_manage_rounds'] === true,
);
});
test('a user who does not own a room cannot manage its settings', function () {
$owner = User::factory()->create();
$otherUser = User::factory()->create();
$room = createSettingsRoom(['owner_id' => $owner->id]);
$this->actingAs($otherUser)
->get(route('room.settings.edit', $room))
->assertForbidden();
$this->actingAs($otherUser)
->patch(route('room.settings.update', $room), [
'allow_participants_to_manage_rounds' => true,
'is_persistent' => true,
])
->assertForbidden();
expect($room->fresh()->allow_participants_to_manage_rounds)->toBeFalse();
});
test('all active participants can manage rounds when the room setting is enabled', function () {
$room = createSettingsRoom(['allow_participants_to_manage_rounds' => true]);
$player = $room->players()->create([
'name' => 'Anna',
'is_moderator' => false,
]);
$this->withSession(["room_players.{$room->id}" => $player->id])
->post(route('room.reveal', $room))
->assertNoContent();
expect($room->fresh()->revealed_at)->not->toBeNull();
});
test('normal participants remain unable to manage rounds when the setting is disabled', function () {
$room = createSettingsRoom();
$player = $room->players()->create([
'name' => 'Anna',
'is_moderator' => false,
]);
$this->withSession(["room_players.{$room->id}" => $player->id])
->post(route('room.reveal', $room))
->assertForbidden();
});
test('persistent rooms are excluded from automatic closing', function () {
$persistentRoom = createSettingsRoom([
'owner_id' => User::factory()->create()->id,
'is_persistent' => true,
'last_activity_at' => now()->subDays(60),
]);
$expiringRoom = createSettingsRoom([
'owner_id' => User::factory()->create()->id,
'last_activity_at' => now()->subDays(60),
]);
(new CloseInactiveRooms)->handle();
expect($persistentRoom->fresh()->closed_at)->toBeNull()
->and($expiringRoom->fresh()->closed_at)->not->toBeNull();
});
test('room settings broadcasts never expose hidden vote values', function () {
$owner = User::factory()->create();
$room = createSettingsRoom(['owner_id' => $owner->id]);
$player = $room->players()->create([
'name' => 'Anna',
'is_moderator' => false,
]);
$player->votes()->create([
'room_id' => $room->id,
'round' => 1,
'value' => '5',
]);
Event::fake();
$this->actingAs($owner)->patch(route('room.settings.update', $room), [
'allow_participants_to_manage_rounds' => true,
'is_persistent' => false,
]);
Event::assertDispatched(
RoomStateChanged::class,
function (RoomStateChanged $event) use ($player): bool {
$broadcastPlayer = collect($event->state['players'])->firstWhere('id', $player->id);
return $broadcastPlayer['has_voted'] === true
&& $broadcastPlayer['vote'] === null;
},
);
});