362f65656b
Full audit (bugs/UI-UX/backend/feature-gap) turned up a money-leak AI quota bypass, webhook SSRF, and a long tail of missing pagination/auth/a11y work. Fixes land together since HANDOFF.md tracked them as one backlog. - AI routes charge tier quota before generating; nutrition POST is author-only - Webhook dispatch re-validates URL per delivery (SSRF/DNS-rebinding), treats redirects as failures; recipe.published now actually dispatches - New indexes/unique constraints on recipes, meal-planning, comments FK cascade - Recipe PUT/restore snapshot only inside the transaction, after validation - Recipe DELETE cleans up S3 objects (recipe + review photos) - Optimistic UI (favorite/star/follow/shopping-list) rolls back on failure - Upload presign enforces file size cap + per-tier storage quota - Route-level loading/error/not-found states across (app), admin, and root - middleware.ts guards (app)/admin; requireAdmin checks DB role, not cached session; rate limiting applied to both session and API-key branches, bucketed per key; Stripe webhook dedupes by event id - Pagination added to recipes, feed, profile, comments, pantry, admin tables - Nav shows real avatar + profile link + dark-mode toggle; destructive actions standardized on AlertDialog - Unsaved-changes guard + real ingredient/step validation on recipe form; canonical /recipes/[id] used in-app; next/image migration; aria-labels and alt text across icon buttons, avatars, recipe photos - packages/api-types removed (zero callers, too drifted to safely rewire); openapi.ts and ai-keys error shape drift fixed; BYOK decrypt failures now surface instead of silently falling back to the platform key Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
220 lines
7.6 KiB
TypeScript
220 lines
7.6 KiB
TypeScript
import { notFound } from "next/navigation";
|
|
import { headers } from "next/headers";
|
|
import Link from "next/link";
|
|
import Image from "next/image";
|
|
import { auth } from "@/lib/auth/server";
|
|
import {
|
|
db,
|
|
users,
|
|
recipes,
|
|
userFollows,
|
|
userBlocks,
|
|
eq,
|
|
and,
|
|
desc,
|
|
count,
|
|
} from "@epicure/db";
|
|
import { Avatar, AvatarImage, AvatarFallback } from "@/components/ui/avatar";
|
|
import { Badge } from "@/components/ui/badge";
|
|
import { FollowButton } from "@/components/social/follow-button";
|
|
import { BlockButton } from "@/components/social/block-button";
|
|
import { MessageButton } from "@/components/social/message-button";
|
|
import { getPublicUrl } from "@/lib/storage";
|
|
|
|
const PAGE_SIZE = 24;
|
|
|
|
type Params = {
|
|
params: Promise<{ username: string }>;
|
|
searchParams: Promise<{ page?: string }>;
|
|
};
|
|
|
|
export async function generateMetadata({ params }: Params) {
|
|
const { username } = await params;
|
|
const user = await db.query.users.findFirst({ where: eq(users.username, username) });
|
|
return { title: user ? `${user.name} (@${user.username})` : "Profile" };
|
|
}
|
|
|
|
export default async function UserProfilePage({ params, searchParams }: Params) {
|
|
const { username } = await params;
|
|
const { page: pageParam } = await searchParams;
|
|
const page = Math.max(1, parseInt(pageParam ?? "1", 10) || 1);
|
|
const offset = (page - 1) * PAGE_SIZE;
|
|
|
|
const session = await auth.api.getSession({ headers: await headers() });
|
|
|
|
const user = await db.query.users.findFirst({ where: eq(users.username, username) });
|
|
if (!user) notFound();
|
|
|
|
const [followerCountRow, followingCountRow, recipeCountRow, publicRecipes] = await Promise.all([
|
|
db
|
|
.select({ count: count() })
|
|
.from(userFollows)
|
|
.where(eq(userFollows.followingId, user.id)),
|
|
db
|
|
.select({ count: count() })
|
|
.from(userFollows)
|
|
.where(eq(userFollows.followerId, user.id)),
|
|
db
|
|
.select({ count: count() })
|
|
.from(recipes)
|
|
.where(and(eq(recipes.authorId, user.id), eq(recipes.visibility, "public"))),
|
|
db.query.recipes.findMany({
|
|
where: and(eq(recipes.authorId, user.id), eq(recipes.visibility, "public")),
|
|
orderBy: desc(recipes.createdAt),
|
|
limit: PAGE_SIZE,
|
|
offset,
|
|
with: {
|
|
photos: { orderBy: (t, { asc }) => asc(t.order), limit: 1 },
|
|
},
|
|
}),
|
|
]);
|
|
|
|
const followerCount = followerCountRow[0]?.count ?? 0;
|
|
const followingCount = followingCountRow[0]?.count ?? 0;
|
|
const recipeCount = recipeCountRow[0]?.count ?? 0;
|
|
const totalPages = Math.max(1, Math.ceil(recipeCount / PAGE_SIZE));
|
|
|
|
let isFollowing = false;
|
|
let isBlocked = false;
|
|
const isOwnProfile = session?.user.id === user.id;
|
|
if (session && !isOwnProfile) {
|
|
const [followRow, blockRow] = await Promise.all([
|
|
db.query.userFollows.findFirst({
|
|
where: and(
|
|
eq(userFollows.followerId, session.user.id),
|
|
eq(userFollows.followingId, user.id),
|
|
),
|
|
}),
|
|
db.query.userBlocks.findFirst({
|
|
where: and(
|
|
eq(userBlocks.blockerId, session.user.id),
|
|
eq(userBlocks.blockedId, user.id),
|
|
),
|
|
}),
|
|
]);
|
|
isFollowing = !!followRow;
|
|
isBlocked = !!blockRow;
|
|
}
|
|
|
|
const initials = user.name
|
|
.split(" ")
|
|
.slice(0, 2)
|
|
.map((w) => w[0])
|
|
.join("")
|
|
.toUpperCase();
|
|
|
|
return (
|
|
<div className="max-w-4xl mx-auto space-y-10">
|
|
{/* Profile header */}
|
|
<div className="flex flex-col sm:flex-row gap-6 items-start sm:items-center">
|
|
<Avatar className="h-24 w-24 shrink-0">
|
|
{user.avatarUrl && <AvatarImage src={user.avatarUrl} alt={user.name} />}
|
|
<AvatarFallback className="text-2xl">{initials}</AvatarFallback>
|
|
</Avatar>
|
|
|
|
<div className="flex-1 space-y-3">
|
|
<div className="flex flex-wrap items-center gap-3">
|
|
<div>
|
|
<h1 className="text-2xl font-bold leading-tight">{user.name}</h1>
|
|
<p className="text-muted-foreground text-sm">@{user.username}</p>
|
|
</div>
|
|
{!isOwnProfile && session && (
|
|
<div className="flex items-center gap-2">
|
|
<FollowButton
|
|
targetUserId={user.id}
|
|
targetUsername={user.username!}
|
|
initialFollowing={isFollowing}
|
|
/>
|
|
{!isBlocked && <MessageButton targetUsername={user.username!} />}
|
|
<BlockButton targetUsername={user.username!} initialBlocked={isBlocked} />
|
|
</div>
|
|
)}
|
|
</div>
|
|
|
|
{user.bio && (
|
|
<p className="text-sm leading-relaxed max-w-prose">{user.bio}</p>
|
|
)}
|
|
|
|
<div className="flex flex-wrap gap-2">
|
|
<Badge variant="secondary">
|
|
<span className="font-semibold mr-1">{recipeCount}</span> recipes
|
|
</Badge>
|
|
<Badge variant="secondary">
|
|
<span className="font-semibold mr-1">{followerCount}</span> followers
|
|
</Badge>
|
|
<Badge variant="secondary">
|
|
<span className="font-semibold mr-1">{followingCount}</span> following
|
|
</Badge>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
{/* Recipe grid */}
|
|
{publicRecipes.length > 0 ? (
|
|
<div className="space-y-4">
|
|
<h2 className="text-xl font-semibold">Recipes</h2>
|
|
<div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 gap-4">
|
|
{publicRecipes.map((recipe) => {
|
|
const cover = recipe.photos[0];
|
|
return (
|
|
<Link
|
|
key={recipe.id}
|
|
href={`/recipes/${recipe.id}`}
|
|
className="group block rounded-xl overflow-hidden border bg-card hover:shadow-md transition-shadow"
|
|
>
|
|
<div className="relative aspect-square bg-muted overflow-hidden">
|
|
{cover ? (
|
|
<Image
|
|
src={getPublicUrl(cover.storageKey)}
|
|
alt={recipe.title}
|
|
fill
|
|
sizes="(max-width: 640px) 50vw, (max-width: 768px) 33vw, 25vw"
|
|
className="object-cover group-hover:scale-105 transition-transform duration-200"
|
|
/>
|
|
) : (
|
|
<div className="w-full h-full flex items-center justify-center text-muted-foreground text-3xl">
|
|
🍽️
|
|
</div>
|
|
)}
|
|
</div>
|
|
<div className="p-2">
|
|
<p className="text-sm font-medium leading-tight line-clamp-2">{recipe.title}</p>
|
|
</div>
|
|
</Link>
|
|
);
|
|
})}
|
|
</div>
|
|
|
|
{totalPages > 1 && (
|
|
<div className="flex items-center justify-center gap-2 pt-2">
|
|
{page > 1 && (
|
|
<Link
|
|
href={`/u/${username}${page - 1 > 1 ? `?page=${page - 1}` : ""}`}
|
|
className="rounded-md border px-3 py-1.5 text-sm hover:bg-accent"
|
|
>
|
|
Previous
|
|
</Link>
|
|
)}
|
|
<span className="text-sm text-muted-foreground px-2">
|
|
Page {page} of {totalPages}
|
|
</span>
|
|
{page < totalPages && (
|
|
<Link
|
|
href={`/u/${username}?page=${page + 1}`}
|
|
className="rounded-md border px-3 py-1.5 text-sm hover:bg-accent"
|
|
>
|
|
Next
|
|
</Link>
|
|
)}
|
|
</div>
|
|
)}
|
|
</div>
|
|
) : (
|
|
<div className="text-center py-16 text-muted-foreground">
|
|
<p className="text-lg">No public recipes yet.</p>
|
|
</div>
|
|
)}
|
|
</div>
|
|
);
|
|
}
|