b9aac2859a
Two cleanups in one pass: 1. Update import paths app-wide from `~/lib/auth.server` to `~/lib/auth/session.server` for the four session helpers (sessionStorage, createSession, getSessionUser, destroySession). ~40 files: 33 simple path swaps where the file imported only session symbols, 5 splits where it also imported per-method auth functions (auth.verify.tsx, api.settings.email.ts, activities.\$id.tsx, routes.\$id.tsx, auth.accept-terms.tsx) — those keep one import from auth.server (for verifyMagicToken, canView, recordTermsAcceptance, etc.) and gain a second import from auth/session.server. Two more files used relative paths and were missed by the first grep pass (lib/oauth.server.ts and routes/oauth.authorize.tsx) — migrated too. The @deprecated re-exports block in auth.server.ts is gone. 2. Rename the new auth files to follow the project's `.server.ts` convention so Vite/React Router treat them as server-only (they read process.env.SESSION_SECRET, hit the DB, etc. — must NOT enter the client bundle): - auth/session.ts → auth/session.server.ts - auth/completion.ts → auth/completion.server.ts - auth/completion.test.ts → auth/completion.server.test.ts Done with `git mv` so blame is preserved. Verified: typecheck + lint green; 126 unit tests pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
53 lines
1.9 KiB
TypeScript
53 lines
1.9 KiB
TypeScript
import { data } from "react-router";
|
|
import { eq } from "drizzle-orm";
|
|
import type { Route } from "./+types/users.$username.following";
|
|
import { getDb } from "~/lib/db";
|
|
import { users } from "@trails-cool/db/schema/journal";
|
|
import { listFollowing, countFollowing, getFollowState } from "~/lib/follow.server";
|
|
import { getSessionUser } from "~/lib/auth/session.server";
|
|
import { CollectionPage } from "~/components/CollectionPage";
|
|
|
|
export async function loader({ params, request }: Route.LoaderArgs) {
|
|
const db = getDb();
|
|
const [user] = await db.select().from(users).where(eq(users.username, params.username));
|
|
if (!user) {
|
|
throw data({ error: "User not found" }, { status: 404 });
|
|
}
|
|
|
|
// Locked-account model — see users.$username.followers.tsx for the
|
|
// policy. Same canSee rule applies to the following list.
|
|
const currentUser = await getSessionUser(request);
|
|
const isOwn = currentUser?.id === user.id;
|
|
const followState = !isOwn && currentUser
|
|
? await getFollowState(currentUser.id, user.username)
|
|
: null;
|
|
const canSee =
|
|
isOwn ||
|
|
user.profileVisibility === "public" ||
|
|
(followState !== null && followState.following === true);
|
|
if (!canSee) {
|
|
throw data({ error: "User not found" }, { status: 404 });
|
|
}
|
|
|
|
const url = new URL(request.url);
|
|
const page = Math.max(1, parseInt(url.searchParams.get("page") ?? "1", 10) || 1);
|
|
const [entries, total] = await Promise.all([
|
|
listFollowing(user.id, page),
|
|
countFollowing(user.id),
|
|
]);
|
|
|
|
return data({
|
|
user: { username: user.username, displayName: user.displayName },
|
|
page,
|
|
total,
|
|
entries,
|
|
});
|
|
}
|
|
|
|
export function meta({ data: d }: Route.MetaArgs) {
|
|
return [{ title: `Following of @${d?.user.username ?? ""} — trails.cool` }];
|
|
}
|
|
|
|
export default function Following({ loaderData }: Route.ComponentProps) {
|
|
return <CollectionPage kind="following" {...loaderData} />;
|
|
}
|