Compare commits

13 Commits
Author SHA1 Message Date
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
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
Twyco b2c1d67283 Merge pull request #3 from ericasch6/codex/websocket-room-actions
CI/CD / test_and_check_app (push) Successful in 3m25s
CI/CD / Publish immutable image (push) Successful in 2m29s
Implement instant websocket room updates
2026-08-27 08:48:05 +02:00
Twyco d6e5455e90 Implement instant websocket room updates 2026-08-25 22:23:38 +02:00
58 changed files with 1896 additions and 211 deletions
+7
View File
@@ -0,0 +1,7 @@
# Project Rules Index
Before planning or editing, find the row whose globs match the file's path and read that rule file.
| Applies to | Rule file |
| --- | --- |
| {app/Events/**,app/Services/Rooms/**,resources/js/composables/**} | .ai/rules/js-composables.md |
+9
View File
@@ -0,0 +1,9 @@
---
paths:
- '{app/Events/**,app/Services/Rooms/**,resources/js/composables/**}'
---
# Js Composables
## Never broadcast hidden room votes
Room table updates are delivered as synchronous WebSocket state payloads without polling or Inertia reloads. Before a round is revealed, broadcast only has_voted and keep every player's vote null; actual vote values may enter the shared payload only after reveal. State-changing commands remain server-authorized HTTP requests.
-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
+3
View File
@@ -5,6 +5,8 @@ namespace App\Enums;
enum RoomStateChange: string
{
case PlayerJoined = 'player_joined';
case PlayerUpdated = 'player_updated';
case PlayerKicked = 'player_kicked';
case VoteChanged = 'vote_changed';
case CardsRevealed = 'cards_revealed';
case VotesReset = 'votes_reset';
@@ -12,4 +14,5 @@ enum RoomStateChange: string
case RoomReopened = 'room_reopened';
case RoomClosed = 'room_closed';
case RoomDeleted = 'room_deleted';
case RoomSettingsUpdated = 'room_settings_updated';
}
+16 -4
View File
@@ -5,18 +5,23 @@ namespace App\Events;
use App\Enums\RoomStateChange;
use Illuminate\Broadcasting\Channel;
use Illuminate\Broadcasting\InteractsWithSockets;
use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Queue\SerializesModels;
class RoomStateChanged implements ShouldBroadcast
class RoomStateChanged implements ShouldBroadcastNow
{
use Dispatchable, InteractsWithSockets, SerializesModels;
/**
* @param array<string, mixed>|null $state
*/
public function __construct(
public readonly string $roomId,
public readonly int $version,
public readonly RoomStateChange $change,
public readonly ?array $state = null,
public readonly ?int $affectedPlayerId = null,
) {}
public function broadcastOn(): Channel
@@ -30,13 +35,20 @@ class RoomStateChanged implements ShouldBroadcast
}
/**
* @return array{version: int, change: string}
* @return array{version: int, change: string, state: array<string, mixed>|null, affected_player_id?: int}
*/
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;
}
return $payload;
}
}
@@ -0,0 +1,28 @@
<?php
namespace App\Http\Controllers;
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();
Auth::guard('web')->logout();
$request->session()->invalidate();
$request->session()->regenerateToken();
return to_route('embedded.room', [
'join_code' => $joinCode,
'player_name' => $playerName,
]);
}
}
@@ -0,0 +1,49 @@
<?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\Models\User;
use App\Services\Rooms\RoomPageService;
use App\Services\Rooms\RoomParticipationService;
use Inertia\Inertia;
use Inertia\Response;
class EmbeddedRoomController extends Controller
{
public function __construct(
private readonly RoomParticipationService $roomParticipation,
private readonly RoomPageService $roomPage,
) {}
public function __invoke(ShowEmbeddedRoomRequest $request): Response
{
/** @var array{join_code: string, player_name: string} $validated */
$validated = $request->validated();
$user = $request->user();
abort_unless($user instanceof User, 403);
$room = Room::query()
->where('join_code', $validated['join_code'])
->firstOrFail();
$player = $this->roomParticipation->joinEmbedded(
$room,
$user,
$validated['player_name'],
);
$request->session()->put("room_players.{$room->id}", $player->id);
$request->session()->forget('embedded_login');
$pageData = $this->roomPage->prepare($room, $player, $user);
return Inertia::render('embedded/Room', [
'room' => (new RoomResource($pageData))->resolve($request),
'currentPlayer' => (new CurrentPlayerResource($pageData))->resolve($request),
]);
}
}
@@ -0,0 +1,34 @@
<?php
namespace App\Http\Controllers;
use App\Http\Requests\KickRoomPlayerRequest;
use App\Models\Player;
use App\Models\Room;
use App\Models\User;
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
{
$user = $request->user();
abort_unless($user instanceof User, 403);
$this->roomParticipation->kick($room, $player, $user);
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();
}
}
+12 -12
View File
@@ -5,8 +5,8 @@ namespace App\Http\Controllers;
use App\Models\Player;
use App\Models\Room;
use App\Services\Rooms\RoundService;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
class RoundController extends Controller
{
@@ -14,38 +14,38 @@ class RoundController extends Controller
private readonly RoundService $rounds,
) {}
public function reset(Request $request, Room $room): RedirectResponse
public function reset(Request $request, Room $room): Response
{
$this->ensureModerator($request, $room);
$this->ensureCanManageRounds($request, $room);
$this->rounds->reset($room);
return back();
return response()->noContent();
}
public function reveal(Request $request, Room $room): RedirectResponse
public function reveal(Request $request, Room $room): Response
{
$this->ensureModerator($request, $room);
$this->ensureCanManageRounds($request, $room);
$this->rounds->reveal($room);
return back();
return response()->noContent();
}
public function nextRound(Request $request, Room $room): RedirectResponse
public function nextRound(Request $request, Room $room): Response
{
$this->ensureModerator($request, $room);
$this->ensureCanManageRounds($request, $room);
$this->rounds->startNext($room);
return back();
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,
);
}
+3 -3
View File
@@ -6,7 +6,7 @@ use App\Http\Requests\SubmitVoteRequest;
use App\Models\Player;
use App\Models\Room;
use App\Services\Rooms\VoteService;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Response;
class VoteController extends Controller
{
@@ -17,7 +17,7 @@ class VoteController extends Controller
public function store(
SubmitVoteRequest $request,
Room $room,
): RedirectResponse {
): Response {
$player = $request->attributes->get('currentPlayer');
abort_unless(
@@ -32,6 +32,6 @@ class VoteController extends Controller
$request->validated('value'),
);
return back();
return response()->noContent();
}
}
@@ -0,0 +1,35 @@
<?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');
$player = $this->route('player');
return $room instanceof Room
&& $player instanceof Player
&& $this->user()?->id === $room->owner_id
&& $player->room_id === $room->id
&& $player->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 [];
}
}
@@ -0,0 +1,110 @@
<?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
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return $this->user() !== null;
}
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 || $this->user() === null) {
return;
}
$nameIsTaken = Player::query()
->where('room_id', $room->id)
->where('name', $this->input('player_name'))
->where(function ($query): void {
$query->whereNull('user_id')
->orWhere('user_id', '!=', $this->user()->id);
})
->exists();
if ($nameIsTaken) {
$validator->errors()->add(
'player_name',
'Dieser Anzeigename ist in dem Raum bereits vorhanden.',
);
}
},
];
}
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
{
throw new HttpResponseException(
Inertia::render('embedded/Error', [
'message' => $validator->errors()->first(),
])->toResponse($this)->setStatusCode(422),
);
}
}
@@ -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,17 @@ class DashboardRoomResource extends JsonResource
'current_round' => $this->resource->current_round,
'players_count' => $this->resource->players_count,
'active_player_count' => $this->resource->active_player_count,
'players' => $this->resource->relationLoaded('activePlayers')
? $this->resource->activePlayers
->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;
}
+11
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',
];
}
+1
View File
@@ -51,6 +51,7 @@ class FortifyServiceProvider extends ServiceProvider
Fortify::loginView(fn (Request $request) => Inertia::render('auth/Login', [
'canResetPassword' => Features::enabled(Features::resetPasswords()),
'status' => $request->session()->get('status'),
'rememberByDefault' => $request->session()->get('embedded_login', false),
]));
Fortify::resetPasswordView(fn (Request $request) => Inertia::render('auth/ResetPassword', [
@@ -15,6 +15,12 @@ class DashboardRoomService
{
$ownedRooms = $user
->ownedRooms()
->with([
'activePlayers' => 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')
+9 -7
View File
@@ -29,15 +29,17 @@ 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);
RateLimiter::hit($rateLimitKey, 10);
}
PaperBallThrown::dispatch(
Str::uuid()->toString(),
@@ -11,6 +11,10 @@ use Illuminate\Support\Facades\DB;
class RoomLifecycleService
{
public function __construct(
private readonly RoomRealtimeStateService $realtimeState,
) {}
/**
* @return array{player: Player, was_reopened: bool}
*/
@@ -49,6 +53,7 @@ class RoomLifecycleService
$room->id,
$stateVersion,
RoomStateChange::RoomReopened,
$this->realtimeState->for($room),
);
}
@@ -12,6 +12,10 @@ use Illuminate\Validation\ValidationException;
class RoomParticipationService
{
public function __construct(
private readonly RoomRealtimeStateService $realtimeState,
) {}
public function findByJoinCode(string $joinCode): ?Room
{
if ($joinCode === '') {
@@ -92,8 +96,130 @@ class RoomParticipationService
$room->id,
$room->state_version,
RoomStateChange::PlayerJoined,
$this->realtimeState->for($room),
);
return [$room, $player];
}
public function joinEmbedded(Room $room, User $user, string $playerName): Player
{
[$player, $change, $stateVersion] = DB::transaction(function () use ($room, $user, $playerName): array {
$lockedRoom = Room::query()
->lockForUpdate()
->findOrFail($room->id);
if ($lockedRoom->isClosed()) {
throw ValidationException::withMessages([
'join_code' => 'Dieser Raum ist geschlossen.',
]);
}
$nameIsTaken = $lockedRoom->players()
->where('name', $playerName)
->where(function ($query) use ($user): void {
$query->whereNull('user_id')
->orWhere('user_id', '!=', $user->id);
})
->exists();
if ($nameIsTaken) {
throw ValidationException::withMessages([
'player_name' => 'Dieser Anzeigename ist in dem Raum bereits vorhanden.',
]);
}
$player = $lockedRoom->players()
->where('user_id', $user->id)
->first();
$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->inactive_at !== null) {
$change = RoomStateChange::PlayerJoined;
} elseif ($player->name !== $playerName) {
$change = RoomStateChange::PlayerUpdated;
}
$player->update([
'name' => $playerName,
'last_seen_at' => now(),
'inactive_at' => null,
]);
}
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;
}
public function kick(Room $room, Player $player, User $user): void
{
$stateVersion = DB::transaction(function () use ($room, $player, $user): ?int {
$lockedRoom = Room::query()
->lockForUpdate()
->findOrFail($room->id);
abort_unless($lockedRoom->owner_id === $user->id, 403);
$lockedPlayer = $lockedRoom->players()
->lockForUpdate()
->findOrFail($player->id);
abort_if($lockedPlayer->user_id === $lockedRoom->owner_id, 403);
if ($lockedPlayer->inactive_at !== null) {
return null;
}
$lockedPlayer->update([
'inactive_at' => now(),
]);
$lockedRoom->update([
'last_activity_at' => now(),
'state_version' => $lockedRoom->state_version + 1,
]);
return $lockedRoom->state_version;
});
if ($stateVersion === null) {
return;
}
RoomStateChanged::dispatch(
$room->id,
$stateVersion,
RoomStateChange::PlayerKicked,
$this->realtimeState->for($room),
$player->id,
);
}
}
@@ -0,0 +1,66 @@
<?php
namespace App\Services\Rooms;
use App\Models\Room;
class RoomRealtimeStateService
{
public function __construct(
private readonly RoomStatisticsService $statistics,
) {}
/**
* @return array{
* 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,
* name: string,
* is_moderator: bool,
* is_owner: bool,
* has_voted: bool,
* vote: string|null
* }>
* }
*/
public function for(Room $room): array
{
$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'),
'players.votes' => fn ($query) => $query
->where('room_id', $room->id)
->where('round', $room->current_round),
]);
return [
'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 {
$vote = $player->votes->first();
return [
'id' => $player->id,
'name' => $player->name,
'is_moderator' => $player->is_moderator,
'is_owner' => $player->user_id === $room->owner_id,
'has_voted' => $vote !== null,
'vote' => $room->revealed_at !== null ? $vote?->value : null,
];
})
->all(),
];
}
}
@@ -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),
);
}
}
+7
View File
@@ -11,6 +11,10 @@ use Illuminate\Validation\ValidationException;
class RoundService
{
public function __construct(
private readonly RoomRealtimeStateService $realtimeState,
) {}
public function reset(Room $room): void
{
$stateVersion = DB::transaction(function () use ($room): int {
@@ -38,6 +42,7 @@ class RoundService
$room->id,
$stateVersion,
RoomStateChange::VotesReset,
$this->realtimeState->for($room),
);
}
@@ -69,6 +74,7 @@ class RoundService
$room->id,
$stateVersion,
RoomStateChange::CardsRevealed,
$this->realtimeState->for($room),
);
}
@@ -101,6 +107,7 @@ class RoundService
$room->id,
$stateVersion,
RoomStateChange::NextRound,
$this->realtimeState->for($room),
);
}
+5
View File
@@ -12,6 +12,10 @@ use Illuminate\Validation\ValidationException;
class VoteService
{
public function __construct(
private readonly RoomRealtimeStateService $realtimeState,
) {}
public function submit(Room $room, Player $player, string $value): void
{
$stateVersion = DB::transaction(function () use ($room, $player, $value): int {
@@ -52,6 +56,7 @@ class VoteService
$room->id,
$stateVersion,
RoomStateChange::VoteChanged,
$this->realtimeState->for($room),
);
}
}
+7
View File
@@ -18,6 +18,13 @@ return Application::configure(basePath: dirname(__DIR__))
)
->withMiddleware(function (Middleware $middleware): void {
$middleware->trustProxies(at: '*');
$middleware->redirectGuestsTo(function (Request $request): string {
if ($request->isMethod('GET') && $request->is('embedded/scrum-poker')) {
$request->session()->put('embedded_login', true);
}
return route('login');
});
$middleware->encryptCookies(except: ['appearance', 'sidebar_state']);
$middleware->alias([
'room.player' => EnsureRoomParticipant::class,
@@ -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',
]);
});
}
};
+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;
+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>
@@ -0,0 +1,91 @@
<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 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"
:can-favorite="canFavorite"
:embedded="embedded"
: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>
+20 -1
View File
@@ -1,9 +1,10 @@
<script setup lang="ts">
import { Link } from '@inertiajs/vue3';
import { Check, Copy } from '@lucide/vue';
import { Check, Copy, LogOut } from '@lucide/vue';
import { ref } from 'vue';
import { Checkbox } from '@/components/ui/checkbox';
import { logout as embeddedLogout } from '@/routes/embedded';
import { favorite } from '@/routes/room';
import type { RoomHeaderEmits, RoomHeaderProps } from '@/types/room';
@@ -48,6 +49,24 @@ async function copyInviteLink(): Promise<void> {
</div>
<div class="flex flex-col items-end gap-2">
<Link
v-if="embedded"
:href="
embeddedLogout({
query: {
join_code,
player_name: playerName,
},
})
"
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>
<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"
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { useForm } from '@inertiajs/vue3';
import { useHttp } from '@inertiajs/vue3';
import { Eye, RotateCcw, Trash2 } from '@lucide/vue';
import { nextRound, reset as resetRound, reveal } from '@/routes/room';
@@ -7,26 +7,29 @@ import type { RoomModeratorControlsProps } from '@/types/room';
const props = defineProps<RoomModeratorControlsProps>();
const revealForm = useForm<{ room?: string }>({});
const nextRoundForm = useForm<{ room?: string }>({});
const resetForm = useForm<{ room?: string }>({});
const revealRequest = useHttp<{ room?: string }>(
() => reveal(props.roomId),
{},
);
const nextRoundRequest = useHttp<{ room?: string }>(
() => nextRound(props.roomId),
{},
);
const resetRequest = useHttp<{ room?: string }>(
() => resetRound(props.roomId),
{},
);
function revealCards(): void {
revealForm.submit(reveal(props.roomId), {
preserveScroll: true,
});
void revealRequest.submit();
}
function startNextRound(): void {
nextRoundForm.submit(nextRound(props.roomId), {
preserveScroll: true,
});
void nextRoundRequest.submit();
}
function resetVotes(): void {
resetForm.submit(resetRound(props.roomId), {
preserveScroll: true,
});
void resetRequest.submit();
}
</script>
@@ -35,7 +38,7 @@ function resetVotes(): void {
<button
type="button"
class="inline-flex items-center gap-2 rounded-xl border border-slate-600 bg-slate-800 px-4 py-2.5 font-semibold text-slate-200 transition hover:bg-slate-700 disabled:cursor-not-allowed disabled:opacity-40"
:disabled="resetForm.processing || !hasVotes"
:disabled="resetRequest.processing || !hasVotes"
@click="resetVotes"
>
<Trash2 class="size-4" />
@@ -45,18 +48,18 @@ function resetVotes(): void {
<div class="moderator-controls">
<p
v-if="revealForm.errors.room || nextRoundForm.errors.room"
v-if="revealRequest.errors.room || nextRoundRequest.errors.room"
class="max-w-64 rounded-lg bg-rose-950/90 px-3 py-2 text-right text-sm text-rose-200 shadow-lg"
role="alert"
>
{{ revealForm.errors.room ?? nextRoundForm.errors.room }}
{{ revealRequest.errors.room ?? nextRoundRequest.errors.room }}
</p>
<button
v-if="!revealed"
type="button"
class="inline-flex items-center gap-2 rounded-xl border border-slate-300 bg-slate-100 px-5 py-2.5 font-semibold text-slate-900 transition hover:bg-white disabled:opacity-50"
:disabled="revealForm.processing"
:disabled="revealRequest.processing"
@click="revealCards"
>
<Eye class="size-4" />
@@ -67,7 +70,7 @@ function resetVotes(): void {
v-else
type="button"
class="inline-flex items-center gap-2 rounded-xl border border-slate-300 bg-slate-100 px-5 py-2.5 font-semibold text-slate-900 transition hover:bg-white disabled:opacity-50"
:disabled="nextRoundForm.processing"
:disabled="nextRoundRequest.processing"
@click="startNextRound"
>
<RotateCcw class="size-4" />
+7 -11
View File
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { CircleUserRound, Crown } from '@lucide/vue';
import { CircleUserRound } from '@lucide/vue';
import type { RoomSeatProps } from '@/types/room';
@@ -75,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>
+8 -2
View File
@@ -21,6 +21,7 @@ const { activePaperBalls, hitPlayerIds, throwingAtPlayerId, throwPaperBall } =
usePaperBallToss({
roomId: () => props.room.id,
currentPlayerId: () => props.currentPlayer.id,
currentPlayerIsModerator: () => props.currentPlayer.is_moderator,
board: gameBoard,
});
@@ -115,12 +116,17 @@ const voteCount = computed(
:revealed="room.revealed"
:presenter-mode="presenterMode"
:is-paper-ball-hit="hitPlayerIds.includes(player.id)"
:throw-disabled="throwingAtPlayerId !== null"
:throw-disabled="
!currentPlayer.is_moderator && 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"
+20 -16
View File
@@ -1,13 +1,14 @@
<script setup lang="ts">
import { useForm } from '@inertiajs/vue3';
import { useHttp } from '@inertiajs/vue3';
import { Keyboard } from '@lucide/vue';
import { useEventListener } from '@vueuse/core';
import { watch } from 'vue';
import { store as storeVote } from '@/routes/room/vote';
import type { RoomVoteDeckProps } from '@/types/room';
import type { RoomVoteDeckEmits, RoomVoteDeckProps } from '@/types/room';
const props = defineProps<RoomVoteDeckProps>();
const emit = defineEmits<RoomVoteDeckEmits>();
const cardShortcuts = [
'1',
@@ -25,29 +26,32 @@ const cardShortcuts = [
),
];
const voteForm = useForm({
const voteRequest = useHttp(() => storeVote(props.roomId), {
value: props.currentVote ?? '',
});
watch(
() => props.currentVote,
(value) => {
if (!voteForm.processing) {
voteForm.value = value ?? '';
if (!voteRequest.processing) {
voteRequest.value = value ?? '';
}
},
);
function submitVote(value: string): void {
if (props.revealed || voteForm.processing) {
if (props.revealed || voteRequest.processing) {
return;
}
voteForm.value = value;
voteForm.submit(storeVote(props.roomId), {
preserveScroll: true,
const previousVote = props.currentVote;
voteRequest.value = value;
emit('vote-changed', value);
void voteRequest.submit({
onError: () => {
voteForm.value = props.currentVote ?? '';
voteRequest.value = previousVote ?? '';
emit('vote-changed', previousVote);
},
});
}
@@ -71,7 +75,7 @@ function handleKeyboardVote(event: KeyboardEvent): void {
if (
!props.presenterMode ||
props.revealed ||
voteForm.processing ||
voteRequest.processing ||
event.repeat ||
event.altKey ||
event.ctrlKey ||
@@ -118,10 +122,10 @@ useEventListener('keydown', handleKeyboardVote);
class="deck-card"
:class="{
'is-selected':
!presenterMode && voteForm.value === card.key,
!presenterMode && voteRequest.value === card.key,
}"
:disabled="voteForm.processing"
:aria-pressed="voteForm.value === card.key"
:disabled="voteRequest.processing"
:aria-pressed="voteRequest.value === card.key"
:aria-label="`Karte ${card.label} wählen`"
@click="submitVote(card.key)"
>
@@ -138,11 +142,11 @@ useEventListener('keydown', handleKeyboardVote);
</div>
<p
v-if="voteForm.errors.value"
v-if="voteRequest.errors.value"
class="mt-3 text-sm text-rose-300"
role="alert"
>
{{ voteForm.errors.value }}
{{ voteRequest.errors.value }}
</p>
</section>
</template>
+14 -7
View File
@@ -17,6 +17,7 @@ const THROW_BUTTON_COOLDOWN = 550;
export function usePaperBallToss({
roomId,
currentPlayerId,
currentPlayerIsModerator,
board,
}: PaperBallTossOptions) {
const activePaperBalls = ref<PaperBallFlight[]>([]);
@@ -35,9 +36,11 @@ export function usePaperBallToss({
}
async function throwPaperBall(targetPlayerId: number): Promise<void> {
const shouldApplyCooldown = !currentPlayerIsModerator();
if (
targetPlayerId === currentPlayerId() ||
throwingAtPlayerId.value !== null
(shouldApplyCooldown && throwingAtPlayerId.value !== null)
) {
return;
}
@@ -52,7 +55,9 @@ export function usePaperBallToss({
return;
}
throwingAtPlayerId.value = targetPlayerId;
if (shouldApplyCooldown) {
throwingAtPlayerId.value = targetPlayerId;
}
try {
const response = await fetch(throwPaperBallRoute(roomId()).url, {
@@ -91,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);
}
}
}
+72 -51
View File
@@ -1,72 +1,82 @@
import { router } from '@inertiajs/vue3';
import { onScopeDispose, watch } from 'vue';
import { onScopeDispose, ref, shallowReadonly, watch } from 'vue';
import { getEcho } from '@/lib/echo';
import type { RoomStateChangedPayload } from '@/types/room';
import { home } from '@/routes';
import { join } from '@/routes/room';
import type {
CurrentRoomPlayer,
PokerRoom,
RoomStateChangedPayload,
} from '@/types/room';
const ROOM_EVENT = '.room.state.changed';
export function useRoomRealtime(
roomId: () => string,
stateVersion: () => number,
): void {
let reloadInProgress = false;
let pendingVersion = 0;
let disposed = false;
function reloadRoom(): void {
if (reloadInProgress || disposed) {
return;
}
reloadInProgress = true;
router.reload({
only: ['room', 'currentPlayer'],
onFinish: () => {
reloadInProgress = false;
if (disposed) {
return;
}
if (pendingVersion > stateVersion()) {
reloadRoom();
return;
}
pendingVersion = stateVersion();
},
});
}
initialRoom: () => PokerRoom,
initialCurrentPlayer: () => CurrentRoomPlayer,
) {
const room = ref<PokerRoom>({ ...initialRoom() });
const currentPlayer = ref<CurrentRoomPlayer>({ ...initialCurrentPlayer() });
function handleRoomChange(payload: RoomStateChangedPayload): void {
if (
typeof payload.version !== 'number' ||
payload.version <= Math.max(stateVersion(), pendingVersion)
payload.version <= room.value.state_version
) {
return;
}
pendingVersion = payload.version;
if (payload.change === 'room_deleted') {
router.visit('/', { replace: true });
router.visit(home().url, { replace: true });
return;
}
reloadRoom();
if (
payload.change === 'player_kicked' &&
payload.affected_player_id === currentPlayer.value.id
) {
router.visit(home().url, { replace: true });
return;
}
if (payload.change === 'room_closed') {
router.visit(
join({ query: { join_code: room.value.join_code } }).url,
{ replace: true },
);
return;
}
if (payload.state === null || payload.state === undefined) {
return;
}
room.value = {
...room.value,
...payload.state,
};
if (
payload.change === 'votes_reset' ||
payload.change === 'next_round'
) {
currentPlayer.value = {
...currentPlayer.value,
current_vote: null,
};
}
}
const stopWatchingRoom = watch(
roomId,
() => initialRoom().id,
(nextRoomId, _previousRoomId, onCleanup) => {
const echo = getEcho();
const channelName = `rooms.${nextRoomId}`;
pendingVersion = stateVersion();
echo.channel(channelName).listen(ROOM_EVENT, handleRoomChange);
onCleanup(() => {
@@ -76,19 +86,30 @@ export function useRoomRealtime(
{ immediate: true },
);
const stopWatchingVersion = watch(
stateVersion,
(version) => {
if (!reloadInProgress) {
pendingVersion = Math.max(pendingVersion, version);
}
const stopWatchingInitialState = watch(
[initialRoom, initialCurrentPlayer],
([nextRoom, nextCurrentPlayer]) => {
room.value = { ...nextRoom };
currentPlayer.value = { ...nextCurrentPlayer };
},
{ flush: 'sync' },
{ deep: true },
);
onScopeDispose(() => {
disposed = true;
stopWatchingRoom();
stopWatchingVersion();
stopWatchingInitialState();
});
function setCurrentVote(value: string | null): void {
currentPlayer.value = {
...currentPlayer.value,
current_vote: value,
};
}
return {
room: shallowReadonly(room),
currentPlayer: shallowReadonly(currentPlayer),
setCurrentVote,
};
}
+7 -1
View File
@@ -23,6 +23,7 @@ defineOptions({
defineProps<{
status?: string;
canResetPassword: boolean;
rememberByDefault: boolean;
}>();
</script>
@@ -85,7 +86,12 @@ defineProps<{
<div class="flex items-center justify-between">
<Label for="remember" class="flex items-center space-x-3">
<Checkbox id="remember" name="remember" :tabindex="3" />
<Checkbox
id="remember"
name="remember"
:default-value="rememberByDefault"
:tabindex="3"
/>
<span>Remember me</span>
</Label>
</div>
+28
View File
@@ -0,0 +1,28 @@
<script setup lang="ts">
import { Head } from '@inertiajs/vue3';
import { CircleAlert } from '@lucide/vue';
defineProps<{
message: string;
}>();
</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>
<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>
+103
View File
@@ -0,0 +1,103 @@
<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-start gap-4">
<Checkbox
:model-value="form.allow_participants_to_manage_rounds"
@update:model-value="
form.allow_participants_to_manage_rounds =
$event === true
"
/>
<span>
<strong class="block"
>Alle dürfen Runden steuern</strong
>
<span class="mt-1 block text-sm text-slate-400">
Alle aktiven Teilnehmer, auch Gäste, dürfen Karten
aufdecken, Votes zurücksetzen und die nächste Runde
starten.
</span>
</span>
</label>
<InputError
:message="form.errors.allow_participants_to_manage_rounds"
/>
<label class="flex cursor-pointer items-start gap-4">
<Checkbox
:model-value="form.is_persistent"
@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 -54
View File
@@ -1,62 +1,10 @@
<script setup lang="ts">
import { Head, usePage, usePoll } 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,
);
useRoomRealtime(
() => props.room.id,
() => props.room.state_version,
);
usePoll(30_000, {
only: ['room', 'currentPlayer'],
});
</script>
<template>
<Head :title="room.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="room.id"
:title="room.title"
:join_code="room.join_code"
:is_favorite="room.is_favorite"
:can-favorite="canFavorite"
v-model:presenter-mode="presenterMode"
/>
<RoomTable
:room="room"
:current-player="currentPlayer"
:presenter-mode="presenterMode"
/>
<RoomVoteDeck
:room-id="room.id"
:revealed="room.revealed"
:cards="room.deck.cards"
:current-vote="currentPlayer.current_vote"
:presenter-mode="presenterMode"
/>
</main>
<RoomExperience :room="props.room" :current-player="props.currentPlayer" />
</template>
+8
View File
@@ -1,3 +1,10 @@
export type DashboardRoomPlayer = {
id: number;
name: string;
is_moderator: boolean;
is_owner: boolean;
};
export type DashboardRoom = {
id: string;
title: string | null;
@@ -5,6 +12,7 @@ export type DashboardRoom = {
current_round: number;
players_count: number;
active_player_count: number;
players: DashboardRoomPlayer[];
last_activity_at: string | null;
closed_at: string | null;
};
+1
View File
@@ -25,6 +25,7 @@ export type PaperBallFlight = {
export type PaperBallTossOptions = {
roomId: () => string;
currentPlayerId: () => number;
currentPlayerIsModerator: () => boolean;
board: Ref<HTMLElement | null>;
};
+41 -1
View File
@@ -44,6 +44,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[];
@@ -64,6 +66,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;
@@ -95,6 +114,8 @@ export type RoomHeaderProps = Pick<
> & {
canFavorite: boolean;
presenterMode: boolean;
embedded: boolean;
playerName: string;
};
export type RoomHeaderEmits = {
@@ -132,17 +153,36 @@ export type RoomVoteDeckProps = {
presenterMode: boolean;
};
export type RoomVoteDeckEmits = {
'vote-changed': [value: string | null];
};
export type RoomStateChange =
| 'player_joined'
| 'player_updated'
| 'player_kicked'
| '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;
};
export type RoomRealtimeState = Pick<
PokerRoom,
| 'current_round'
| 'revealed'
| 'state_version'
| 'allow_participants_to_manage_rounds'
| 'statistics'
| 'players'
>;
+19
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;
@@ -22,12 +26,27 @@ Route::post('room/join', [RoomPlayerController::class, 'join'])->name('room.code
Route::post('/room', [RoomController::class, 'store'])->name('room.store');
Route::middleware(['auth', 'verified'])->group(function () {
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'])
->name('room.destroy');
Route::post('/rooms/{room}/favorite', FavoriteRoomController::class)
->name('room.favorite');
Route::delete('/rooms/{room}/players/{player}', RoomPlayerKickController::class)
->name('room.player.destroy');
});
Route::middleware('room.player')->group(function () {
+129
View File
@@ -0,0 +1,129 @@
<?php
use App\Models\Room;
use App\Models\User;
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('embedded room access sends guests through login and remembers the intended room', function () {
$room = createEmbeddedRoom();
$url = route('embedded.room', [
'join_code' => $room->join_code,
'player_name' => 'Nico',
]);
$this->get($url)
->assertRedirect(route('login'))
->assertSessionHas('embedded_login', true)
->assertSessionHas('url.intended', $url);
$this->get(route('login'))
->assertInertia(fn (Assert $page) => $page
->component('auth/Login')
->where('rememberByDefault', true));
});
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',
'inactive_at' => now(),
]);
$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')
->and($player->fresh()->inactive_at)->toBeNull();
});
test('embedded access shows a dedicated error when the display name is taken', function () {
$user = User::factory()->create();
$room = createEmbeddedRoom();
$room->players()->create(['name' => 'Nico']);
$this->actingAs($user)
->get(route('embedded.room', [
'join_code' => $room->join_code,
'player_name' => 'Nico',
]))
->assertUnprocessable()
->assertInertia(fn (Assert $page) => $page
->component('embedded/Error')
->where('message', 'Dieser Anzeigename ist in dem Raum bereits vorhanden.'));
});
test('embedded access shows a dedicated error for an unknown room code', function () {
$this->actingAs(User::factory()->create())
->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.'));
});
test('embedded logout returns to the same configured room and signs the user out', function () {
$user = User::factory()->create();
$room = createEmbeddedRoom();
$this->actingAs($user)
->post(route('embedded.logout', [
'join_code' => $room->join_code,
'player_name' => 'Nico',
]))
->assertRedirect(route('embedded.room', [
'join_code' => $room->join_code,
'player_name' => 'Nico',
]));
$this->assertGuest();
});
+39 -7
View File
@@ -5,6 +5,7 @@ use App\Events\RoomStateChanged;
use App\Jobs\CloseInactiveRooms;
use App\Models\Room;
use App\Models\User;
use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Event;
@@ -23,18 +24,20 @@ function createBroadcastRoom(array $attributes = []): Room
]);
}
test('room state broadcasts expose only invalidation metadata', function () {
test('room state broadcasts synchronously expose sanitized state', function () {
$event = new RoomStateChanged(
'019b8f80-37c4-71a3-b415-5f2697332c16',
7,
RoomStateChange::VoteChanged,
);
expect($event->broadcastAs())->toBe('room.state.changed')
expect($event)->toBeInstanceOf(ShouldBroadcastNow::class)
->and($event->broadcastAs())->toBe('room.state.changed')
->and($event->broadcastOn()->name)->toBe('rooms.019b8f80-37c4-71a3-b415-5f2697332c16')
->and($event->broadcastWith())->toBe([
'version' => 7,
'change' => 'vote_changed',
'state' => null,
])
->and($event->broadcastWith())->not->toHaveKeys([
'player_name',
@@ -68,23 +71,23 @@ test('voting and round actions broadcast their state changes', function () {
$this->withSession($session)
->post(route('room.vote.store', $room), ['value' => '5'])
->assertRedirect();
->assertNoContent();
$this->withSession($session)
->post(route('room.reveal', $room))
->assertRedirect();
->assertNoContent();
$this->withSession($session)
->post(route('room.next-round', $room))
->assertRedirect();
->assertNoContent();
$this->withSession($session)
->post(route('room.vote.store', $room), ['value' => '3'])
->assertRedirect();
->assertNoContent();
$this->withSession($session)
->post(route('room.reset', $room))
->assertRedirect();
->assertNoContent();
foreach ([
RoomStateChange::VoteChanged,
@@ -98,6 +101,35 @@ test('voting and round actions broadcast their state changes', function () {
);
}
Event::assertDispatched(
RoomStateChanged::class,
function (RoomStateChanged $event) use ($moderator): bool {
if ($event->change !== RoomStateChange::VoteChanged || $event->state === null) {
return false;
}
$player = collect($event->state['players'])->firstWhere('id', $moderator->id);
return $event->state['revealed'] === false
&& $player['has_voted'] === true
&& $player['vote'] === null;
},
);
Event::assertDispatched(
RoomStateChanged::class,
function (RoomStateChanged $event) use ($moderator): bool {
if ($event->change !== RoomStateChange::CardsRevealed || $event->state === null) {
return false;
}
$player = collect($event->state['players'])->firstWhere('id', $moderator->id);
return $event->state['revealed'] === true
&& $player['vote'] === '5';
},
);
Event::assertDispatchedTimes(RoomStateChanged::class, 5);
});
+52
View File
@@ -59,6 +59,58 @@ test('a participant can throw a realtime paper ball at another player', function
->and($room->state_version)->toBe($stateVersion);
});
test('moderator paper ball throws are not rate limited', function () {
Event::fake([PaperBallThrown::class]);
$room = createEmoteRoom();
$moderator = $room->players()->create([
'name' => 'Eric',
'is_moderator' => true,
]);
$target = $room->players()->create([
'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]);
$room = createEmoteRoom();
$moderator = $room->players()->create([
'name' => 'Eric',
'is_moderator' => true,
]);
$participant = $room->players()->create([
'name' => 'Anna',
'is_moderator' => false,
]);
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' => $moderator->id,
])
->assertTooManyRequests();
Event::assertDispatchedTimes(PaperBallThrown::class, 10);
});
test('a participant cannot throw a paper ball at themselves', function () {
Event::fake([PaperBallThrown::class]);
$room = createEmoteRoom();
+1 -1
View File
@@ -238,7 +238,7 @@ test('meaningful game actions update the explicit activity timestamp', function
$this->withSession(["room_players.{$room->id}" => $moderator->id])
->post(route('room.vote.store', $room), ['value' => '5'])
->assertRedirect();
->assertNoContent();
expect($room->fresh()->last_activity_at->equalTo(now()))->toBeTrue();
});
+155
View File
@@ -0,0 +1,155 @@
<?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');
addPlayerToKickRoom($room, 'Inactive')->update(['inactive_at' => now()]);
$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();
expect($participant->fresh()->inactive_at)->not->toBeNull()
->and($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 participant cannot kick another player', function () {
$owner = User::factory()->create();
$participantUser = User::factory()->create();
$room = createRoomForPlayerKick($owner);
addPlayerToKickRoom($room, 'Moderator', $owner, true);
addPlayerToKickRoom($room, 'Anna', $participantUser);
$target = addPlayerToKickRoom($room, 'Ben');
Event::fake([RoomStateChanged::class]);
$this->actingAs($participantUser)
->delete(route('room.player.destroy', [$room, $target]))
->assertForbidden();
expect($target->fresh()->inactive_at)->toBeNull();
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();
expect($moderator->fresh()->inactive_at)->toBeNull();
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();
expect($target->fresh()->inactive_at)->toBeNull();
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;
},
);
});
+5 -5
View File
@@ -40,7 +40,7 @@ test('a participant can vote and change their vote in the current round', functi
$this->withSession($session)
->post(route('room.vote.store', $room), ['value' => '5'])
->assertRedirect();
->assertNoContent();
$this->assertDatabaseHas('votes', [
'room_id' => $room->id,
@@ -51,7 +51,7 @@ test('a participant can vote and change their vote in the current round', functi
$this->withSession($session)
->post(route('room.vote.store', $room), ['value' => '8'])
->assertRedirect();
->assertNoContent();
expect(Vote::query()->count())->toBe(1);
expect(Vote::query()->value('value'))->toBe('8')
@@ -91,7 +91,7 @@ test('other votes stay hidden until the moderator reveals the round', function (
$this->withSession($session)
->post(route('room.reveal', $room))
->assertRedirect();
->assertNoContent();
expect($room->fresh()->last_activity_at->greaterThan($previousActivity))->toBeTrue();
@@ -123,7 +123,7 @@ test('starting the next round clears the revealed state', function () {
$this->withSession(["room_players.{$room->id}" => $moderator->id])
->post(route('room.next-round', $room))
->assertRedirect();
->assertNoContent();
$room->refresh();
@@ -156,7 +156,7 @@ test('the moderator can reset only the votes from the current round', function (
$this->withSession(["room_players.{$room->id}" => $moderator->id])
->post(route('room.reset', $room))
->assertRedirect();
->assertNoContent();
$this->assertDatabaseHas('votes', [
'room_id' => $room->id,