diff --git a/app/(pages)/titles/[id]/_components/use-title-actions.ts b/app/(pages)/titles/[id]/_components/use-title-actions.ts
index e6a3d06..56f5b07 100644
--- a/app/(pages)/titles/[id]/_components/use-title-actions.ts
+++ b/app/(pages)/titles/[id]/_components/use-title-actions.ts
@@ -151,7 +151,7 @@ export function useTitleActions() {
await watchEpisode(episodeId);
const seasons = store.get(seasonsAtom);
- const episodeWatches = store.get(episodeWatchesAtom);
+ const watchedSet = new Set(store.get(episodeWatchesAtom));
const previousUnwatched: string[] = [];
for (const s of seasons) {
for (const ep of s.episodes) {
@@ -159,7 +159,7 @@ export function useTitleActions() {
s.seasonNumber < seasonNum ||
(s.seasonNumber === seasonNum && ep.episodeNumber < epNum)
) {
- if (!episodeWatches.includes(ep.id) && ep.id !== episodeId) {
+ if (!watchedSet.has(ep.id) && ep.id !== episodeId) {
previousUnwatched.push(ep.id);
}
}
@@ -198,13 +198,11 @@ export function useTitleActions() {
async (season: Season) => {
const prevWatches = store.get(episodeWatchesAtom);
const prevStatus = store.get(userStatusAtom);
- const episodeWatches = store.get(episodeWatchesAtom);
- const unwatched = season.episodes.filter(
- (ep) => !episodeWatches.includes(ep.id),
- );
+ const watchedSet = new Set(prevWatches);
+ const unwatched = season.episodes.filter((ep) => !watchedSet.has(ep.id));
if (unwatched.length === 0) return;
- const newWatchSet = new Set(episodeWatches);
+ const newWatchSet = new Set(watchedSet);
for (const ep of unwatched) newWatchSet.add(ep.id);
store.set(episodeWatchesAtom, [...newWatchSet]);
diff --git a/app/api/admin/jobs/trigger/route.ts b/app/api/admin/jobs/trigger/route.ts
index 267b630..3948ad8 100644
--- a/app/api/admin/jobs/trigger/route.ts
+++ b/app/api/admin/jobs/trigger/route.ts
@@ -1,10 +1,9 @@
-import { headers } from "next/headers";
import { NextResponse } from "next/server";
-import { auth } from "@/lib/auth/server";
+import { getSession } from "@/lib/auth/session";
import { triggerJob } from "@/lib/cron";
export async function POST(request: Request) {
- const session = await auth.api.getSession({ headers: await headers() });
+ const session = await getSession();
if (!session) {
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
}
diff --git a/app/api/admin/system-health/route.ts b/app/api/admin/system-health/route.ts
index 71970bd..44b2fa0 100644
--- a/app/api/admin/system-health/route.ts
+++ b/app/api/admin/system-health/route.ts
@@ -1,10 +1,9 @@
-import { headers } from "next/headers";
import { NextResponse } from "next/server";
-import { auth } from "@/lib/auth/server";
+import { getSession } from "@/lib/auth/session";
import { getSystemHealth } from "@/lib/services/system-health";
export async function GET() {
- const session = await auth.api.getSession({ headers: await headers() });
+ const session = await getSession();
if (!session) {
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
}
diff --git a/app/api/admin/update-check/route.ts b/app/api/admin/update-check/route.ts
index 550b8b9..1bb6255 100644
--- a/app/api/admin/update-check/route.ts
+++ b/app/api/admin/update-check/route.ts
@@ -1,10 +1,9 @@
-import { headers } from "next/headers";
import { NextResponse } from "next/server";
-import { auth } from "@/lib/auth/server";
+import { getSession } from "@/lib/auth/session";
import { getCachedUpdateCheck } from "@/lib/services/update-check";
export async function GET() {
- const session = await auth.api.getSession({ headers: await headers() });
+ const session = await getSession();
if (!session) {
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
}
diff --git a/app/api/backup/[filename]/route.ts b/app/api/backup/[filename]/route.ts
index 41e679e..825663f 100644
--- a/app/api/backup/[filename]/route.ts
+++ b/app/api/backup/[filename]/route.ts
@@ -1,14 +1,13 @@
import path from "node:path";
-import { headers } from "next/headers";
import { type NextRequest, NextResponse } from "next/server";
-import { auth } from "@/lib/auth/server";
+import { getSession } from "@/lib/auth/session";
import { getBackupPath } from "@/lib/services/backup";
export async function GET(
_req: NextRequest,
{ params }: { params: Promise<{ filename: string }> },
) {
- const session = await auth.api.getSession({ headers: await headers() });
+ const session = await getSession();
if (!session) {
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
}
diff --git a/app/api/backup/restore/route.ts b/app/api/backup/restore/route.ts
index 2acb6bb..b1e1331 100644
--- a/app/api/backup/restore/route.ts
+++ b/app/api/backup/restore/route.ts
@@ -1,12 +1,11 @@
-import { headers } from "next/headers";
import { NextResponse } from "next/server";
-import { auth } from "@/lib/auth/server";
+import { getSession } from "@/lib/auth/session";
import { restoreFromBackup } from "@/lib/services/backup";
const MAX_SIZE = 500 * 1024 * 1024; // 500MB
export async function POST(req: Request) {
- const session = await auth.api.getSession({ headers: await headers() });
+ const session = await getSession();
if (!session) {
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
}
diff --git a/app/api/explore/discover/route.ts b/app/api/explore/discover/route.ts
index 47ee295..733eed8 100644
--- a/app/api/explore/discover/route.ts
+++ b/app/api/explore/discover/route.ts
@@ -1,7 +1,6 @@
-import { headers } from "next/headers";
import { type NextRequest, NextResponse } from "next/server";
import { z } from "zod";
-import { auth } from "@/lib/auth/server";
+import { getSession } from "@/lib/auth/session";
import { isTmdbConfigured } from "@/lib/config";
import { discover } from "@/lib/tmdb/client";
import { tmdbImageUrl } from "@/lib/tmdb/image";
@@ -20,9 +19,7 @@ const querySchema = z.object({
});
export async function GET(req: NextRequest) {
- const session = await auth.api.getSession({
- headers: await headers(),
- });
+ const session = await getSession();
if (!session) {
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
}
diff --git a/app/api/person/[id]/filmography/route.ts b/app/api/person/[id]/filmography/route.ts
index e1d3454..51ee3a0 100644
--- a/app/api/person/[id]/filmography/route.ts
+++ b/app/api/person/[id]/filmography/route.ts
@@ -1,13 +1,12 @@
-import { headers } from "next/headers";
import { type NextRequest, NextResponse } from "next/server";
-import { auth } from "@/lib/auth/server";
+import { getSession } from "@/lib/auth/session";
import { fetchFullFilmography } from "@/lib/services/person";
export async function GET(
_req: NextRequest,
{ params }: { params: Promise<{ id: string }> },
) {
- const session = await auth.api.getSession({ headers: await headers() });
+ const session = await getSession();
if (!session) {
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
}
diff --git a/app/api/person/[id]/route.ts b/app/api/person/[id]/route.ts
index 03b4a41..9568aae 100644
--- a/app/api/person/[id]/route.ts
+++ b/app/api/person/[id]/route.ts
@@ -1,6 +1,5 @@
-import { headers } from "next/headers";
import { type NextRequest, NextResponse } from "next/server";
-import { auth } from "@/lib/auth/server";
+import { getSession } from "@/lib/auth/session";
import {
getLocalFilmography,
getOrFetchPerson,
@@ -13,7 +12,7 @@ export async function GET(
_req: NextRequest,
{ params }: { params: Promise<{ id: string }> },
) {
- const session = await auth.api.getSession({ headers: await headers() });
+ const session = await getSession();
if (!session) {
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
}
diff --git a/app/api/search/route.ts b/app/api/search/route.ts
index f429e35..3d73951 100644
--- a/app/api/search/route.ts
+++ b/app/api/search/route.ts
@@ -1,6 +1,5 @@
-import { headers } from "next/headers";
import { type NextRequest, NextResponse } from "next/server";
-import { auth } from "@/lib/auth/server";
+import { getSession } from "@/lib/auth/session";
import { isTmdbConfigured } from "@/lib/config";
import {
searchMovies,
@@ -12,9 +11,7 @@ import { tmdbImageUrl } from "@/lib/tmdb/image";
import type { TmdbSearchResponse } from "@/lib/tmdb/types";
export async function GET(req: NextRequest) {
- const session = await auth.api.getSession({
- headers: await headers(),
- });
+ const session = await getSession();
if (!session) {
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
}
diff --git a/app/api/setup/status/route.ts b/app/api/setup/status/route.ts
deleted file mode 100644
index 44f1d29..0000000
--- a/app/api/setup/status/route.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { NextResponse } from "next/server";
-import { isTmdbConfigured } from "@/lib/config";
-
-export async function GET() {
- return NextResponse.json({
- tmdbConfigured: isTmdbConfigured(),
- });
-}
diff --git a/app/api/stats/route.ts b/app/api/stats/route.ts
index 7a1791d..4293dc8 100644
--- a/app/api/stats/route.ts
+++ b/app/api/stats/route.ts
@@ -1,6 +1,5 @@
-import { headers } from "next/headers";
import { NextResponse } from "next/server";
-import { auth } from "@/lib/auth/server";
+import { getSession } from "@/lib/auth/session";
import {
getWatchCount,
getWatchHistory,
@@ -16,7 +15,7 @@ const validPeriods: TimePeriod[] = [
];
export async function GET(request: Request) {
- const session = await auth.api.getSession({ headers: await headers() });
+ const session = await getSession();
if (!session)
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
diff --git a/app/api/titles/import/route.ts b/app/api/titles/import/route.ts
index 0ab5ea8..b134b2b 100644
--- a/app/api/titles/import/route.ts
+++ b/app/api/titles/import/route.ts
@@ -1,8 +1,7 @@
-import { headers } from "next/headers";
import type { NextRequest } from "next/server";
import { NextResponse } from "next/server";
import { z } from "zod";
-import { auth } from "@/lib/auth/server";
+import { getSession } from "@/lib/auth/session";
import { importTitle } from "@/lib/services/metadata";
const bodySchema = z.object({
@@ -11,9 +10,7 @@ const bodySchema = z.object({
});
export async function POST(req: NextRequest) {
- const session = await auth.api.getSession({
- headers: await headers(),
- });
+ const session = await getSession();
if (!session) {
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
}
diff --git a/app/api/titles/resolve/route.ts b/app/api/titles/resolve/route.ts
index 5d51e9a..bbe5b08 100644
--- a/app/api/titles/resolve/route.ts
+++ b/app/api/titles/resolve/route.ts
@@ -1,8 +1,7 @@
-import { headers } from "next/headers";
import type { NextRequest } from "next/server";
import { NextResponse } from "next/server";
import { z } from "zod";
-import { auth } from "@/lib/auth/server";
+import { getSession } from "@/lib/auth/session";
import { importTitle } from "@/lib/services/metadata";
const bodySchema = z.object({
@@ -11,9 +10,7 @@ const bodySchema = z.object({
});
export async function POST(req: NextRequest) {
- const session = await auth.api.getSession({
- headers: await headers(),
- });
+ const session = await getSession();
if (!session) {
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
}
diff --git a/app/page.tsx b/app/page.tsx
index ad3e010..e1bb301 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -1,5 +1,8 @@
+import { redirect } from "next/navigation";
import { connection } from "next/server";
import { LandingPage } from "@/components/landing-page";
+import { getSession } from "@/lib/auth/session";
+import { isTmdbConfigured } from "@/lib/config";
import { getUserCount, isRegistrationOpen } from "@/lib/services/settings";
import { tmdbImageUrl } from "@/lib/tmdb/image";
@@ -25,6 +28,11 @@ const posterUrls = posterPaths
export default async function Home() {
await connection();
+
+ const session = await getSession();
+ if (session?.user) redirect("/dashboard");
+ if (!isTmdbConfigured()) redirect("/setup");
+
const userCount = getUserCount();
return (
{
- try {
- const res = await fetch("/api/setup/status");
- if (!res.ok) return true; // assume configured on error
- const data = await res.json();
- return !!data.tmdbConfigured;
- } catch {
- return true;
- }
-}
// Poster positions arranged in angled columns behind the hero
const posterLayout = [
@@ -49,23 +34,6 @@ export function LandingPage({
freshInstall: boolean;
registrationOpen: boolean;
}) {
- const { data: session, isPending } = useSession();
- const router = useRouter();
-
- useEffect(() => {
- if (isPending) return;
- if (session?.user) {
- router.replace("/dashboard");
- return;
- }
- // If not logged in, check whether TMDB is configured
- fetchSetupStatus().then((configured) => {
- if (!configured) router.replace("/setup");
- });
- }, [session, isPending, router]);
-
- if (isPending) return null;
-
return (
{/* Background grain texture */}
diff --git a/components/mobile-tab-bar.tsx b/components/mobile-tab-bar.tsx
index 4dffeac..ea1dabd 100644
--- a/components/mobile-tab-bar.tsx
+++ b/components/mobile-tab-bar.tsx
@@ -4,7 +4,6 @@ import { IconCompass, IconHome, IconSettings } from "@tabler/icons-react";
import { motion } from "motion/react";
import Link from "next/link";
import { usePathname } from "next/navigation";
-import { useSession } from "@/lib/auth/client";
const tabs = [
{ href: "/dashboard", label: "Home", icon: IconHome },
@@ -13,11 +12,8 @@ const tabs = [
] as const;
export function MobileTabBar() {
- const { data: session } = useSession();
const pathname = usePathname();
- if (!session?.user) return null;
-
return (