From e4008675d594550aeae16f79266fbcf96ec8f5c4 Mon Sep 17 00:00:00 2001 From: PacketByte Date: Fri, 13 Nov 2026 05:27:33 -0200 Subject: [PATCH 1/5] feat: add a moderator role without timeout or ban powers --- .env.example | 1 + app/Http/Controllers/UserController.php | 2 +- app/Http/Middleware/HandleInertiaRequests.php | 4 ++- .../Requests/CreateCommitApprovalRequest.php | 2 +- .../Requests/CreateCommitRejectionRequest.php | 2 +- .../Requests/DeleteCommitReportRequest.php | 2 +- .../Requests/ListReportedCommitsRequest.php | 2 +- .../Requests/ShowCommitReportImageRequest.php | 2 +- app/Http/Requests/ShowModerationRequest.php | 2 +- app/Models/User.php | 16 ++++++++++++ config/app.php | 16 ++++++++++++ resources/js/components/app-nav.tsx | 16 +++++++----- resources/js/components/moderation-tabs.tsx | 26 +++++++++++-------- resources/js/layouts/app-layout.tsx | 2 +- resources/js/pages/onboarding/show.tsx | 2 +- resources/js/types/auth.ts | 1 + .../CommitApprovalControllerTest.php | 15 +++++++++++ .../CommitReportControllerTest.php | 14 ++++++++++ .../ModeratedUserControllerTest.php | 15 +++++++++++ .../Controllers/ModerationControllerTest.php | 16 ++++++++++++ .../Controllers/UserControllerTest.php | 9 +++++++ .../Controllers/UserTimeoutControllerTest.php | 3 +++ 22 files changed, 143 insertions(+), 27 deletions(-) diff --git a/.env.example b/.env.example index e6359feea7..4fd271dce2 100644 --- a/.env.example +++ b/.env.example @@ -4,6 +4,7 @@ APP_KEY= APP_DEBUG=true APP_URL=http://localhost:8000 ADMINS= +MODERATORS= APP_LOCALE=en APP_FALLBACK_LOCALE=en diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 0eaaefc559..074f984539 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -63,7 +63,7 @@ public function show(ShowUserRequest $request, #[CurrentUser] ?User $currentUser // viewer's relationship to them on the viewer's own. $profile = new Channel('profiles.'.$user->id); $relationship = fn (Closure $value): Closure|LiveProp => $currentUser instanceof User ? Inertia::live($value, UserUpdate::Account->value, new PrivateChannel($currentUser)) : $value; - $canSeeModerationHistory = $currentUser instanceof User && ($currentUser->is($user) || ($currentUser->isAdmin() && ! $user->isAdmin())); + $canSeeModerationHistory = $currentUser instanceof User && ($currentUser->is($user) || ($currentUser->canModerate() && ! $user->isAdmin())); return Inertia::render('user/show', [ 'user' => Inertia::live(fn (): ?array => ShownStreams::user($getCountedUser()), 'profile', $profile), diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php index a283eaf0b1..f42242cda2 100644 --- a/app/Http/Middleware/HandleInertiaRequests.php +++ b/app/Http/Middleware/HandleInertiaRequests.php @@ -85,6 +85,7 @@ public function onVersionChange(Request $request, Response $response): Response public function share(Request $request): array { $isAdmin = $request->user()?->isAdmin() ?? false; + $canModerate = $request->user()?->canModerate() ?? false; $user = $request->user(); $showsWhoToFollow = $user instanceof User && $request->cookie('who_to_follow') !== 'false'; $context = match (true) { @@ -138,6 +139,7 @@ public function share(Request $request): array ->map(fn (Organization $organization): array => ['type' => 'organization', ...$organization->toArray()]) ->all() : [], UserUpdate::Account), 'isAdmin' => $isAdmin, + 'canModerate' => $canModerate, 'automaticTranslation' => $live(fn (): bool => $user->automatic_translation ?? true, UserUpdate::Account), // The language translations are read in, saved or from the browser, so a change saved elsewhere reaches // the translations already shown. @@ -161,7 +163,7 @@ public function share(Request $request): array ], // Guests see how many developers are here, next to the sign-in button... 'developersCount' => fn (): ?int => $user instanceof User ? null : resolve(DevelopersCountQuery::class)->get(), - 'hasUnmoderatedCommits' => $isAdmin ? $live(fn (): bool => Commit::query()->awaitingModerator()->exists(), UserUpdate::Moderation) : false, + 'hasUnmoderatedCommits' => $canModerate ? $live(fn (): bool => Commit::query()->awaitingModerator()->exists(), UserUpdate::Moderation) : false, // The lite mobile app, which draws its own tab bar (see resources/js/lib/lite-mobile-app.ts). Any browser can send this // token, so it only ever changes the UI... 'isLiteMobileApp' => str_contains((string) $request->userAgent(), 'DevNullLite/'), diff --git a/app/Http/Requests/CreateCommitApprovalRequest.php b/app/Http/Requests/CreateCommitApprovalRequest.php index 65dd2473c7..37b43da3d0 100644 --- a/app/Http/Requests/CreateCommitApprovalRequest.php +++ b/app/Http/Requests/CreateCommitApprovalRequest.php @@ -14,7 +14,7 @@ public function authorize(): bool $user = $this->user(); assert($user instanceof User); - return $user->isAdmin(); + return $user->canModerate(); } /** diff --git a/app/Http/Requests/CreateCommitRejectionRequest.php b/app/Http/Requests/CreateCommitRejectionRequest.php index 70a261930c..0f958ade92 100644 --- a/app/Http/Requests/CreateCommitRejectionRequest.php +++ b/app/Http/Requests/CreateCommitRejectionRequest.php @@ -14,7 +14,7 @@ public function authorize(): bool $user = $this->user(); assert($user instanceof User); - return $user->isAdmin(); + return $user->canModerate(); } /** diff --git a/app/Http/Requests/DeleteCommitReportRequest.php b/app/Http/Requests/DeleteCommitReportRequest.php index bcbcc803ed..eff481bfd9 100644 --- a/app/Http/Requests/DeleteCommitReportRequest.php +++ b/app/Http/Requests/DeleteCommitReportRequest.php @@ -20,7 +20,7 @@ public function authorize(): Response $user = $this->user(); assert($user instanceof User); - if (! $user->isAdmin()) { + if (! $user->canModerate()) { return Response::deny(); } diff --git a/app/Http/Requests/ListReportedCommitsRequest.php b/app/Http/Requests/ListReportedCommitsRequest.php index ccaac007f4..b4178e1265 100644 --- a/app/Http/Requests/ListReportedCommitsRequest.php +++ b/app/Http/Requests/ListReportedCommitsRequest.php @@ -15,7 +15,7 @@ public function authorize(): bool $user = $this->user(); assert($user instanceof User); - return $user->isAdmin(); + return $user->canModerate(); } /** diff --git a/app/Http/Requests/ShowCommitReportImageRequest.php b/app/Http/Requests/ShowCommitReportImageRequest.php index a25b8cfff2..a8473fd26a 100644 --- a/app/Http/Requests/ShowCommitReportImageRequest.php +++ b/app/Http/Requests/ShowCommitReportImageRequest.php @@ -20,7 +20,7 @@ public function authorize(): Response assert($report instanceof CommitReport); $image = $report->images[(int) $this->route('image')] ?? null; - return ($user->isAdmin() || $report->reporter_id === $user->id) && $image !== null && Storage::disk()->exists($image['path']) + return ($user->canModerate() || $report->reporter_id === $user->id) && $image !== null && Storage::disk()->exists($image['path']) ? Response::allow() : Response::denyAsNotFound(); } diff --git a/app/Http/Requests/ShowModerationRequest.php b/app/Http/Requests/ShowModerationRequest.php index 16f54047e9..307db4dda6 100644 --- a/app/Http/Requests/ShowModerationRequest.php +++ b/app/Http/Requests/ShowModerationRequest.php @@ -15,7 +15,7 @@ public function authorize(): bool $user = $this->user(); assert($user instanceof User); - return $user->isAdmin(); + return $user->canModerate(); } /** diff --git a/app/Models/User.php b/app/Models/User.php index 30b5b8716f..ecf2ba7bb1 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -509,6 +509,22 @@ public function isAdmin(): bool return in_array(mb_strtolower($this->handle), array_map(mb_strtolower(...), $admins), true); } + /** + * Moderators review the pending queue and user reports, but cannot timeout or ban anyone. + */ + public function isModerator(): bool + { + /** @var list $moderators */ + $moderators = config('app.moderators'); + + return in_array(mb_strtolower($this->handle), array_map(mb_strtolower(...), $moderators), true); + } + + public function canModerate(): bool + { + return $this->isAdmin() || $this->isModerator(); + } + /** * Unlike loadCount(), counts follows on the pivot tables alone: the self-referencing * relations would otherwise join the users table for every follow. Commits are diff --git a/config/app.php b/config/app.php index 566fd9cb4a..81dfb16d0f 100644 --- a/config/app.php +++ b/config/app.php @@ -48,6 +48,22 @@ explode(',', (string) env('ADMINS', '')), ))), + /* + |-------------------------------------------------------------------------- + | Application Moderators + |-------------------------------------------------------------------------- + | + | The GitHub usernames listed here can review the pending queue and user + | reports, without the power to timeout or ban anyone. Admins can do + | everything moderators can, so they never need to be listed here too. + | + */ + + 'moderators' => array_values(array_filter(array_map( + trim(...), + explode(',', (string) env('MODERATORS', '')), + ))), + /* |-------------------------------------------------------------------------- | Application Debug Mode diff --git a/resources/js/components/app-nav.tsx b/resources/js/components/app-nav.tsx index 28213a354e..9ad5680992 100644 --- a/resources/js/components/app-nav.tsx +++ b/resources/js/components/app-nav.tsx @@ -118,7 +118,7 @@ function useNavItems(): (NavItem & { isActive: boolean })[] { ...(guilds !== null && guilds !== undefined ? [{ title: 'Guilds', href: guildIndex(), icon: UsersRound }] : []), - ...(auth.isAdmin + ...(auth.canModerate ? [ { title: 'Moderation', @@ -126,11 +126,15 @@ function useNavItems(): (NavItem & { isActive: boolean })[] { icon: ShieldCheck, hasIndicator: hasUnmoderatedCommits, }, - { - title: 'Operations', - href: OperationsController.show(), - icon: Activity, - }, + ...(auth.isAdmin + ? [ + { + title: 'Operations', + href: OperationsController.show(), + icon: Activity, + }, + ] + : []), ] : []), { diff --git a/resources/js/components/moderation-tabs.tsx b/resources/js/components/moderation-tabs.tsx index abbf332fbb..ee7e1fb652 100644 --- a/resources/js/components/moderation-tabs.tsx +++ b/resources/js/components/moderation-tabs.tsx @@ -11,6 +11,7 @@ export function ModerationTabs({ }: { active: 'pending' | 'reports' | 'people' | 'bulk' | 'guilds'; }) { + const { auth } = usePage().props; const hasGuilds = usePage().props.guilds != null; return ( diff --git a/resources/js/pages/onboarding/show.tsx b/resources/js/pages/onboarding/show.tsx index 875c075c8f..d670b2f69d 100644 --- a/resources/js/pages/onboarding/show.tsx +++ b/resources/js/pages/onboarding/show.tsx @@ -994,7 +994,7 @@ export default function Show({ diff --git a/resources/js/types/auth.ts b/resources/js/types/auth.ts index 403424de26..b0d998ae8f 100644 --- a/resources/js/types/auth.ts +++ b/resources/js/types/auth.ts @@ -52,6 +52,7 @@ export type Auth = { */ organizations: OrganizationAuthor[]; isAdmin: boolean; + canModerate: boolean; automaticTranslation: boolean; /** * The language the reader reads translations in, saved or from the browser. diff --git a/tests/Feature/Controllers/CommitApprovalControllerTest.php b/tests/Feature/Controllers/CommitApprovalControllerTest.php index 016d66d7a2..c3e2f22677 100644 --- a/tests/Feature/Controllers/CommitApprovalControllerTest.php +++ b/tests/Feature/Controllers/CommitApprovalControllerTest.php @@ -47,3 +47,18 @@ expect($commit->refresh()->status)->toBe(CommitStatus::Pending); }); + +it('may approve a commit as a moderator', function (): void { + config(['app.moderators' => ['maude']]); + + $moderator = User::factory()->create(['handle' => 'maude']); + $commit = Commit::factory()->pending()->create(); + + $response = $this->actingAs($moderator) + ->fromRoute('moderation.show') + ->post(route('commit-approval.store', $commit)); + + $response->assertRedirectToRoute('moderation.show'); + + expect($commit->refresh()->status)->toBe(CommitStatus::Approved); +}); diff --git a/tests/Feature/Controllers/CommitReportControllerTest.php b/tests/Feature/Controllers/CommitReportControllerTest.php index a8c251d5aa..79aa6ba239 100644 --- a/tests/Feature/Controllers/CommitReportControllerTest.php +++ b/tests/Feature/Controllers/CommitReportControllerTest.php @@ -285,6 +285,20 @@ expect($report->refresh()->dismissed_at)->toBeNull(); }); +it('lets a moderator dismiss a report without touching bans', function (): void { + config(['app.moderators' => ['maude']]); + + $report = CommitReport::factory()->create(); + $moderator = User::factory()->create(['handle' => 'maude']); + + $this->actingAs($moderator) + ->fromRoute('reported-commit.index') + ->delete(route('commit-report.destroy', $report)) + ->assertRedirectToRoute('reported-commit.index'); + + expect($report->refresh()->dismissed_at)->not->toBeNull(); +}); + it('lists only unresolved reports on live published content oldest first without reporter identity', function (): void { $admin = User::factory()->create(['handle' => 'moderator-demo']); $older = CommitReport::factory()->create(['created_at' => now()->subHour(), 'details' => 'Review this context.']); diff --git a/tests/Feature/Controllers/ModeratedUserControllerTest.php b/tests/Feature/Controllers/ModeratedUserControllerTest.php index e4b1f0c296..fd2c6e0c45 100644 --- a/tests/Feature/Controllers/ModeratedUserControllerTest.php +++ b/tests/Feature/Controllers/ModeratedUserControllerTest.php @@ -102,3 +102,18 @@ ->and($user->refresh()->isBanned())->toBeFalse() ->and(Ban::query()->count())->toBe(1); }); + +it('keeps moderators out of timeouts and bans', function (): void { + config(['app.admins' => ['admin']]); + config(['app.moderators' => ['maude']]); + + $moderator = User::factory()->create(['handle' => 'maude']); + $user = User::factory()->create(['handle' => 'octocat']); + + $this->actingAs($moderator)->get(route('moderated-user.index'))->assertForbidden(); + $this->actingAs($moderator)->post(route('user-timeout.store', $user), ['reason' => 'spam', 'duration' => 60])->assertForbidden(); + $this->actingAs($moderator)->post(route('user-ban.store', $user), ['reason' => 'spam'])->assertForbidden(); + + expect($user->timeouts()->count())->toBe(0) + ->and($user->refresh()->isBanned())->toBeFalse(); +}); diff --git a/tests/Feature/Controllers/ModerationControllerTest.php b/tests/Feature/Controllers/ModerationControllerTest.php index 3e2e928275..6a85d6cbff 100644 --- a/tests/Feature/Controllers/ModerationControllerTest.php +++ b/tests/Feature/Controllers/ModerationControllerTest.php @@ -348,3 +348,19 @@ ])->assertOk() ->assertJsonPath('props.decidedCommitIds', fn (array $ids): bool => collect($ids)->sort()->values()->all() === collect([$approved->id, $deleted->id])->sort()->values()->all()); }); + +it('renders the pending queue for a moderator', function (): void { + config(['app.moderators' => ['maude']]); + + $moderator = User::factory()->create(['handle' => 'maude']); + Commit::factory()->pending()->checkedByAi()->create(['body' => 'Needs review']); + + $response = $this->actingAs($moderator) + ->get(route('moderation.show')); + + $response->assertOk() + ->assertInertia(fn ($page) => $page + ->component('moderation/show') + ->has('commits.data', 1) + ->where('commits.data.0.body', 'Needs review')); +}); diff --git a/tests/Feature/Controllers/UserControllerTest.php b/tests/Feature/Controllers/UserControllerTest.php index 72f17449a0..b1aaec6621 100644 --- a/tests/Feature/Controllers/UserControllerTest.php +++ b/tests/Feature/Controllers/UserControllerTest.php @@ -85,6 +85,15 @@ $this->actingAs($moderator); + $this->get(route('user.show', $user), $inertiaHeaders) + ->assertJsonPath('props.moderationHistory.timeoutsCount', 1) + ->assertJsonPath('props.moderationHistory.bansCount', 1); + + config(['app.moderators' => ['maude']]); + $communityModerator = User::factory()->create(['handle' => 'maude']); + + $this->actingAs($communityModerator); + $this->get(route('user.show', $user), $inertiaHeaders) ->assertJsonPath('props.moderationHistory.timeoutsCount', 1) ->assertJsonPath('props.moderationHistory.bansCount', 1); diff --git a/tests/Feature/Controllers/UserTimeoutControllerTest.php b/tests/Feature/Controllers/UserTimeoutControllerTest.php index b33e466e39..bd1187e45b 100644 --- a/tests/Feature/Controllers/UserTimeoutControllerTest.php +++ b/tests/Feature/Controllers/UserTimeoutControllerTest.php @@ -76,9 +76,11 @@ User::factory()->create(['handle' => 'admin']); User::factory()->create(['handle' => 'other-admin']); User::factory()->create(['handle' => 'someone']); + User::factory()->create(['handle' => 'maude']); User::factory()->create(['handle' => 'octocat']); config(['app.admins' => ['admin', 'other-admin']]); + config(['app.moderators' => ['maude']]); $this->actingAs(User::query()->whereRelation('profile', 'handle', $actor)->sole()) ->post(route('user-timeout.store', ['user' => $target]), ['reason' => 'spam', 'duration' => 60]) @@ -89,6 +91,7 @@ expect(UserTimeout::query()->count())->toBe(0); })->with([ 'by a user' => ['someone', 'octocat'], + 'by a moderator' => ['maude', 'octocat'], 'to another admin' => ['admin', 'other-admin'], 'to themselves' => ['admin', 'admin'], ]); From 2fff123d6ec0ca8c0ff762ae7c8cfd77c49cb609 Mon Sep 17 00:00:00 2001 From: PacketByte Date: Fri, 13 Nov 2026 07:10:10 -0200 Subject: [PATCH 2/5] feat: let moderators see timeouts and bans read-only --- app/Http/Controllers/UserController.php | 2 +- .../Requests/ListModeratedUsersRequest.php | 2 +- resources/js/components/moderation-tabs.tsx | 6 ++- resources/js/pages/moderation/people.tsx | 43 +++++++++++-------- resources/js/pages/user/show.tsx | 2 +- .../ModeratedUserControllerTest.php | 10 ++++- .../Controllers/UserControllerTest.php | 6 ++- 7 files changed, 44 insertions(+), 27 deletions(-) diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 074f984539..a5076b3fac 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -81,7 +81,7 @@ public function show(ShowUserRequest $request, #[CurrentUser] ?User $currentUser 'activity' => fn (): array => $activity->get($user, $currentUser), 'streaks' => $getStreaks, 'achievements' => fn (): array => $achievements->get($user, $currentUser, $getStreaks()), - 'moderation' => $currentUser?->isAdmin() === true && ! $user->isAdmin() + 'moderation' => $currentUser?->canModerate() === true && ! $user->isAdmin() ? fn (): array => $moderation->get([$user])[$user->id] : null, 'moderationHistory' => match (true) { diff --git a/app/Http/Requests/ListModeratedUsersRequest.php b/app/Http/Requests/ListModeratedUsersRequest.php index ebdd1c70ea..7cbe94a6ea 100644 --- a/app/Http/Requests/ListModeratedUsersRequest.php +++ b/app/Http/Requests/ListModeratedUsersRequest.php @@ -14,7 +14,7 @@ public function authorize(): bool $user = $this->user(); assert($user instanceof User); - return $user->isAdmin(); + return $user->canModerate(); } /** diff --git a/resources/js/components/moderation-tabs.tsx b/resources/js/components/moderation-tabs.tsx index ee7e1fb652..ecb50c2d5b 100644 --- a/resources/js/components/moderation-tabs.tsx +++ b/resources/js/components/moderation-tabs.tsx @@ -28,13 +28,17 @@ export function ModerationTabs({ href: index(), isActive: active === 'reports', }, - ...(auth.isAdmin + ...(auth.canModerate ? [ { title: 'Timeouts & bans', href: people(), isActive: active === 'people', }, + ] + : []), + ...(auth.isAdmin + ? [ { title: 'Bulk', href: bulk(), diff --git a/resources/js/pages/moderation/people.tsx b/resources/js/pages/moderation/people.tsx index fa4b40b723..250b9860bb 100644 --- a/resources/js/pages/moderation/people.tsx +++ b/resources/js/pages/moderation/people.tsx @@ -1,4 +1,4 @@ -import { Head, Link, router } from '@inertiajs/react'; +import { Head, Link, router, usePage } from '@inertiajs/react'; import { Undo2 } from 'lucide-react'; import type { ReactNode } from 'react'; import BanController from '@/actions/App/Http/Controllers/BanController'; @@ -35,6 +35,7 @@ export default function People({ timeouts: Timeout[]; bans: Ban[]; }) { + const { auth } = usePage().props; const endTimeout = (timeout: Timeout) => router .optimistic((props: { timeouts: Timeout[] }) => ({ @@ -82,15 +83,17 @@ export default function People({ } action={ - + auth.isAdmin ? ( + + ) : null } /> ))} @@ -115,15 +118,17 @@ export default function People({ } action={ - + auth.isAdmin ? ( + + ) : null } /> ))} diff --git a/resources/js/pages/user/show.tsx b/resources/js/pages/user/show.tsx index 1b7cd2b065..146c55d744 100644 --- a/resources/js/pages/user/show.tsx +++ b/resources/js/pages/user/show.tsx @@ -301,7 +301,7 @@ export default function Show({ ) : ( <> - {moderation && ( + {moderation && auth.isAdmin && ( and(Ban::query()->count())->toBe(1); }); -it('keeps moderators out of timeouts and bans', function (): void { +it('lets moderators see timeouts and bans without touching them', function (): void { config(['app.admins' => ['admin']]); config(['app.moderators' => ['maude']]); $moderator = User::factory()->create(['handle' => 'maude']); $user = User::factory()->create(['handle' => 'octocat']); - $this->actingAs($moderator)->get(route('moderated-user.index'))->assertForbidden(); + $this->actingAs($moderator) + ->get(route('moderated-user.index')) + ->assertOk() + ->assertInertia(fn ($page) => $page + ->component('moderation/people') + ->has('timeouts') + ->has('bans')); $this->actingAs($moderator)->post(route('user-timeout.store', $user), ['reason' => 'spam', 'duration' => 60])->assertForbidden(); $this->actingAs($moderator)->post(route('user-ban.store', $user), ['reason' => 'spam'])->assertForbidden(); diff --git a/tests/Feature/Controllers/UserControllerTest.php b/tests/Feature/Controllers/UserControllerTest.php index b1aaec6621..a752d966fe 100644 --- a/tests/Feature/Controllers/UserControllerTest.php +++ b/tests/Feature/Controllers/UserControllerTest.php @@ -96,14 +96,16 @@ $this->get(route('user.show', $user), $inertiaHeaders) ->assertJsonPath('props.moderationHistory.timeoutsCount', 1) - ->assertJsonPath('props.moderationHistory.bansCount', 1); + ->assertJsonPath('props.moderationHistory.bansCount', 1) + ->assertJsonPath('props.moderation.timeoutsCount', 1); $viewer = User::factory()->create(); $this->actingAs($viewer); $this->get(route('user.show', $user), $inertiaHeaders) - ->assertJsonPath('props.moderationHistory', null); + ->assertJsonPath('props.moderationHistory', null) + ->assertJsonPath('props.moderation', null); }); it('says which accounts the bio and company mention are on dev/null', function (): void { From e6d84f4ebc409e60feeb5d379b843f941feb6251 Mon Sep 17 00:00:00 2001 From: PacketByte Date: Fri, 13 Nov 2026 20:44:19 -0200 Subject: [PATCH 3/5] feat: let moderators list and dismiss guild reports, keep guild deletion admin-only --- .../Requests/DeleteGuildReportRequest.php | 2 +- app/Http/Requests/ListGuildReportsRequest.php | 2 +- .../Controllers/GuildControllerTest.php | 21 +++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/app/Http/Requests/DeleteGuildReportRequest.php b/app/Http/Requests/DeleteGuildReportRequest.php index 64e465f44f..5d06c4945f 100644 --- a/app/Http/Requests/DeleteGuildReportRequest.php +++ b/app/Http/Requests/DeleteGuildReportRequest.php @@ -13,7 +13,7 @@ final class DeleteGuildReportRequest extends FormRequest { public function authorize(Features $features): Response { - return $this->user()?->isAdmin() && $features->available(Feature::Guilds, $this->user()) + return $this->user()?->canModerate() && $features->available(Feature::Guilds, $this->user()) ? Response::allow() : Response::denyAsNotFound(); } diff --git a/app/Http/Requests/ListGuildReportsRequest.php b/app/Http/Requests/ListGuildReportsRequest.php index bedd3a0bb6..bf9bec5aa3 100644 --- a/app/Http/Requests/ListGuildReportsRequest.php +++ b/app/Http/Requests/ListGuildReportsRequest.php @@ -13,7 +13,7 @@ final class ListGuildReportsRequest extends FormRequest { public function authorize(Features $features): Response { - return $this->user()?->isAdmin() && $features->available(Feature::Guilds, $this->user()) + return $this->user()?->canModerate() && $features->available(Feature::Guilds, $this->user()) ? Response::allow() : Response::denyAsNotFound(); } diff --git a/tests/Feature/Controllers/GuildControllerTest.php b/tests/Feature/Controllers/GuildControllerTest.php index c2df8f9a87..8b2bb48049 100644 --- a/tests/Feature/Controllers/GuildControllerTest.php +++ b/tests/Feature/Controllers/GuildControllerTest.php @@ -280,6 +280,27 @@ ->and($report->fresh()->dismissed_at)->toBeNull(); }); +it('lets a moderator list and dismiss guild reports without touching guild deletion', function (): void { + $admin = User::factory()->create(['handle' => 'admin']); + $this->actingAs($admin)->put(route('feature.update', Feature::Guilds), ['enabled' => true, 'admin_only' => false])->assertRedirect(); + + config(['app.admins' => [], 'app.moderators' => ['maude']]); + + $owner = User::factory()->create(); + $moderator = User::factory()->create(['handle' => 'maude']); + $guild = Guild::factory()->create(['user_id' => $owner->id]); + $report = GuildReport::factory()->create(['guild_id' => $guild->id]); + + $this->actingAs($moderator)->get(route('guild-report.index'))->assertOk(); + $this->actingAs($moderator)->delete(route('guild-report.destroy', $report))->assertRedirect(); + expect($report->fresh()->dismissed_at)->not->toBeNull(); + + $other = GuildReport::factory()->create(['guild_id' => $guild->id]); + $this->actingAs($owner)->get(route('guild-report.index'))->assertNotFound(); + $this->actingAs($owner)->delete(route('guild-report.destroy', $other))->assertNotFound(); + expect($other->fresh()->dismissed_at)->toBeNull(); +}); + it('removes the moderator and guild but not commits and forbids every removed moderator from reclaiming it', function (): void { Storage::fake(); $owner = User::factory()->create(['handle' => 'admin']); From b966d49dc95fa9b633f516b551e2bc9ef24994f8 Mon Sep 17 00:00:00 2001 From: PacketByte Date: Fri, 13 Nov 2026 21:07:32 -0200 Subject: [PATCH 4/5] feat: include moderators in admin-only feature previews like guilds --- app/Services/Features.php | 2 +- tests/Feature/Controllers/GuildControllerTest.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Services/Features.php b/app/Services/Features.php index 93d9ba33c7..f8fd9f80e7 100644 --- a/app/Services/Features.php +++ b/app/Services/Features.php @@ -29,7 +29,7 @@ public function adminOnly(Feature $feature): bool public function available(Feature $feature, ?User $user): bool { - return $this->enabled($feature) && (! $this->adminOnly($feature) || ($user?->isAdmin() ?? false)); + return $this->enabled($feature) && (! $this->adminOnly($feature) || ($user?->canModerate() ?? false)); } /** @return list */ diff --git a/tests/Feature/Controllers/GuildControllerTest.php b/tests/Feature/Controllers/GuildControllerTest.php index 8b2bb48049..89b8961ec8 100644 --- a/tests/Feature/Controllers/GuildControllerTest.php +++ b/tests/Feature/Controllers/GuildControllerTest.php @@ -281,9 +281,6 @@ }); it('lets a moderator list and dismiss guild reports without touching guild deletion', function (): void { - $admin = User::factory()->create(['handle' => 'admin']); - $this->actingAs($admin)->put(route('feature.update', Feature::Guilds), ['enabled' => true, 'admin_only' => false])->assertRedirect(); - config(['app.admins' => [], 'app.moderators' => ['maude']]); $owner = User::factory()->create(); @@ -291,11 +288,14 @@ $guild = Guild::factory()->create(['user_id' => $owner->id]); $report = GuildReport::factory()->create(['guild_id' => $guild->id]); + // The preview is still admin-only; moderators are inside it, members are not. + $this->actingAs($moderator)->get(route('guild.show', $guild))->assertOk(); $this->actingAs($moderator)->get(route('guild-report.index'))->assertOk(); $this->actingAs($moderator)->delete(route('guild-report.destroy', $report))->assertRedirect(); expect($report->fresh()->dismissed_at)->not->toBeNull(); $other = GuildReport::factory()->create(['guild_id' => $guild->id]); + $this->actingAs($owner)->get(route('guild.show', $guild))->assertNotFound(); $this->actingAs($owner)->get(route('guild-report.index'))->assertNotFound(); $this->actingAs($owner)->delete(route('guild-report.destroy', $other))->assertNotFound(); expect($other->fresh()->dismissed_at)->toBeNull(); From 57d0452edbab73d65e886e617d88cbb797259061 Mon Sep 17 00:00:00 2001 From: PacketByte Date: Fri, 13 Nov 2026 21:36:46 -0200 Subject: [PATCH 5/5] fix: scope the moderator preview exception to guilds only --- app/Services/Features.php | 12 +++++++++++- .../Feature/Controllers/FeatureControllerTest.php | 14 ++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/app/Services/Features.php b/app/Services/Features.php index f8fd9f80e7..8dee743edf 100644 --- a/app/Services/Features.php +++ b/app/Services/Features.php @@ -29,7 +29,17 @@ public function adminOnly(Feature $feature): bool public function available(Feature $feature, ?User $user): bool { - return $this->enabled($feature) && (! $this->adminOnly($feature) || ($user?->canModerate() ?? false)); + if (! $this->enabled($feature)) { + return false; + } + + if (! $this->adminOnly($feature)) { + return true; + } + + return $feature === Feature::Guilds + ? ($user?->canModerate() ?? false) + : ($user?->isAdmin() ?? false); } /** @return list */ diff --git a/tests/Feature/Controllers/FeatureControllerTest.php b/tests/Feature/Controllers/FeatureControllerTest.php index 2e6cf24390..260d4c1b7a 100644 --- a/tests/Feature/Controllers/FeatureControllerTest.php +++ b/tests/Feature/Controllers/FeatureControllerTest.php @@ -114,3 +114,17 @@ ->assertUnprocessable()->assertJsonValidationErrors('admin_only'); $this->assertDatabaseCount('features', 0); }); + +it('keeps other admin-only features restricted to admins', function (): void { + config(['app.admins' => ['admin'], 'app.moderators' => ['maude']]); + $admin = User::factory()->create(['handle' => 'admin']); + $moderator = User::factory()->create(['handle' => 'maude']); + + $this->actingAs($admin)->put(route('feature.update', Feature::Translations), ['enabled' => true, 'admin_only' => true])->assertRedirect(); + + $features = app(Features::class); + expect($features->available(Feature::Translations, $admin))->toBeTrue() + ->and($features->available(Feature::Translations, $moderator))->toBeFalse() + ->and($features->available(Feature::Guilds, $moderator))->toBeTrue() + ->and($features->available(Feature::Guilds, $admin))->toBeTrue(); +});