diff --git a/app/Http/Controllers/GuildController.php b/app/Http/Controllers/GuildController.php index 19b81e2f18..0bb8bd55b5 100644 --- a/app/Http/Controllers/GuildController.php +++ b/app/Http/Controllers/GuildController.php @@ -6,6 +6,7 @@ use App\Actions\CreateGuild; use App\Actions\UpdateGuild; +use App\Enums\UserUpdate; use App\Exceptions\GuildModeratorRemoved; use App\Http\Requests\CreateGuildRequest; use App\Http\Requests\ListGuildsRequest; @@ -17,6 +18,7 @@ use App\Models\User; use App\Queries\GuildCommitsQuery; use App\Queries\GuildsQuery; +use Illuminate\Broadcasting\PrivateChannel; use Illuminate\Container\Attributes\CurrentUser; use Illuminate\Http\RedirectResponse; use Illuminate\Http\UploadedFile; @@ -60,7 +62,20 @@ public function show(ShowGuildRequest $request, Guild $guild, #[CurrentUser] Use return Inertia::render('guild/show', [ 'handle' => $guild->handle, - 'canModerate' => $guild->user_id === $user->id, + 'canModerate' => Inertia::live( + fn (): bool => $guild->user_id === $user->id, + on: [UserUpdate::Guilds->value], + channel: new PrivateChannel($user), + ), + 'moderator' => Inertia::live( + fn (): ?array => ($owner = $guild->owner) === null ? null : [ + 'handle' => $owner->handle, + 'name' => $owner->name, + 'avatar_url' => $owner->avatar_url, + ], + on: [UserUpdate::Guilds->value], + channel: new PrivateChannel($user), + ), 'commits' => $commits->currentPage() > 1 ? Inertia::merge(ShownStreams::commits($commits))->matchOn('id') : ShownStreams::commits($commits), diff --git a/app/Models/Guild.php b/app/Models/Guild.php index b39d44ed90..fd5c5f087f 100644 --- a/app/Models/Guild.php +++ b/app/Models/Guild.php @@ -10,6 +10,7 @@ use Illuminate\Database\Eloquent\Concerns\HasUuids; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; @@ -41,6 +42,12 @@ public function commits(): HasMany return $this->hasMany(Commit::class); } + /** @return BelongsTo */ + public function owner(): BelongsTo + { + return $this->belongsTo(User::class, 'user_id'); + } + /** @return BelongsToMany */ public function members(): BelongsToMany { diff --git a/resources/js/pages/guild/show.tsx b/resources/js/pages/guild/show.tsx index 949b42c0a7..0796e41e1d 100644 --- a/resources/js/pages/guild/show.tsx +++ b/resources/js/pages/guild/show.tsx @@ -1,7 +1,8 @@ -import { Head, router, usePage } from '@inertiajs/react'; +import { Head, Link, router, usePage } from '@inertiajs/react'; import { Pencil } from 'lucide-react'; import { useState } from 'react'; import { show } from '@/actions/App/Http/Controllers/GuildController'; +import { show as showProfile } from '@/actions/App/Http/Controllers/UserController'; import { CommitCard } from '@/components/commit-card'; import { CommitComposer } from '@/components/commit-composer'; import { EmptyFeed } from '@/components/commit-feed'; @@ -18,18 +19,25 @@ import { } from '@/components/guild-preferences'; import { Button } from '@/components/ui/button'; import { Spinner } from '@/components/ui/spinner'; +import { UserAvatar } from '@/components/user-avatar'; import AppLayout from '@/layouts/app-layout'; import type { Commit } from '@/types'; export default function Show({ handle, canModerate, + moderator, commits, page, hasMore, }: { handle: string; canModerate: boolean; + moderator: { + handle: string; + name: string; + avatar_url: string | null; + } | null; commits: Commit[]; page: number; hasMore: boolean; @@ -96,6 +104,23 @@ export default function Show({

{guild.description}

+ {moderator && ( +
+ Moderators + + + @{moderator.handle} + +
+ )}
{!canModerate && } {auth.isAdmin && !guild.is_paused && ( diff --git a/tests/Feature/Controllers/GuildControllerTest.php b/tests/Feature/Controllers/GuildControllerTest.php index 8eae30e478..deae758e5c 100644 --- a/tests/Feature/Controllers/GuildControllerTest.php +++ b/tests/Feature/Controllers/GuildControllerTest.php @@ -120,6 +120,7 @@ $this->get(route('guild.show', 'jobs'))->assertOk()->assertInertia(fn ($page) => $page ->component('guild/show')->where('canModerate', true)->where('guilds.0.name', 'Jo bs') + ->where('moderator.handle', 'admin') ->where('guilds.0.icon_url', null)->missing('guilds.0.user_id')->missing('guilds.0.icon_path')); $this->actingAs(User::factory()->create(['handle' => 'other-admin'])) ->get(route('guild.show', 'jobs'))->assertOk()->assertInertia(fn ($page) => $page->where('canModerate', false));