feat: village.rename: own villages get a new name of 1 to 32 characters
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
120d6dcd22
commit
e75a755e48
|
|
@ -0,0 +1,27 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Actions;
|
||||||
|
|
||||||
|
use App\Engine\Simulation;
|
||||||
|
use App\Game\GameRuleViolation;
|
||||||
|
use App\Models\User;
|
||||||
|
use App\Models\Village;
|
||||||
|
use Carbon\CarbonImmutable;
|
||||||
|
|
||||||
|
/** Give an own village a new name: 1 to 32 visible characters, spaces squeezed. */
|
||||||
|
final class RenameVillage extends VillageAction
|
||||||
|
{
|
||||||
|
public const MAX_LENGTH = 32;
|
||||||
|
|
||||||
|
public function __invoke(User $user, int $villageId, string $name): Village
|
||||||
|
{
|
||||||
|
$name = trim((string) preg_replace('/\s+/u', ' ', (string) preg_replace('/\p{C}/u', '', $name)));
|
||||||
|
if ($name === '' || mb_strlen($name) > self::MAX_LENGTH) {
|
||||||
|
throw new GameRuleViolation('name', 'A village name has 1 to '.self::MAX_LENGTH.' characters.');
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->mutate($user, $villageId, function (Simulation $sim, Village $village, CarbonImmutable $now) use ($name) {
|
||||||
|
$village->name = $name;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -10,6 +10,7 @@ use App\Actions\QueueBuild;
|
||||||
use App\Actions\QueueDemolish;
|
use App\Actions\QueueDemolish;
|
||||||
use App\Actions\QueueUpgrade;
|
use App\Actions\QueueUpgrade;
|
||||||
use App\Actions\Recruit;
|
use App\Actions\Recruit;
|
||||||
|
use App\Actions\RenameVillage;
|
||||||
use App\Actions\SetPriority;
|
use App\Actions\SetPriority;
|
||||||
use App\Actions\ShowVillage;
|
use App\Actions\ShowVillage;
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
|
|
@ -18,7 +19,7 @@ use App\Presenters\VillagePresenter;
|
||||||
use App\Websocket\GameController;
|
use App\Websocket\GameController;
|
||||||
use Closure;
|
use Closure;
|
||||||
|
|
||||||
/** village.show|build|upgrade|demolish|cancel|staff|recruit|cancelRecruit|levy|endLevy. Each answers with the fresh village state. */
|
/** village.show|build|upgrade|demolish|cancel|staff|recruit|cancelRecruit|levy|endLevy|rename. Each answers with the fresh village state. */
|
||||||
class VillageController extends GameController
|
class VillageController extends GameController
|
||||||
{
|
{
|
||||||
public function show()
|
public function show()
|
||||||
|
|
@ -77,6 +78,11 @@ class VillageController extends GameController
|
||||||
return $this->village(fn ($user, $id) => app(EndLevy::class)($user, $id));
|
return $this->village(fn ($user, $id) => app(EndLevy::class)($user, $id));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function rename()
|
||||||
|
{
|
||||||
|
return $this->village(fn ($user, $id) => app(RenameVillage::class)($user, $id, (string) request('name')));
|
||||||
|
}
|
||||||
|
|
||||||
/** @param Closure(User, int): Village $action */
|
/** @param Closure(User, int): Village $action */
|
||||||
private function village(Closure $action)
|
private function village(Closure $action)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
use App\Actions\JoinWorld;
|
use App\Actions\JoinWorld;
|
||||||
use App\Actions\ListWorlds;
|
use App\Actions\ListWorlds;
|
||||||
|
use App\Actions\RenameVillage;
|
||||||
use App\Actions\ShowVillage;
|
use App\Actions\ShowVillage;
|
||||||
use App\Game\Map\Continent;
|
use App\Game\Map\Continent;
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
|
|
@ -63,3 +64,13 @@ it('shows a start village to its owner only', function () {
|
||||||
->and(collect($state['buildable'])->firstWhere('type', 'wall')['blocked'])->toBeNull()
|
->and(collect($state['buildable'])->firstWhere('type', 'wall')['blocked'])->toBeNull()
|
||||||
->and(rule(fn () => app(ShowVillage::class)(User::factory()->create(), $village->id)))->toBe('not_found');
|
->and(rule(fn () => app(ShowVillage::class)(User::factory()->create(), $village->id)))->toBe('not_found');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('renames an own village, trimmed, and refuses empty or long names', function () {
|
||||||
|
$village = startVillage();
|
||||||
|
|
||||||
|
app(RenameVillage::class)(owner($village), $village->id, " Iron Hill \n");
|
||||||
|
expect($village->fresh()->name)->toBe('Iron Hill')
|
||||||
|
->and(rule(fn () => app(RenameVillage::class)(owner($village), $village->id, ' ')))->toBe('name')
|
||||||
|
->and(rule(fn () => app(RenameVillage::class)(owner($village), $village->id, str_repeat('x', 33))))->toBe('name')
|
||||||
|
->and(rule(fn () => app(RenameVillage::class)(User::factory()->create(), $village->id, 'Mine')))->toBe('not_found');
|
||||||
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue