mirror of
https://github.com/ericasch6/scrum-poker-internal.git
synced 2026-10-13 17:12:08 +00:00
Keep guest rooms moderated and restore owner moderation
This commit is contained in:
@@ -69,17 +69,19 @@ class RoomParticipationService
|
||||
$user,
|
||||
$sessionPlayerIds[$room->id] ?? null,
|
||||
);
|
||||
$shouldModerate = $this->shouldModerate($room, $user);
|
||||
|
||||
if ($player === null) {
|
||||
$player = $room->players()->create([
|
||||
'user_id' => $user?->id,
|
||||
'name' => $data['player_name'],
|
||||
'is_moderator' => false,
|
||||
'is_moderator' => $shouldModerate,
|
||||
'last_seen_at' => now(),
|
||||
]);
|
||||
} else {
|
||||
$player->update([
|
||||
'last_seen_at' => now(),
|
||||
'is_moderator' => $player->is_moderator || $shouldModerate,
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -123,6 +125,7 @@ class RoomParticipationService
|
||||
$user,
|
||||
$sessionPlayerId,
|
||||
);
|
||||
$shouldModerate = $this->shouldModerate($lockedRoom, $user);
|
||||
|
||||
$nameIsTaken = $lockedRoom->players()
|
||||
->where('name', $playerName)
|
||||
@@ -144,18 +147,19 @@ class RoomParticipationService
|
||||
$player = $lockedRoom->players()->create([
|
||||
'user_id' => $user?->id,
|
||||
'name' => $playerName,
|
||||
'is_moderator' => false,
|
||||
'is_moderator' => $shouldModerate,
|
||||
'last_seen_at' => now(),
|
||||
]);
|
||||
$change = RoomStateChange::PlayerJoined;
|
||||
} else {
|
||||
if ($player->name !== $playerName) {
|
||||
if ($player->name !== $playerName || ($shouldModerate && ! $player->is_moderator)) {
|
||||
$change = RoomStateChange::PlayerUpdated;
|
||||
}
|
||||
|
||||
$updates = [
|
||||
'name' => $playerName,
|
||||
'last_seen_at' => now(),
|
||||
'is_moderator' => $player->is_moderator || $shouldModerate,
|
||||
];
|
||||
|
||||
if (
|
||||
@@ -196,6 +200,16 @@ class RoomParticipationService
|
||||
return $player;
|
||||
}
|
||||
|
||||
private function shouldModerate(Room $room, ?User $user): bool
|
||||
{
|
||||
if ($user !== null && $room->owner_id === $user->id) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return $room->owner_id === null
|
||||
&& ! $room->players()->where('is_moderator', true)->exists();
|
||||
}
|
||||
|
||||
private function findExistingEmbeddedPlayer(
|
||||
Room $room,
|
||||
?User $user,
|
||||
@@ -218,7 +232,10 @@ class RoomParticipationService
|
||||
->lockForUpdate()
|
||||
->first();
|
||||
|
||||
if ($sessionPlayer !== null) {
|
||||
if (
|
||||
$sessionPlayer !== null
|
||||
&& ($user === null || $sessionPlayer->user_id === null || $sessionPlayer->user_id === $user->id)
|
||||
) {
|
||||
return $sessionPlayer;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user