From 9c527597a016cb854f46938fa69da327813eaf6f Mon Sep 17 00:00:00 2001 From: Kjell Kind Date: Tue, 17 Nov 2026 17:10:45 +0100 Subject: [PATCH 1/3] feat: let a guild's moderator hand moderation to another member The edit guild dialog gains a moderator picker that only searches members who joined the guild. The server checks again that the new moderator is a member, wasn't removed from moderating it and has room for another guild. Co-Authored-By: Claude Opus 5.5 --- app/Actions/UpdateGuild.php | 34 ++- app/Exceptions/GuildModeratorNotMember.php | 9 + app/Http/Controllers/GuildController.php | 5 +- .../GuildMemberSuggestionController.php | 18 ++ app/Http/Requests/CreateGuildRequest.php | 2 +- .../ListGuildMemberSuggestionsRequest.php | 32 +++ app/Http/Requests/UpdateGuildRequest.php | 38 +++ app/Queries/GuildMemberSuggestionsQuery.php | 51 ++++ resources/js/components/guild-dialog.tsx | 15 +- .../js/components/guild-moderator-picker.tsx | 219 ++++++++++++++++++ routes/web.php | 2 + .../Controllers/GuildControllerTest.php | 87 +++++++ 12 files changed, 505 insertions(+), 7 deletions(-) create mode 100644 app/Exceptions/GuildModeratorNotMember.php create mode 100644 app/Http/Controllers/GuildMemberSuggestionController.php create mode 100644 app/Http/Requests/ListGuildMemberSuggestionsRequest.php create mode 100644 app/Queries/GuildMemberSuggestionsQuery.php create mode 100644 resources/js/components/guild-moderator-picker.tsx diff --git a/app/Actions/UpdateGuild.php b/app/Actions/UpdateGuild.php index 3ecad564f..1bff5b62a 100644 --- a/app/Actions/UpdateGuild.php +++ b/app/Actions/UpdateGuild.php @@ -6,6 +6,7 @@ use App\Enums\UserUpdate; use App\Events\UsersUpdated; +use App\Exceptions\GuildModeratorNotMember; use App\Exceptions\GuildModeratorRemoved; use App\Models\Guild; use App\Models\User; @@ -19,15 +20,29 @@ public function __construct(private CreateImageFiles $images, private DeleteStor // } - public function handle(Guild $guild, User $user, string $description, string $emoji, ?UploadedFile $icon, bool $removeIcon): void + /** + * A new moderator must still be a member when the guild is saved. Their row is locked before the guild, like joining does, + * so they cannot leave halfway through the handover. + */ + public function handle(Guild $guild, User $user, string $description, string $emoji, ?UploadedFile $icon, bool $removeIcon, ?User $moderator = null): void { - DB::transaction(function () use ($guild, $user, $description, $emoji, $icon, $removeIcon): void { + DB::transaction(function () use ($guild, $user, $description, $emoji, $icon, $removeIcon, $moderator): void { + $handover = $moderator instanceof User && $moderator->id !== $user->id; + + if ($handover) { + User::query()->whereKey($moderator->id)->lockForUpdate()->firstOrFail(); + } + $guild = Guild::query()->whereKey($guild->id)->lockForUpdate()->firstOrFail(); if ($guild->user_id !== $user->id) { throw new GuildModeratorRemoved; } + if ($handover && ! $guild->members()->whereKey($moderator->id)->exists()) { + throw new GuildModeratorNotMember; + } + $path = $guild->icon_path; if ($icon instanceof UploadedFile || $removeIcon) { @@ -35,8 +50,19 @@ public function handle(Guild $guild, User $user, string $description, string $em $path = $icon instanceof UploadedFile ? $this->images->handle([$icon], directory: 'guild-icons')[0]['path'] : null; } - $guild->update(['description' => $description, 'emoji' => $emoji, 'icon_path' => $path]); - event(new UsersUpdated(DB::table('guild_preferences')->where('guild_id', $guild->id)->pluck('user_id')->push($guild->user_id), UserUpdate::Guilds)); + $guild->update([ + 'description' => $description, + 'emoji' => $emoji, + 'icon_path' => $path, + 'user_id' => $handover ? $moderator->id : $guild->user_id, + ]); + + $viewers = DB::table('guild_preferences')->where('guild_id', $guild->id)->pluck('user_id')->push($user->id); + event(new UsersUpdated($viewers, UserUpdate::Guilds)); + + if ($handover) { + event(new UsersUpdated($viewers, UserUpdate::Relationships)); + } }); } } diff --git a/app/Exceptions/GuildModeratorNotMember.php b/app/Exceptions/GuildModeratorNotMember.php new file mode 100644 index 000000000..b25301c76 --- /dev/null +++ b/app/Exceptions/GuildModeratorNotMember.php @@ -0,0 +1,9 @@ +handle($guild, $user, $request->string('description')->value(), $request->string('emoji')->value(), $icon, $request->boolean('remove_icon')); + $action->handle($guild, $user, $request->string('description')->value(), $request->string('emoji')->value(), $icon, $request->boolean('remove_icon'), $request->moderator()); } catch (GuildModeratorRemoved) { return back()->withErrors(['description' => 'You no longer moderate this guild.']); + } catch (GuildModeratorNotMember) { + return back()->withErrors(['moderator_id' => 'Pick a member of this guild.']); } return to_route('guild.show', $guild->handle); diff --git a/app/Http/Controllers/GuildMemberSuggestionController.php b/app/Http/Controllers/GuildMemberSuggestionController.php new file mode 100644 index 000000000..7ca13336c --- /dev/null +++ b/app/Http/Controllers/GuildMemberSuggestionController.php @@ -0,0 +1,18 @@ +json(['members' => $suggestions->get($guild, $request->string('q')->value())]); + } +} diff --git a/app/Http/Requests/CreateGuildRequest.php b/app/Http/Requests/CreateGuildRequest.php index 8d967d7e2..1b710017e 100644 --- a/app/Http/Requests/CreateGuildRequest.php +++ b/app/Http/Requests/CreateGuildRequest.php @@ -21,7 +21,7 @@ final class CreateGuildRequest extends FormRequest { - private const int MAX_PER_USER = 100; + public const int MAX_PER_USER = 100; public function authorize(Features $features): Response { diff --git a/app/Http/Requests/ListGuildMemberSuggestionsRequest.php b/app/Http/Requests/ListGuildMemberSuggestionsRequest.php new file mode 100644 index 000000000..c4e23421b --- /dev/null +++ b/app/Http/Requests/ListGuildMemberSuggestionsRequest.php @@ -0,0 +1,32 @@ +route('guild'); + assert($guild instanceof Guild); + + return $features->available(Feature::Guilds, $this->user()) && $guild->user_id === $this->user()?->id + ? Response::allow() : Response::denyAsNotFound(); + } + + /** @return array> */ + public function rules(): array + { + return ['q' => ['nullable', 'string', 'max:60']]; + } +} diff --git a/app/Http/Requests/UpdateGuildRequest.php b/app/Http/Requests/UpdateGuildRequest.php index de8381870..c5739f021 100644 --- a/app/Http/Requests/UpdateGuildRequest.php +++ b/app/Http/Requests/UpdateGuildRequest.php @@ -6,6 +6,7 @@ use App\Enums\Feature; use App\Models\Guild; +use App\Models\User; use App\Rules\UnflaggedGuild; use App\Services\EmojiShortcodes; use App\Services\Features; @@ -13,6 +14,7 @@ use Illuminate\Auth\Access\Response; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Http\UploadedFile; +use Illuminate\Support\Facades\DB; use Illuminate\Validation\Rule; use Illuminate\Validation\Rules\In; use Illuminate\Validation\Validator; @@ -37,6 +39,7 @@ public function rules(EmojiShortcodes $emoji): array 'images' => ['nullable', 'list', 'max:1'], 'images.*' => ['required', 'image', 'mimes:jpg,jpeg,png,webp', 'max:2048', 'dimensions:max_width=6000,max_height=6000'], 'remove_icon' => ['required', 'boolean'], + 'moderator_id' => ['sometimes', 'string', 'uuid'], ]; } @@ -50,8 +53,43 @@ public function after(UnflaggedGuild $unflagged): array $guild = $this->route('guild'); assert($guild instanceof Guild); + $this->validateModerator($validator, $guild); + + if ($validator->errors()->isNotEmpty()) { + return; + } + $icon = $this->file('images.0'); $unflagged->validate($validator, $guild->name."\n\n".$this->string('description')->value(), $icon instanceof UploadedFile ? $icon : null); }]; } + + public function moderator(): ?User + { + return $this->filled('moderator_id') ? User::query()->find($this->string('moderator_id')->value()) : null; + } + + /** + * Moderation can only go to someone who already joined the guild, wasn't removed from moderating it, and has room for another guild. + */ + private function validateModerator(Validator $validator, Guild $guild): void + { + $moderator = $this->moderator(); + + if (! $moderator instanceof User || $moderator->id === $this->user()?->id) { + if ($this->filled('moderator_id') && ! $moderator instanceof User) { + $validator->errors()->add('moderator_id', 'Pick a member of this guild.'); + } + + return; + } + + if (! $guild->members()->whereKey($moderator->id)->exists()) { + $validator->errors()->add('moderator_id', 'Pick a member of this guild.'); + } elseif (DB::table('guild_moderator_removals')->where('github_id', $moderator->github_id)->where('handle', $guild->handle)->exists()) { + $validator->errors()->add('moderator_id', 'This member was removed as its moderator.'); + } elseif (Guild::query()->where('user_id', $moderator->id)->count() >= CreateGuildRequest::MAX_PER_USER) { + $validator->errors()->add('moderator_id', 'This member already moderates '.CreateGuildRequest::MAX_PER_USER.' guilds.'); + } + } } diff --git a/app/Queries/GuildMemberSuggestionsQuery.php b/app/Queries/GuildMemberSuggestionsQuery.php new file mode 100644 index 000000000..18417978b --- /dev/null +++ b/app/Queries/GuildMemberSuggestionsQuery.php @@ -0,0 +1,51 @@ + + */ + public function get(Guild $guild, string $term, int $limit = 8): Collection + { + $term = Str::of($term)->trim()->ltrim('@')->lower()->value(); + $escaped = str_replace(['!', '%', '_'], ['!!', '!%', '!_'], $term); + + return $guild->members() + ->select('users.*') + ->join('profiles', 'profiles.id', '=', 'users.id') + ->when($guild->user_id !== null, fn (Builder $query): Builder => $query->whereKeyNot($guild->user_id)) + ->when($term !== '', fn (Builder $query): Builder => $query + ->where(fn (Builder $query): Builder => $query + ->whereRaw("LOWER(profiles.handle) LIKE ? ESCAPE '!'", ["%{$escaped}%"]) + ->orWhereRaw("LOWER(profiles.name) LIKE ? ESCAPE '!'", ["%{$escaped}%"])) + ->orderByRaw( + "CASE WHEN LOWER(profiles.handle) = ? THEN 0 WHEN LOWER(profiles.handle) LIKE ? ESCAPE '!' THEN 1 WHEN LOWER(profiles.name) LIKE ? ESCAPE '!' THEN 2 ELSE 3 END", + [$term, "{$escaped}%", "{$escaped}%"], + )) + ->orderByPivot('joined_at', 'desc') + ->latest('users.id') + ->limit($limit) + ->get() + ->map(fn (User $member): array => [ + 'id' => $member->id, + 'handle' => $member->handle, + 'name' => $member->name, + 'avatar_url' => $member->avatar_url, + ]) + ->values() + ->toBase(); + } +} diff --git a/resources/js/components/guild-dialog.tsx b/resources/js/components/guild-dialog.tsx index 4ca1655a8..3431da42c 100644 --- a/resources/js/components/guild-dialog.tsx +++ b/resources/js/components/guild-dialog.tsx @@ -5,6 +5,7 @@ import { type ReactNode, useRef, useState } from 'react'; import { store, update } from '@/actions/App/Http/Controllers/GuildController'; import { EmojiPickerButton } from '@/components/emoji-picker'; import { GuildIcon } from '@/components/guild-icon'; +import { GuildModeratorPicker } from '@/components/guild-moderator-picker'; import InputError from '@/components/input-error'; import { Button } from '@/components/ui/button'; import { @@ -57,7 +58,7 @@ export function GuildDialog({ {guild - ? 'As the moderator, you can change the icon and description.' + ? 'As the moderator, you can change the icon and description, or hand moderation to another member.' : handle ? `Give #${handle} a home. Its commits stay public and keep appearing in the log.` : 'Create a public group. Its name determines the hashtag that brings commits into the guild.'} @@ -230,6 +231,18 @@ export function GuildDialog({ /> + {guild && ( + + form.current?.clearErrors( + 'moderator_id', + ) + } + /> + )} diff --git a/resources/js/components/guild-moderator-picker.tsx b/resources/js/components/guild-moderator-picker.tsx new file mode 100644 index 000000000..96a77f593 --- /dev/null +++ b/resources/js/components/guild-moderator-picker.tsx @@ -0,0 +1,219 @@ +import { usePage } from '@inertiajs/react'; +import { useEffect, useId, useState } from 'react'; +import { index as memberSuggestions } from '@/actions/App/Http/Controllers/GuildMemberSuggestionController'; +import InputError from '@/components/input-error'; +import { Button } from '@/components/ui/button'; +import { Label } from '@/components/ui/label'; +import { Spinner } from '@/components/ui/spinner'; +import { UserAvatar } from '@/components/user-avatar'; +import { toastWhenThrottled } from '@/lib/throttle'; +import { cn } from '@/lib/utils'; +import type { User } from '@/types'; + +type Member = Pick; + +/** + * Hands moderation to another member. Only people who already joined the guild show up, and the server checks it again on save. + */ +export function GuildModeratorPicker({ + handle, + fieldClass, + error, + onChange, +}: { + handle: string; + fieldClass: string; + error?: string; + onChange?: () => void; +}) { + const me = usePage().props.auth.user; + const id = useId(); + const [moderator, setModerator] = useState(me); + const [searching, setSearching] = useState(false); + const [query, setQuery] = useState(''); + const [members, setMembers] = useState(null); + + useEffect(() => { + if (!searching) return; + + const controller = new AbortController(); + const timeout = setTimeout( + () => { + fetch( + memberSuggestions.url(handle, { + query: { q: query.trim() || undefined }, + }), + { + headers: { + Accept: 'application/json', + 'X-Requested-With': 'XMLHttpRequest', + }, + signal: controller.signal, + }, + ) + .then(async (response) => { + if (!response.ok) { + toastWhenThrottled(response); + throw new Error('Unable to load members'); + } + + return (await response.json()) as { + members: Member[]; + }; + }) + .then((data) => setMembers(data.members)) + .catch(() => { + if (!controller.signal.aborted) setMembers([]); + }); + }, + query ? 200 : 0, + ); + + return () => { + clearTimeout(timeout); + controller.abort(); + }; + }, [handle, query, searching]); + + if (!me) return null; + + const handover = moderator !== null && moderator.id !== me.id; + + const pick = (member: Member) => { + setModerator(member); + setSearching(false); + setQuery(''); + setMembers(null); + onChange?.(); + }; + + return ( +
+ + + {searching ? ( +
+ setQuery(event.target.value)} + onKeyDown={(event) => { + if (event.key === 'Enter') { + event.preventDefault(); + if (members?.[0]) pick(members[0]); + } + }} + className={fieldClass} + aria-controls={`${id}-members`} + aria-describedby={`${id}-error`} + /> +
    + {members === null ? ( +
  • + +
  • + ) : members.length === 0 ? ( +
  • + {query + ? 'No members match.' + : 'Nobody else has joined yet.'} +
  • + ) : ( + members.map((member) => ( +
  • + +
  • + )) + )} +
+
+ +
+
+ ) : ( +
+ + {!handover && ( + + You + + )} + +
+ )} + {handover && !searching && ( +

+ Once you save, @{moderator.handle} moderates #{handle} and + you can no longer edit it.{' '} + +

+ )} +
+ +
+
+ ); +} + +function MemberRow({ member }: { member: Member }) { + return ( + <> + + + {member.name}{' '} + @{member.handle} + + + ); +} diff --git a/routes/web.php b/routes/web.php index f7065f281..2547e6192 100644 --- a/routes/web.php +++ b/routes/web.php @@ -63,6 +63,7 @@ use App\Http\Controllers\GuildController; use App\Http\Controllers\GuildIconController; use App\Http\Controllers\GuildMembershipController; +use App\Http\Controllers\GuildMemberSuggestionController; use App\Http\Controllers\GuildModeratorController; use App\Http\Controllers\GuildMuteController; use App\Http\Controllers\GuildReportController; @@ -363,6 +364,7 @@ Route::get('guilds', [GuildController::class, 'index'])->name('guild.index'); Route::get('guilds/{guild:handle}', [GuildController::class, 'show'])->name('guild.show'); Route::get('guilds/{guild:handle}/members', [GuildMembershipController::class, 'index'])->name('guild-membership.index'); + Route::get('guilds/{guild:handle}/member-suggestions', [GuildMemberSuggestionController::class, 'index'])->middleware('throttle:people')->name('guild-member-suggestion.index'); Route::get('guilds/{guild:handle}/icon', [GuildIconController::class, 'show'])->name('guild-icon.show'); Route::post('guilds', [GuildController::class, 'store'])->middleware([PreventPostingInTimeout::class, 'throttle:10,1'])->name('guild.store'); Route::put('guilds/{guild:handle}', [GuildController::class, 'update'])->middleware([PreventPostingInTimeout::class, 'throttle:10,1'])->name('guild.update'); diff --git a/tests/Feature/Controllers/GuildControllerTest.php b/tests/Feature/Controllers/GuildControllerTest.php index da32fae80..737cd4160 100644 --- a/tests/Feature/Controllers/GuildControllerTest.php +++ b/tests/Feature/Controllers/GuildControllerTest.php @@ -17,6 +17,7 @@ use App\Events\UsersUpdated; use App\Exceptions\GuildModeratorRemoved; use App\Http\Middleware\HandleInertiaRequests; +use App\Http\Requests\CreateGuildRequest; use App\Models\Commit; use App\Models\Guild; use App\Models\GuildReport; @@ -29,6 +30,7 @@ use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Event; use Illuminate\Support\Facades\Storage; +use Illuminate\Support\Str; beforeEach(function (): void { config(['app.admins' => ['admin', 'other-admin']]); @@ -783,3 +785,88 @@ $this->assertModelMissing($scheduled); $this->assertModelExists($regular); }); + +it('lets the moderator hand moderation only to a current member', function (): void { + Event::fake([UsersUpdated::class]); + $moderator = User::factory()->create(['handle' => 'admin']); + $member = User::factory()->create(['handle' => 'other-admin']); + $outsider = User::factory()->create(); + $guild = Guild::factory()->create(['user_id' => $moderator->id, 'handle' => 'jobs']); + $guild->members()->attach($moderator, ['joined_at' => now()]); + $guild->members()->attach($member, ['joined_at' => now()]); + $guild->muters()->attach($outsider, ['muted_at' => now()]); + $payload = ['description' => 'Remote jobs.', 'emoji' => '🌍', 'remove_icon' => false]; + + $this->actingAs($moderator)->put(route('guild.update', 'jobs'), [...$payload, 'moderator_id' => $outsider->id])->assertSessionHasErrors(['moderator_id' => 'Pick a member of this guild.']); + $this->put(route('guild.update', 'jobs'), [...$payload, 'moderator_id' => (string) Str::uuid()])->assertSessionHasErrors(['moderator_id' => 'Pick a member of this guild.']); + $this->putJson(route('guild.update', 'jobs'), [...$payload, 'moderator_id' => 'nope'])->assertJsonValidationErrors('moderator_id'); + expect($guild->fresh())->user_id->toBe($moderator->id)->description->toBe($guild->description); + + $this->put(route('guild.update', 'jobs'), [...$payload, 'moderator_id' => $moderator->id])->assertRedirectToRoute('guild.show', 'jobs'); + expect($guild->fresh()->user_id)->toBe($moderator->id); + + $this->put(route('guild.update', 'jobs'), [...$payload, 'moderator_id' => $member->id])->assertRedirectToRoute('guild.show', 'jobs'); + expect($guild->fresh())->user_id->toBe($member->id)->description->toBe('Remote jobs.'); + Event::assertDispatched(UsersUpdated::class, fn (UsersUpdated $event): bool => $event->update === UserUpdate::Relationships && in_array($member->id, $event->userIds, true)); + $this->get(route('guild.show', 'jobs'))->assertInertia(fn ($page) => $page->where('canModerate', false)); + $this->put(route('guild.update', 'jobs'), $payload)->assertNotFound(); + + $this->actingAs($member)->get(route('guild.show', 'jobs'))->assertInertia(fn ($page) => $page->where('canModerate', true)); + $this->put(route('guild.update', 'jobs'), [...$payload, 'description' => 'Still hiring.'])->assertRedirectToRoute('guild.show', 'jobs'); + expect($guild->fresh())->user_id->toBe($member->id)->description->toBe('Still hiring.'); +}); + +it('refuses a handover to members removed from moderating it or at the guild limit', function (): void { + $moderator = User::factory()->create(['handle' => 'admin']); + $removed = User::factory()->create(); + $busy = User::factory()->create(); + $guild = Guild::factory()->create(['user_id' => $moderator->id, 'handle' => 'jobs']); + $guild->members()->attach([$removed->id => ['joined_at' => now()], $busy->id => ['joined_at' => now()]]); + DB::table('guild_moderator_removals')->insert(['github_id' => $removed->github_id, 'handle' => 'jobs', 'created_at' => now()]); + Guild::factory()->count(CreateGuildRequest::MAX_PER_USER)->create(['user_id' => $busy->id]); + $payload = ['description' => 'Remote jobs.', 'emoji' => '🌍', 'remove_icon' => false]; + + $this->actingAs($moderator)->put(route('guild.update', 'jobs'), [...$payload, 'moderator_id' => $removed->id])->assertSessionHasErrors('moderator_id'); + $this->put(route('guild.update', 'jobs'), [...$payload, 'moderator_id' => $busy->id])->assertSessionHasErrors('moderator_id'); + expect($guild->fresh()->user_id)->toBe($moderator->id); +}); + +it('keeps the moderator when the new one leaves after validation', function (): void { + $moderator = User::factory()->create(['handle' => 'admin']); + $member = User::factory()->create(); + $guild = Guild::factory()->create(['user_id' => $moderator->id, 'handle' => 'jobs']); + $guild->members()->attach($member, ['joined_at' => now()]); + $this->app->beforeResolving(UpdateGuild::class, function () use ($guild, $member): void { + $guild->members()->detach($member); + }); + + $this->actingAs($moderator)->put(route('guild.update', 'jobs'), [ + 'description' => 'Remote jobs.', 'emoji' => '🌍', 'remove_icon' => false, 'moderator_id' => $member->id, + ])->assertSessionHasErrors(['moderator_id' => 'Pick a member of this guild.']); + + expect($guild->fresh())->user_id->toBe($moderator->id)->description->toBe($guild->description); +}); + +it('suggests only other members to the moderator', function (): void { + $moderator = User::factory()->create(['handle' => 'admin']); + $ada = User::factory()->create(['handle' => 'ada', 'name' => 'Ada Lovelace']); + $grace = User::factory()->create(['handle' => 'grace', 'name' => 'Grace Hopper']); + $muter = User::factory()->create(['handle' => 'adam']); + $outsider = User::factory()->create(['handle' => 'adaline']); + $guild = Guild::factory()->create(['user_id' => $moderator->id, 'handle' => 'jobs']); + $guild->members()->attach([$moderator->id => ['joined_at' => now()->subDays(3)], $ada->id => ['joined_at' => now()->subDays(2)], $grace->id => ['joined_at' => now()->subDay()]]); + $guild->muters()->attach($muter, ['muted_at' => now()]); + + $this->actingAs($moderator)->getJson(route('guild-member-suggestion.index', 'jobs'))->assertOk() + ->assertExactJson(['members' => [ + ['id' => $grace->id, 'handle' => 'grace', 'name' => 'Grace Hopper', 'avatar_url' => $grace->avatar_url], + ['id' => $ada->id, 'handle' => 'ada', 'name' => 'Ada Lovelace', 'avatar_url' => $ada->avatar_url], + ]]); + $this->getJson(route('guild-member-suggestion.index', ['guild' => 'jobs', 'q' => '@AD']))->assertOk() + ->assertJsonPath('members.*.handle', ['ada']); + $this->getJson(route('guild-member-suggestion.index', ['guild' => 'jobs', 'q' => 'hopper']))->assertOk() + ->assertJsonPath('members.*.handle', ['grace']); + + $this->actingAs($ada)->getJson(route('guild-member-suggestion.index', 'jobs'))->assertNotFound(); + $this->actingAs($outsider)->getJson(route('guild-member-suggestion.index', 'jobs'))->assertNotFound(); +}); From 0999db0a07ce3d1fd9541d0da33092bc6484064a Mon Sep 17 00:00:00 2001 From: Kjell Kind Date: Tue, 17 Nov 2026 17:49:04 +0100 Subject: [PATCH 2/3] fix: only hand guilds to members who can open them, and recheck the guild limit under the lock While guilds are an admin preview, the picker only suggests admins and the request rejects anyone else, so a handover can't leave the guild with a moderator who gets a 404. The new moderator's guild count is checked again after their row is locked, so two handovers can't push them past the limit. Typing a new search drops the old results at once, so Enter can't pick a member from a previous search. Co-Authored-By: Claude Opus 5.5 --- app/Actions/UpdateGuild.php | 10 +++- app/Exceptions/GuildModeratorLimitReached.php | 9 ++++ app/Http/Controllers/GuildController.php | 3 ++ app/Http/Requests/UpdateGuildRequest.php | 20 +++++--- app/Queries/GuildMemberSuggestionsQuery.php | 15 +++++- .../js/components/guild-moderator-picker.tsx | 11 ++++- .../Controllers/GuildControllerTest.php | 49 ++++++++++++++++--- 7 files changed, 98 insertions(+), 19 deletions(-) create mode 100644 app/Exceptions/GuildModeratorLimitReached.php diff --git a/app/Actions/UpdateGuild.php b/app/Actions/UpdateGuild.php index 1bff5b62a..fc3d65006 100644 --- a/app/Actions/UpdateGuild.php +++ b/app/Actions/UpdateGuild.php @@ -6,8 +6,10 @@ use App\Enums\UserUpdate; use App\Events\UsersUpdated; +use App\Exceptions\GuildModeratorLimitReached; use App\Exceptions\GuildModeratorNotMember; use App\Exceptions\GuildModeratorRemoved; +use App\Http\Requests\CreateGuildRequest; use App\Models\Guild; use App\Models\User; use Illuminate\Http\UploadedFile; @@ -21,8 +23,8 @@ public function __construct(private CreateImageFiles $images, private DeleteStor } /** - * A new moderator must still be a member when the guild is saved. Their row is locked before the guild, like joining does, - * so they cannot leave halfway through the handover. + * A new moderator must still be a member with room for another guild when the guild is saved. Their row is locked before + * the guild, like joining and creating guilds do, so they cannot leave or take on more guilds halfway through the handover. */ public function handle(Guild $guild, User $user, string $description, string $emoji, ?UploadedFile $icon, bool $removeIcon, ?User $moderator = null): void { @@ -31,6 +33,10 @@ public function handle(Guild $guild, User $user, string $description, string $em if ($handover) { User::query()->whereKey($moderator->id)->lockForUpdate()->firstOrFail(); + + if (Guild::query()->where('user_id', $moderator->id)->count() >= CreateGuildRequest::MAX_PER_USER) { + throw new GuildModeratorLimitReached; + } } $guild = Guild::query()->whereKey($guild->id)->lockForUpdate()->firstOrFail(); diff --git a/app/Exceptions/GuildModeratorLimitReached.php b/app/Exceptions/GuildModeratorLimitReached.php new file mode 100644 index 000000000..9f2636e35 --- /dev/null +++ b/app/Exceptions/GuildModeratorLimitReached.php @@ -0,0 +1,9 @@ +withErrors(['description' => 'You no longer moderate this guild.']); } catch (GuildModeratorNotMember) { return back()->withErrors(['moderator_id' => 'Pick a member of this guild.']); + } catch (GuildModeratorLimitReached) { + return back()->withErrors(['moderator_id' => UpdateGuildRequest::moderatorLimitMessage()]); } return to_route('guild.show', $guild->handle); diff --git a/app/Http/Requests/UpdateGuildRequest.php b/app/Http/Requests/UpdateGuildRequest.php index c5739f021..ec6b4a0d9 100644 --- a/app/Http/Requests/UpdateGuildRequest.php +++ b/app/Http/Requests/UpdateGuildRequest.php @@ -21,6 +21,11 @@ final class UpdateGuildRequest extends FormRequest { + public static function moderatorLimitMessage(): string + { + return 'This member already moderates '.CreateGuildRequest::MAX_PER_USER.' guilds.'; + } + public function authorize(Features $features): Response { $guild = $this->route('guild'); @@ -44,16 +49,16 @@ public function rules(EmojiShortcodes $emoji): array } /** @return list */ - public function after(UnflaggedGuild $unflagged): array + public function after(UnflaggedGuild $unflagged, Features $features): array { - return [function (Validator $validator) use ($unflagged): void { + return [function (Validator $validator) use ($unflagged, $features): void { if ($validator->errors()->isNotEmpty()) { return; } $guild = $this->route('guild'); assert($guild instanceof Guild); - $this->validateModerator($validator, $guild); + $this->validateModerator($validator, $guild, $features); if ($validator->errors()->isNotEmpty()) { return; @@ -70,9 +75,10 @@ public function moderator(): ?User } /** - * Moderation can only go to someone who already joined the guild, wasn't removed from moderating it, and has room for another guild. + * Moderation can only go to someone who already joined the guild, can open guilds, wasn't removed from moderating it, and has + * room for another guild. */ - private function validateModerator(Validator $validator, Guild $guild): void + private function validateModerator(Validator $validator, Guild $guild, Features $features): void { $moderator = $this->moderator(); @@ -86,10 +92,12 @@ private function validateModerator(Validator $validator, Guild $guild): void if (! $guild->members()->whereKey($moderator->id)->exists()) { $validator->errors()->add('moderator_id', 'Pick a member of this guild.'); + } elseif (! $features->available(Feature::Guilds, $moderator)) { + $validator->errors()->add('moderator_id', 'This member cannot open guilds yet.'); } elseif (DB::table('guild_moderator_removals')->where('github_id', $moderator->github_id)->where('handle', $guild->handle)->exists()) { $validator->errors()->add('moderator_id', 'This member was removed as its moderator.'); } elseif (Guild::query()->where('user_id', $moderator->id)->count() >= CreateGuildRequest::MAX_PER_USER) { - $validator->errors()->add('moderator_id', 'This member already moderates '.CreateGuildRequest::MAX_PER_USER.' guilds.'); + $validator->errors()->add('moderator_id', self::moderatorLimitMessage()); } } } diff --git a/app/Queries/GuildMemberSuggestionsQuery.php b/app/Queries/GuildMemberSuggestionsQuery.php index 18417978b..072a304c7 100644 --- a/app/Queries/GuildMemberSuggestionsQuery.php +++ b/app/Queries/GuildMemberSuggestionsQuery.php @@ -4,16 +4,25 @@ namespace App\Queries; +use App\Enums\Feature; use App\Models\Guild; use App\Models\User; +use App\Services\Features; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Collection; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Str; final readonly class GuildMemberSuggestionsQuery { + public function __construct(private Features $features) + { + // + } + /** - * The members who could take over moderating the guild: never its current moderator. Without a term, the most recent joiners; + * The members who could take over moderating the guild: never its current moderator, and only admins while guilds are an + * admin preview, since nobody else could open the guild they'd moderate. Without a term, the most recent joiners; * with one, handles and names that contain it, exact handles and prefixes first. * * @return Collection @@ -22,11 +31,15 @@ public function get(Guild $guild, string $term, int $limit = 8): Collection { $term = Str::of($term)->trim()->ltrim('@')->lower()->value(); $escaped = str_replace(['!', '%', '_'], ['!!', '!%', '!_'], $term); + /** @var list $admins */ + $admins = config('app.admins'); return $guild->members() ->select('users.*') ->join('profiles', 'profiles.id', '=', 'users.id') ->when($guild->user_id !== null, fn (Builder $query): Builder => $query->whereKeyNot($guild->user_id)) + ->when($this->features->adminOnly(Feature::Guilds), fn (Builder $query): Builder => $query + ->whereIn(DB::raw('LOWER(profiles.handle)'), array_map(mb_strtolower(...), $admins))) ->when($term !== '', fn (Builder $query): Builder => $query ->where(fn (Builder $query): Builder => $query ->whereRaw("LOWER(profiles.handle) LIKE ? ESCAPE '!'", ["%{$escaped}%"]) diff --git a/resources/js/components/guild-moderator-picker.tsx b/resources/js/components/guild-moderator-picker.tsx index 96a77f593..e16b9b149 100644 --- a/resources/js/components/guild-moderator-picker.tsx +++ b/resources/js/components/guild-moderator-picker.tsx @@ -61,7 +61,10 @@ export function GuildModeratorPicker({ members: Member[]; }; }) - .then((data) => setMembers(data.members)) + .then((data) => { + if (!controller.signal.aborted) + setMembers(data.members); + }) .catch(() => { if (!controller.signal.aborted) setMembers([]); }); @@ -107,7 +110,11 @@ export function GuildModeratorPicker({ maxLength={60} placeholder="Search members" value={query} - onChange={(event) => setQuery(event.target.value)} + onChange={(event) => { + // Results for an older search are dropped at once, so neither Enter nor a click can pick from them. + setQuery(event.target.value); + setMembers(null); + }} onKeyDown={(event) => { if (event.key === 'Enter') { event.preventDefault(); diff --git a/tests/Feature/Controllers/GuildControllerTest.php b/tests/Feature/Controllers/GuildControllerTest.php index 737cd4160..17c6d0140 100644 --- a/tests/Feature/Controllers/GuildControllerTest.php +++ b/tests/Feature/Controllers/GuildControllerTest.php @@ -25,6 +25,7 @@ use App\Models\ScheduledCommit; use App\Models\User; use App\Queries\LogCommitsQuery; +use App\Services\Features; use Illuminate\Database\Events\QueryExecuted; use Illuminate\Http\UploadedFile; use Illuminate\Support\Facades\DB; @@ -816,24 +817,45 @@ expect($guild->fresh())->user_id->toBe($member->id)->description->toBe('Still hiring.'); }); -it('refuses a handover to members removed from moderating it or at the guild limit', function (): void { +it('refuses a handover to members who cannot open guilds, were removed from moderating it or are at the guild limit', function (): void { $moderator = User::factory()->create(['handle' => 'admin']); + $member = User::factory()->create(); $removed = User::factory()->create(); $busy = User::factory()->create(); $guild = Guild::factory()->create(['user_id' => $moderator->id, 'handle' => 'jobs']); - $guild->members()->attach([$removed->id => ['joined_at' => now()], $busy->id => ['joined_at' => now()]]); + $guild->members()->attach([$member->id => ['joined_at' => now()], $removed->id => ['joined_at' => now()], $busy->id => ['joined_at' => now()]]); DB::table('guild_moderator_removals')->insert(['github_id' => $removed->github_id, 'handle' => 'jobs', 'created_at' => now()]); Guild::factory()->count(CreateGuildRequest::MAX_PER_USER)->create(['user_id' => $busy->id]); $payload = ['description' => 'Remote jobs.', 'emoji' => '🌍', 'remove_icon' => false]; - $this->actingAs($moderator)->put(route('guild.update', 'jobs'), [...$payload, 'moderator_id' => $removed->id])->assertSessionHasErrors('moderator_id'); - $this->put(route('guild.update', 'jobs'), [...$payload, 'moderator_id' => $busy->id])->assertSessionHasErrors('moderator_id'); + $this->actingAs($moderator)->put(route('guild.update', 'jobs'), [...$payload, 'moderator_id' => $member->id])->assertSessionHasErrors(['moderator_id' => 'This member cannot open guilds yet.']); + resolve(Features::class)->update(Feature::Guilds, true, adminOnly: false); + $this->put(route('guild.update', 'jobs'), [...$payload, 'moderator_id' => $removed->id])->assertSessionHasErrors(['moderator_id' => 'This member was removed as its moderator.']); + $this->put(route('guild.update', 'jobs'), [...$payload, 'moderator_id' => $busy->id])->assertSessionHasErrors(['moderator_id' => 'This member already moderates 100 guilds.']); expect($guild->fresh()->user_id)->toBe($moderator->id); + $this->put(route('guild.update', 'jobs'), [...$payload, 'moderator_id' => $member->id])->assertRedirectToRoute('guild.show', 'jobs'); + expect($guild->fresh()->user_id)->toBe($member->id); +}); + +it('keeps the moderator when the new one reaches the guild limit after validation', function (): void { + $moderator = User::factory()->create(['handle' => 'admin']); + $member = User::factory()->create(['handle' => 'other-admin']); + $guild = Guild::factory()->create(['user_id' => $moderator->id, 'handle' => 'jobs']); + $guild->members()->attach($member, ['joined_at' => now()]); + $this->app->beforeResolving(UpdateGuild::class, function () use ($member): void { + Guild::factory()->count(CreateGuildRequest::MAX_PER_USER)->create(['user_id' => $member->id]); + }); + + $this->actingAs($moderator)->put(route('guild.update', 'jobs'), [ + 'description' => 'Remote jobs.', 'emoji' => '🌍', 'remove_icon' => false, 'moderator_id' => $member->id, + ])->assertSessionHasErrors(['moderator_id' => 'This member already moderates 100 guilds.']); + + expect($guild->fresh())->user_id->toBe($moderator->id)->description->toBe($guild->description); }); it('keeps the moderator when the new one leaves after validation', function (): void { $moderator = User::factory()->create(['handle' => 'admin']); - $member = User::factory()->create(); + $member = User::factory()->create(['handle' => 'other-admin']); $guild = Guild::factory()->create(['user_id' => $moderator->id, 'handle' => 'jobs']); $guild->members()->attach($member, ['joined_at' => now()]); $this->app->beforeResolving(UpdateGuild::class, function () use ($guild, $member): void { @@ -847,22 +869,33 @@ expect($guild->fresh())->user_id->toBe($moderator->id)->description->toBe($guild->description); }); -it('suggests only other members to the moderator', function (): void { +it('suggests only other members who can open guilds to the moderator', function (): void { $moderator = User::factory()->create(['handle' => 'admin']); + $admin = User::factory()->create(['handle' => 'other-admin', 'name' => 'Other Admin']); $ada = User::factory()->create(['handle' => 'ada', 'name' => 'Ada Lovelace']); $grace = User::factory()->create(['handle' => 'grace', 'name' => 'Grace Hopper']); $muter = User::factory()->create(['handle' => 'adam']); $outsider = User::factory()->create(['handle' => 'adaline']); $guild = Guild::factory()->create(['user_id' => $moderator->id, 'handle' => 'jobs']); - $guild->members()->attach([$moderator->id => ['joined_at' => now()->subDays(3)], $ada->id => ['joined_at' => now()->subDays(2)], $grace->id => ['joined_at' => now()->subDay()]]); + $guild->members()->attach([ + $admin->id => ['joined_at' => now()->subDays(4)], + $moderator->id => ['joined_at' => now()->subDays(3)], + $ada->id => ['joined_at' => now()->subDays(2)], + $grace->id => ['joined_at' => now()->subDay()], + ]); $guild->muters()->attach($muter, ['muted_at' => now()]); $this->actingAs($moderator)->getJson(route('guild-member-suggestion.index', 'jobs'))->assertOk() + ->assertJsonPath('members.*.handle', ['other-admin']); + + resolve(Features::class)->update(Feature::Guilds, true, adminOnly: false); + $this->getJson(route('guild-member-suggestion.index', 'jobs'))->assertOk() ->assertExactJson(['members' => [ ['id' => $grace->id, 'handle' => 'grace', 'name' => 'Grace Hopper', 'avatar_url' => $grace->avatar_url], ['id' => $ada->id, 'handle' => 'ada', 'name' => 'Ada Lovelace', 'avatar_url' => $ada->avatar_url], + ['id' => $admin->id, 'handle' => 'other-admin', 'name' => 'Other Admin', 'avatar_url' => $admin->avatar_url], ]]); - $this->getJson(route('guild-member-suggestion.index', ['guild' => 'jobs', 'q' => '@AD']))->assertOk() + $this->getJson(route('guild-member-suggestion.index', ['guild' => 'jobs', 'q' => '@ADA']))->assertOk() ->assertJsonPath('members.*.handle', ['ada']); $this->getJson(route('guild-member-suggestion.index', ['guild' => 'jobs', 'q' => 'hopper']))->assertOk() ->assertJsonPath('members.*.handle', ['grace']); From 99747d5cb6c80e181d7efe59bcc91e622fd2929e Mon Sep 17 00:00:00 2001 From: Kjell Kind Date: Tue, 17 Nov 2026 18:57:46 +0100 Subject: [PATCH 3/3] fix: recount guilds under the lock when creating one, and drop the preview flag check A handover can give someone another guild after their create request passed validation, so CreateGuild counts their guilds again once their row is locked. The check that new moderators can open guilds is gone again: it only guarded the admin preview flag, which the maintainers don't need covered here. Co-Authored-By: Claude Opus 5.5 --- app/Actions/CreateGuild.php | 7 +++++ app/Http/Controllers/GuildController.php | 2 ++ app/Http/Requests/UpdateGuildRequest.php | 13 ++++------ app/Queries/GuildMemberSuggestionsQuery.php | 15 +---------- .../Controllers/GuildControllerTest.php | 26 ++++++++++++------- 5 files changed, 31 insertions(+), 32 deletions(-) diff --git a/app/Actions/CreateGuild.php b/app/Actions/CreateGuild.php index 782d1837d..8486480b9 100644 --- a/app/Actions/CreateGuild.php +++ b/app/Actions/CreateGuild.php @@ -4,7 +4,9 @@ namespace App\Actions; +use App\Exceptions\GuildModeratorLimitReached; use App\Exceptions\GuildModeratorRemoved; +use App\Http\Requests\CreateGuildRequest; use App\Models\Guild; use App\Models\User; use Illuminate\Http\UploadedFile; @@ -22,6 +24,11 @@ public function handle(User $user, string $handle, string $name, string $descrip return DB::transaction(function () use ($user, $handle, $name, $description, $emoji, $icon): Guild { User::query()->whereKey($user->id)->lockForUpdate()->firstOrFail(); + // Counted again under the lock, since a handover may have given the user another guild after validation. + if (Guild::query()->where('user_id', $user->id)->count() >= CreateGuildRequest::MAX_PER_USER) { + throw new GuildModeratorLimitReached; + } + if (DB::table('guild_moderator_removals')->where('github_id', $user->github_id)->where('handle', mb_strtolower($handle))->exists()) { throw new GuildModeratorRemoved; } diff --git a/app/Http/Controllers/GuildController.php b/app/Http/Controllers/GuildController.php index e15b98f98..74d3dec30 100644 --- a/app/Http/Controllers/GuildController.php +++ b/app/Http/Controllers/GuildController.php @@ -39,6 +39,8 @@ public function store(CreateGuildRequest $request, #[CurrentUser] User $user, Cr $guild = $action->handle($user, $request->string('handle')->value(), $request->string('name')->value(), $request->string('description')->value(), $request->string('emoji')->value(), $icon); } catch (GuildModeratorRemoved) { return back()->withErrors(['handle' => 'You cannot reclaim a guild you were removed from.']); + } catch (GuildModeratorLimitReached) { + return back()->withErrors(['handle' => 'You can create up to '.CreateGuildRequest::MAX_PER_USER.' guilds.']); } return to_route('guild.show', $guild->handle); diff --git a/app/Http/Requests/UpdateGuildRequest.php b/app/Http/Requests/UpdateGuildRequest.php index ec6b4a0d9..43f24f041 100644 --- a/app/Http/Requests/UpdateGuildRequest.php +++ b/app/Http/Requests/UpdateGuildRequest.php @@ -49,16 +49,16 @@ public function rules(EmojiShortcodes $emoji): array } /** @return list */ - public function after(UnflaggedGuild $unflagged, Features $features): array + public function after(UnflaggedGuild $unflagged): array { - return [function (Validator $validator) use ($unflagged, $features): void { + return [function (Validator $validator) use ($unflagged): void { if ($validator->errors()->isNotEmpty()) { return; } $guild = $this->route('guild'); assert($guild instanceof Guild); - $this->validateModerator($validator, $guild, $features); + $this->validateModerator($validator, $guild); if ($validator->errors()->isNotEmpty()) { return; @@ -75,10 +75,9 @@ public function moderator(): ?User } /** - * Moderation can only go to someone who already joined the guild, can open guilds, wasn't removed from moderating it, and has - * room for another guild. + * Moderation can only go to someone who already joined the guild, wasn't removed from moderating it, and has room for another guild. */ - private function validateModerator(Validator $validator, Guild $guild, Features $features): void + private function validateModerator(Validator $validator, Guild $guild): void { $moderator = $this->moderator(); @@ -92,8 +91,6 @@ private function validateModerator(Validator $validator, Guild $guild, Features if (! $guild->members()->whereKey($moderator->id)->exists()) { $validator->errors()->add('moderator_id', 'Pick a member of this guild.'); - } elseif (! $features->available(Feature::Guilds, $moderator)) { - $validator->errors()->add('moderator_id', 'This member cannot open guilds yet.'); } elseif (DB::table('guild_moderator_removals')->where('github_id', $moderator->github_id)->where('handle', $guild->handle)->exists()) { $validator->errors()->add('moderator_id', 'This member was removed as its moderator.'); } elseif (Guild::query()->where('user_id', $moderator->id)->count() >= CreateGuildRequest::MAX_PER_USER) { diff --git a/app/Queries/GuildMemberSuggestionsQuery.php b/app/Queries/GuildMemberSuggestionsQuery.php index 072a304c7..18417978b 100644 --- a/app/Queries/GuildMemberSuggestionsQuery.php +++ b/app/Queries/GuildMemberSuggestionsQuery.php @@ -4,25 +4,16 @@ namespace App\Queries; -use App\Enums\Feature; use App\Models\Guild; use App\Models\User; -use App\Services\Features; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Collection; -use Illuminate\Support\Facades\DB; use Illuminate\Support\Str; final readonly class GuildMemberSuggestionsQuery { - public function __construct(private Features $features) - { - // - } - /** - * The members who could take over moderating the guild: never its current moderator, and only admins while guilds are an - * admin preview, since nobody else could open the guild they'd moderate. Without a term, the most recent joiners; + * The members who could take over moderating the guild: never its current moderator. Without a term, the most recent joiners; * with one, handles and names that contain it, exact handles and prefixes first. * * @return Collection @@ -31,15 +22,11 @@ public function get(Guild $guild, string $term, int $limit = 8): Collection { $term = Str::of($term)->trim()->ltrim('@')->lower()->value(); $escaped = str_replace(['!', '%', '_'], ['!!', '!%', '!_'], $term); - /** @var list $admins */ - $admins = config('app.admins'); return $guild->members() ->select('users.*') ->join('profiles', 'profiles.id', '=', 'users.id') ->when($guild->user_id !== null, fn (Builder $query): Builder => $query->whereKeyNot($guild->user_id)) - ->when($this->features->adminOnly(Feature::Guilds), fn (Builder $query): Builder => $query - ->whereIn(DB::raw('LOWER(profiles.handle)'), array_map(mb_strtolower(...), $admins))) ->when($term !== '', fn (Builder $query): Builder => $query ->where(fn (Builder $query): Builder => $query ->whereRaw("LOWER(profiles.handle) LIKE ? ESCAPE '!'", ["%{$escaped}%"]) diff --git a/tests/Feature/Controllers/GuildControllerTest.php b/tests/Feature/Controllers/GuildControllerTest.php index 17c6d0140..8d585a997 100644 --- a/tests/Feature/Controllers/GuildControllerTest.php +++ b/tests/Feature/Controllers/GuildControllerTest.php @@ -25,7 +25,6 @@ use App\Models\ScheduledCommit; use App\Models\User; use App\Queries\LogCommitsQuery; -use App\Services\Features; use Illuminate\Database\Events\QueryExecuted; use Illuminate\Http\UploadedFile; use Illuminate\Support\Facades\DB; @@ -817,7 +816,7 @@ expect($guild->fresh())->user_id->toBe($member->id)->description->toBe('Still hiring.'); }); -it('refuses a handover to members who cannot open guilds, were removed from moderating it or are at the guild limit', function (): void { +it('refuses a handover to members removed from moderating it or at the guild limit', function (): void { $moderator = User::factory()->create(['handle' => 'admin']); $member = User::factory()->create(); $removed = User::factory()->create(); @@ -828,9 +827,7 @@ Guild::factory()->count(CreateGuildRequest::MAX_PER_USER)->create(['user_id' => $busy->id]); $payload = ['description' => 'Remote jobs.', 'emoji' => '🌍', 'remove_icon' => false]; - $this->actingAs($moderator)->put(route('guild.update', 'jobs'), [...$payload, 'moderator_id' => $member->id])->assertSessionHasErrors(['moderator_id' => 'This member cannot open guilds yet.']); - resolve(Features::class)->update(Feature::Guilds, true, adminOnly: false); - $this->put(route('guild.update', 'jobs'), [...$payload, 'moderator_id' => $removed->id])->assertSessionHasErrors(['moderator_id' => 'This member was removed as its moderator.']); + $this->actingAs($moderator)->put(route('guild.update', 'jobs'), [...$payload, 'moderator_id' => $removed->id])->assertSessionHasErrors(['moderator_id' => 'This member was removed as its moderator.']); $this->put(route('guild.update', 'jobs'), [...$payload, 'moderator_id' => $busy->id])->assertSessionHasErrors(['moderator_id' => 'This member already moderates 100 guilds.']); expect($guild->fresh()->user_id)->toBe($moderator->id); $this->put(route('guild.update', 'jobs'), [...$payload, 'moderator_id' => $member->id])->assertRedirectToRoute('guild.show', 'jobs'); @@ -869,7 +866,7 @@ expect($guild->fresh())->user_id->toBe($moderator->id)->description->toBe($guild->description); }); -it('suggests only other members who can open guilds to the moderator', function (): void { +it('suggests only other members to the moderator', function (): void { $moderator = User::factory()->create(['handle' => 'admin']); $admin = User::factory()->create(['handle' => 'other-admin', 'name' => 'Other Admin']); $ada = User::factory()->create(['handle' => 'ada', 'name' => 'Ada Lovelace']); @@ -886,10 +883,6 @@ $guild->muters()->attach($muter, ['muted_at' => now()]); $this->actingAs($moderator)->getJson(route('guild-member-suggestion.index', 'jobs'))->assertOk() - ->assertJsonPath('members.*.handle', ['other-admin']); - - resolve(Features::class)->update(Feature::Guilds, true, adminOnly: false); - $this->getJson(route('guild-member-suggestion.index', 'jobs'))->assertOk() ->assertExactJson(['members' => [ ['id' => $grace->id, 'handle' => 'grace', 'name' => 'Grace Hopper', 'avatar_url' => $grace->avatar_url], ['id' => $ada->id, 'handle' => 'ada', 'name' => 'Ada Lovelace', 'avatar_url' => $ada->avatar_url], @@ -903,3 +896,16 @@ $this->actingAs($ada)->getJson(route('guild-member-suggestion.index', 'jobs'))->assertNotFound(); $this->actingAs($outsider)->getJson(route('guild-member-suggestion.index', 'jobs'))->assertNotFound(); }); + +it('refuses to create a guild once a handover filled the creator up after validation', function (): void { + $creator = User::factory()->create(['handle' => 'admin']); + Guild::factory()->count(CreateGuildRequest::MAX_PER_USER - 1)->create(['user_id' => $creator->id]); + $this->app->beforeResolving(CreateGuild::class, function () use ($creator): void { + Guild::factory()->create(['user_id' => $creator->id]); + }); + + $this->actingAs($creator)->post(route('guild.store'), ['handle' => 'jobs', 'name' => 'Jobs', 'description' => 'Hiring.', 'emoji' => '💼']) + ->assertSessionHasErrors(['handle' => 'You can create up to 100 guilds.']); + expect(Guild::query()->where('handle', 'jobs')->exists())->toBeFalse() + ->and(Guild::query()->where('user_id', $creator->id)->count())->toBe(CreateGuildRequest::MAX_PER_USER); +});