@itsmrtr/bunkoshelf 1.15.0 → 1.16.1

package/dist/src/components/settings/CreateUserForm.tsx

@@ -5,6 +5,7 @@ import { UserRoundPlusIcon } from "lucide-react";
 import { useToast } from "@/components/ToastProvider";
 import { createUser } from "@/actions/users";
 import Button from "@/components/ui/Button";
+import Switch from "@/components/ui/Switch";
 import type { Dictionary } from "@/lib/types";
 import type { Role } from "@/lib/types/auth";
 
@@ -18,6 +19,8 @@ export default function CreateUserForm({ intl }: CreateUserFormProps) {
   const [name, setName] = useState("");
   const [lastname, setLastname] = useState("");
   const [birthYear, setBirthYear] = useState("");
+  const [birthMonth, setBirthMonth] = useState("");
+  const [birthDay, setBirthDay] = useState("");
   const [isAdmin, setIsAdmin] = useState(false);
   const [role, setRole] = useState<Role>("MEMBER");
   const [error, setError] = useState<string | null>(null);
@@ -33,6 +36,8 @@ export default function CreateUserForm({ intl }: CreateUserFormProps) {
       name,
       lastname,
       birthYear: birthYear ? parseInt(birthYear) : null,
+      birthMonth: birthMonth ? parseInt(birthMonth) : null,
+      birthDay: birthDay ? parseInt(birthDay) : null,
       isAdmin,
       role,
     };
@@ -50,6 +55,8 @@ export default function CreateUserForm({ intl }: CreateUserFormProps) {
       setName("");
       setLastname("");
       setBirthYear("");
+      setBirthMonth("");
+      setBirthDay("");
       setIsAdmin(false);
       setRole("MEMBER");
       setError(null);
@@ -75,72 +82,24 @@ export default function CreateUserForm({ intl }: CreateUserFormProps) {
       {error && <div className="text-red-500 mb-4 text-center">{error}</div>}
 
       <form onSubmit={handleSubmit} className="space-y-4">
-        <input
-          type="text"
-          value={username}
-          onChange={(e) => setUsername(e.target.value)}
-          placeholder={intl.settings.username as string}
-          className="bg-pearl border border-onix rounded-lg w-full px-5 py-3"
-          required
-        />
-        <input
-          type="password"
-          value={password}
-          onChange={(e) => setPassword(e.target.value)}
-          placeholder={intl.settings.password as string}
-          className="bg-pearl border border-onix rounded-lg w-full px-5 py-3"
-          required
-        />
-        <input
-          type="text"
-          value={name}
-          onChange={(e) => setName(e.target.value)}
-          placeholder={intl.settings.nameOpt as string}
-          className="bg-pearl border border-onix rounded-lg w-full px-5 py-3"
-        />
-        <input
-          type="text"
-          value={lastname}
-          onChange={(e) => setLastname(e.target.value)}
-          placeholder={intl.settings.lastnameOpt as string}
-          className="bg-pearl border border-onix rounded-lg w-full px-5 py-3"
-        />
-        <input
-          type="number"
-          value={birthYear}
-          onChange={(e) => setBirthYear(e.target.value)}
-          placeholder={intl.settings.birthYearOpt as string}
-          className="bg-pearl border border-onix rounded-lg w-full px-5 py-3"
-        />
-        <div className="flex items-center space-x-2">
-          <input
-            type="checkbox"
-            checked={isAdmin}
-            onChange={() => setIsAdmin(!isAdmin)}
-            id="isAdmin"
-          />
-          <label htmlFor="isAdmin">{intl.settings.isAdmin as string}</label>
+        <div className="grid gap-4 md:grid-cols-2">
+          <input type="text" value={username} onChange={(e) => setUsername(e.target.value)} placeholder={intl.settings.username as string} className="bg-pearl border border-onix rounded-lg w-full px-5 py-3" required />
+          <input type="password" value={password} onChange={(e) => setPassword(e.target.value)} placeholder={intl.settings.password as string} className="bg-pearl border border-onix rounded-lg w-full px-5 py-3" required />
         </div>
-        <div className="flex flex-col space-y-1">
-          <label htmlFor="role">{intl.settings.role as string}</label>
-          <select
-            id="role"
-            value={role}
-            onChange={(e) => setRole(e.target.value as Role)}
-            className="bg-pearl border border-onix rounded-lg px-5 py-3"
-          >
-            <option value="ADMIN">{intl.settings.roleAdmin as string}</option>
-            <option value="MEMBER">{intl.settings.roleMember as string}</option>
-            <option value="GUEST">{intl.settings.roleGuest as string}</option>
-          </select>
+        <div className="grid gap-4 md:grid-cols-2">
+          <input type="text" value={name} onChange={(e) => setName(e.target.value)} placeholder={intl.settings.nameOpt as string} className="bg-pearl border border-onix rounded-lg w-full px-5 py-3" />
+          <input type="text" value={lastname} onChange={(e) => setLastname(e.target.value)} placeholder={intl.settings.lastnameOpt as string} className="bg-pearl border border-onix rounded-lg w-full px-5 py-3" />
         </div>
-        <Button
-          type="submit"
-          variant="lightAlt"
-          className="px-8 py-4"
-        >
-          {intl.settings.createUser as string}
-        </Button>
+        <div className="grid gap-4 md:grid-cols-3">
+          <input type="number" min="1" max="31" value={birthDay} onChange={(e) => setBirthDay(e.target.value)} placeholder={intl.settings.birthDay as string} className="bg-pearl border border-onix rounded-lg w-full px-5 py-3" required />
+          <input type="number" min="1" max="12" value={birthMonth} onChange={(e) => setBirthMonth(e.target.value)} placeholder={intl.settings.birthMonth as string} className="bg-pearl border border-onix rounded-lg w-full px-5 py-3" required />
+          <input type="number" value={birthYear} onChange={(e) => setBirthYear(e.target.value)} placeholder={intl.settings.birthYearOpt as string} className="bg-pearl border border-onix rounded-lg w-full px-5 py-3" required />
+        </div>
+        <div className="grid items-center gap-4 md:grid-cols-2">
+          <select aria-label={intl.settings.role as string} value={role} onChange={(e) => setRole(e.target.value as Role)} className="bg-pearl border border-onix rounded-lg px-5 py-3"><option value="ADMIN">{intl.settings.roleAdmin as string}</option><option value="MEMBER">{intl.settings.roleMember as string}</option><option value="GUEST">{intl.settings.roleGuest as string}</option></select>
+          <div className="flex items-center justify-between gap-4 px-5 py-3"><span>{intl.settings.isAdmin as string}</span><Switch checked={isAdmin} onCheckedChange={setIsAdmin} /></div>
+        </div>
+        <Button type="submit" variant="lightAlt" className="px-8 py-4">{intl.settings.createUser as string}</Button>
       </form>
     </div>
   );

package/dist/src/components/settings/EditUserForm.tsx

@@ -6,6 +6,7 @@ import { useToast } from "@/components/ToastProvider";
 import { useAlertDialog } from "@/components/AlertDialogProvider";
 import { adminUpdateUser, deleteUser } from "@/actions/users";
 import Button from "@/components/ui/Button";
+import Switch from "@/components/ui/Switch";
 import type { Dictionary } from "@/lib/types";
 import type { Role } from "@/lib/types/auth";
 
@@ -17,6 +18,8 @@ interface UserData {
   name: string | null;
   lastname: string | null;
   birthYear: number | null;
+  birthMonth: number | null;
+  birthDay: number | null;
 }
 
 interface EditUserFormProps {
@@ -37,6 +40,8 @@ export default function EditUserForm({
   const [name, setName] = useState("");
   const [lastname, setLastname] = useState("");
   const [birthYear, setBirthYear] = useState("");
+  const [birthMonth, setBirthMonth] = useState("");
+  const [birthDay, setBirthDay] = useState("");
   const [isAdmin, setIsAdmin] = useState(false);
   const [role, setRole] = useState<Role>("MEMBER");
   const [error] = useState<string | null>(null);
@@ -53,6 +58,8 @@ export default function EditUserForm({
       setName(user.name || "");
       setLastname(user.lastname || "");
       setBirthYear(user.birthYear?.toString() || "");
+      setBirthMonth(user.birthMonth?.toString() || "");
+      setBirthDay(user.birthDay?.toString() || "");
       setIsAdmin(user.isAdmin || false);
       setRole((user.role as Role) || "MEMBER");
     }
@@ -68,6 +75,8 @@ export default function EditUserForm({
       name,
       lastname,
       birthYear: birthYear ? parseInt(birthYear) : null,
+      birthMonth: birthMonth ? parseInt(birthMonth) : null,
+      birthDay: birthDay ? parseInt(birthDay) : null,
       isAdmin,
       role,
     };
@@ -131,85 +140,22 @@ export default function EditUserForm({
 
       {error && <div className="text-red-500 mb-4 text-center">{error}</div>}
 
-      <form onSubmit={handleSubmit} className="space-x-4 space-y-4">
-        <input
-          type="text"
-          value={username}
-          onChange={(e) => setUsername(e.target.value)}
-          placeholder={intl.settings.username as string}
-          className="bg-pearl border border-onix rounded-lg w-full px-5 py-3"
-          required
-        />
-        <input
-          type="password"
-          value={password}
-          onChange={(e) => setPassword(e.target.value)}
-          placeholder={intl.settings.passwordNew as string}
-          className="bg-pearl border border-onix rounded-lg w-full px-5 py-3"
-        />
-        <input
-          type="text"
-          value={name}
-          onChange={(e) => setName(e.target.value)}
-          placeholder={intl.settings.nameOpt as string}
-          className="bg-pearl border border-onix rounded-lg w-full px-5 py-3"
-        />
-        <input
-          type="text"
-          value={lastname}
-          onChange={(e) => setLastname(e.target.value)}
-          placeholder={intl.settings.lastnameOpt as string}
-          className="bg-pearl border border-onix rounded-lg w-full px-5 py-3"
-        />
-        <input
-          type="number"
-          value={birthYear}
-          onChange={(e) => setBirthYear(e.target.value)}
-          placeholder={intl.settings.birthYearOpt as string}
-          className="bg-pearl border border-onix rounded-lg w-full px-5 py-3"
-        />
-        {!isSelf && (
-          <>
-            <div className="flex items-center space-x-2">
-              <input
-                type="checkbox"
-                checked={isAdmin}
-                onChange={() => setIsAdmin(!isAdmin)}
-                id="isAdmin"
-              />
-              <label htmlFor="isAdmin">{intl.settings.isAdmin as string}</label>
-            </div>
-            <div className="flex flex-col space-y-1">
-              <label htmlFor="role">{intl.settings.role as string}</label>
-              <select
-                id="role"
-                value={role}
-                onChange={(e) => setRole(e.target.value as Role)}
-                className="bg-pearl border border-onix rounded-lg px-5 py-3"
-              >
-                <option value="ADMIN">{intl.settings.roleAdmin as string}</option>
-                <option value="MEMBER">{intl.settings.roleMember as string}</option>
-                <option value="GUEST">{intl.settings.roleGuest as string}</option>
-              </select>
-            </div>
-          </>
-        )}
-        <Button
-          type="submit"
-          variant="lightAlt"
-          className="px-8 py-4"
-        >
-          {intl.settings.updateUser as string}
-        </Button>
-        {!isSelf && (
-          <button
-            type="button"
-            onClick={handleDelete}
-            className="font-bold px-8 py-4 rounded-lg leading-none uppercase text-sand bg-red-700 border border-red-700 hover:bg-red-800 transition-all duration-300 cursor-pointer"
-          >
-            {intl.settings.deleteUser as string}
-          </button>
-        )}
+      <form onSubmit={handleSubmit} className="space-y-4">
+        <div className="grid gap-4 md:grid-cols-2">
+          <input type="text" value={username} onChange={(e) => setUsername(e.target.value)} placeholder={intl.settings.username as string} className="bg-pearl border border-onix rounded-lg w-full px-5 py-3" required />
+          <input type="password" value={password} onChange={(e) => setPassword(e.target.value)} placeholder={intl.settings.passwordNew as string} className="bg-pearl border border-onix rounded-lg w-full px-5 py-3" />
+        </div>
+        <div className="grid gap-4 md:grid-cols-2">
+          <input type="text" value={name} onChange={(e) => setName(e.target.value)} placeholder={intl.settings.nameOpt as string} className="bg-pearl border border-onix rounded-lg w-full px-5 py-3" />
+          <input type="text" value={lastname} onChange={(e) => setLastname(e.target.value)} placeholder={intl.settings.lastnameOpt as string} className="bg-pearl border border-onix rounded-lg w-full px-5 py-3" />
+        </div>
+        <div className="grid gap-4 md:grid-cols-3">
+          <input type="number" min="1" max="31" value={birthDay} onChange={(e) => setBirthDay(e.target.value)} placeholder={intl.settings.birthDay as string} className="bg-pearl border border-onix rounded-lg w-full px-5 py-3" />
+          <input type="number" min="1" max="12" value={birthMonth} onChange={(e) => setBirthMonth(e.target.value)} placeholder={intl.settings.birthMonth as string} className="bg-pearl border border-onix rounded-lg w-full px-5 py-3" />
+          <input type="number" value={birthYear} onChange={(e) => setBirthYear(e.target.value)} placeholder={intl.settings.birthYearOpt as string} className="bg-pearl border border-onix rounded-lg w-full px-5 py-3" />
+        </div>
+        {!isSelf && <div className="grid items-center gap-4 md:grid-cols-2"><select aria-label={intl.settings.role as string} value={role} onChange={(e) => setRole(e.target.value as Role)} className="bg-pearl border border-onix rounded-lg px-5 py-3"><option value="ADMIN">{intl.settings.roleAdmin as string}</option><option value="MEMBER">{intl.settings.roleMember as string}</option><option value="GUEST">{intl.settings.roleGuest as string}</option></select><div className="flex items-center justify-between gap-4 px-5 py-3"><span>{intl.settings.isAdmin as string}</span><Switch checked={isAdmin} onCheckedChange={setIsAdmin} /></div></div>}
+        <div className="flex flex-wrap gap-4"><Button type="submit" variant="lightAlt" className="px-8 py-4">{intl.settings.updateUser as string}</Button>{!isSelf && <button type="button" onClick={handleDelete} className="font-bold px-8 py-4 rounded-lg leading-none uppercase text-sand bg-red-700 border border-red-700 hover:bg-red-800 transition-all duration-300 cursor-pointer">{intl.settings.deleteUser as string}</button>}</div>
       </form>
     </div>
   );

package/dist/src/components/settings/ParentalControlSettings.tsx

@@ -0,0 +1,27 @@
+"use client";
+
+import { useState } from "react";
+import { ShieldCheckIcon } from "lucide-react";
+import { useRouter } from "next/navigation";
+import { updateGlobalParentalControl } from "@/actions/parental-control";
+import Switch from "@/components/ui/Switch";
+import { useToast } from "@/components/ToastProvider";
+import type { Dictionary, Locale } from "@/lib/types";
+import type { ParentalControlMode } from "@/lib/parentalControl";
+
+export default function ParentalControlSettings({ enabled, mode: initialMode, lang, intl }: { enabled: boolean; mode: ParentalControlMode; lang: Locale; intl: Dictionary }) {
+  const router = useRouter();
+  const [value, setValue] = useState(enabled);
+  const [mode, setMode] = useState(initialMode);
+  const [loading, setLoading] = useState(false);
+  const { addToast } = useToast()!;
+  const labels = intl.settings as Record<string, string>;
+  async function update(next: boolean, nextMode = mode) {
+    setLoading(true);
+    const result = await updateGlobalParentalControl(next, nextMode, lang);
+    setLoading(false);
+    if (result.success) { setValue(next); setMode(nextMode); router.refresh(); }
+    else addToast({ title: intl.alerts.errorTt as string, description: labels.parentalControlUpdateError, variant: "error" });
+  }
+  return <section className="rounded-lg bg-blackamber p-4"><div className="flex items-start justify-between gap-4"><div><h3 className="flex items-center gap-2 text-base"><ShieldCheckIcon size={20} />{labels.parentalControl}</h3><p className="mt-1 text-neutral-300">{labels.parentalControlGlobalHelp}</p></div><Switch checked={value} disabled={loading} onCheckedChange={(next) => void update(next)} /></div>{value && <fieldset className="mt-4 space-y-3" disabled={loading}><legend className="mb-2 font-bold">{labels.parentalControlGlobalLevel}</legend><label className="grid grid-cols-[auto_1fr] items-start gap-x-3"><input className="mt-1.5" type="radio" checked={mode === "flexible"} onChange={() => void update(true, "flexible")} /><span className="font-bold leading-tight">{labels.parentalControlFlexible}</span><span className="col-start-2 text-sm leading-snug text-neutral-300">{labels.parentalControlGlobalFlexibleHelp}</span></label><label className="grid grid-cols-[auto_1fr] items-start gap-x-3"><input className="mt-1.5" type="radio" checked={mode === "strict"} onChange={() => void update(true, "strict")} /><span className="font-bold leading-tight">{labels.parentalControlStrict}</span><span className="col-start-2 text-sm leading-snug text-neutral-300">{labels.parentalControlGlobalStrictHelp}</span></label></fieldset>}<p className="mt-4 font-bold">{value ? labels.parentalControlGlobalOn : labels.parentalControlGlobalOff}</p></section>;
+}

package/dist/src/components/settings/UsersTable.tsx

@@ -14,6 +14,8 @@ interface UserRow {
   name: string | null;
   lastname: string | null;
   birthYear: number | null;
+  birthMonth: number | null;
+  birthDay: number | null;
 }
 
 interface UsersTableProps {

package/dist/src/components/ui/Switch.tsx

@@ -0,0 +1,28 @@
+"use client";
+
+import clsx from "clsx";
+import type { ButtonHTMLAttributes } from "react";
+
+interface SwitchProps extends Omit<ButtonHTMLAttributes<HTMLButtonElement>, "onChange" | "type"> {
+  checked: boolean;
+  onCheckedChange: (checked: boolean) => void;
+}
+
+export default function Switch({ checked, onCheckedChange, className, ...props }: SwitchProps) {
+  return (
+    <button
+      type="button"
+      role="switch"
+      aria-checked={checked}
+      onClick={() => onCheckedChange(!checked)}
+      className={clsx(
+        "relative h-7 w-12 shrink-0 rounded-full transition-colors focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-lilah",
+        checked ? "bg-lilah" : "bg-neutral-700",
+        className
+      )}
+      {...props}
+    >
+      <span className={clsx("absolute left-1 top-1 h-5 w-5 rounded-full bg-pearl transition-transform", checked ? "translate-x-5" : "translate-x-0")} />
+    </button>
+  );
+}

package/dist/src/lib/client/offlineLibrary.ts

@@ -1,6 +1,7 @@
 "use client";
 
 import type { LibrarySection } from "@/lib/librarySection";
+import { ageRatingMap } from "@/lib/mangaMetadata";
 
 const DB_NAME = "bunko-pwa";
 const DB_VERSION = 1;
@@ -33,6 +34,12 @@ export interface OfflineVolume {
   totalPages: number;
 }
 
+export interface OfflineContentVisibilityPolicy {
+  enabled: boolean;
+  maxAge: number | null;
+  allowUnrated: boolean;
+}
+
 export interface OfflineDownload {
   key: string;
   userId: string;
@@ -173,6 +180,26 @@ export async function getReadyVolumes(userId: string, section?: LibrarySection)
   return ready.sort((a, b) => a.title.localeCompare(b.title));
 }
 
+export async function purgeRestrictedVolumes(userId: string, policy: OfflineContentVisibilityPolicy) {
+  if (!policy.enabled) return;
+  const db = await openOfflineLibrary();
+  const tx = db.transaction([VOLUMES, PAGES, DOWNLOADS], "readwrite");
+  const volumes = await request<Array<OfflineVolume & { key: string }>>(tx.objectStore(VOLUMES).index("userId").getAll(userId));
+  for (const volume of volumes) {
+    const ageRating = typeof volume.metadata.ageRating === "string" ? volume.metadata.ageRating : null;
+    const minimum = ageRatingMap(ageRating);
+    const allowed = minimum === null ? policy.allowUnrated : minimum <= (policy.maxAge ?? 18);
+    if (allowed) continue;
+    const pageKeys = await request<IDBValidKey[]>(tx.objectStore(PAGES).index("volume").getAllKeys([userId, volume.id]));
+    for (const key of pageKeys) tx.objectStore(PAGES).delete(key);
+    tx.objectStore(VOLUMES).delete(volume.key);
+    tx.objectStore(DOWNLOADS).delete(downloadKey(userId, volume.id));
+  }
+  await transactionDone(tx);
+  db.close();
+  emitChange();
+}
+
 export async function getDownload(userId: string, volumeId: string) {
   const db = await openOfflineLibrary();
   const tx = db.transaction(DOWNLOADS, "readonly");

package/dist/src/lib/db/appSettings.ts

@@ -0,0 +1,25 @@
+import { queryOne, execute } from "./query";
+import type { ParentalControlMode } from "@/lib/parentalControl";
+
+export interface AppSettings {
+  parentalControlEnabled: boolean;
+  parentalControlMode: ParentalControlMode;
+}
+
+export async function getAppSettings(): Promise<AppSettings> {
+  const row = await queryOne<{ parental_control_enabled: boolean; parental_control_mode: ParentalControlMode }>(
+    "SELECT parental_control_enabled, parental_control_mode FROM app_settings WHERE id = 'global' LIMIT 1"
+  );
+
+  return {
+    parentalControlEnabled: row?.parental_control_enabled ?? false,
+    parentalControlMode: row?.parental_control_mode ?? "flexible",
+  };
+}
+
+export async function updateParentalControlEnabled(enabled: boolean, mode: ParentalControlMode): Promise<void> {
+  await execute(
+    "UPDATE app_settings SET parental_control_enabled = $1, parental_control_mode = $2, updated_at = NOW() WHERE id = 'global'",
+    [enabled, mode]
+  );
+}

package/dist/src/lib/db/books/library.ts

@@ -2,6 +2,8 @@ import { createId } from "@paralleldrive/cuid2";
 import { buildNaturalSortKey } from "@/lib/naturalSort";
 import type { EpubMetadata } from "@/lib/books/types";
 import { execute, query, queryOne } from "../query";
+import { getCurrentContentVisibilityPolicy } from "@/lib/parentalControlServer";
+import { canViewAgeRating } from "@/lib/parentalControl";
 
 export type BookLibrarySection = "books" | "other";
 
@@ -41,6 +43,7 @@ export interface BookSearchEntry {
   librarySection: BookLibrarySection;
   writer: string;
   subjects: string;
+  ageRating: string | null;
 }
 
 export interface BookSubjectFilter {
@@ -176,6 +179,11 @@ async function hydrateMetadata(volume: BookVolume): Promise<BookVolume> {
   return volume;
 }
 
+async function filterVisibleBooks(books: BookVolume[]): Promise<BookVolume[]> {
+  const policy = await getCurrentContentVisibilityPolicy();
+  return books.filter((book) => canViewAgeRating(book.metadata.ageRating, "book", policy));
+}
+
 export async function upsertBook(input: {
   seriesTitle: string;
   seriesPath: string;
@@ -246,22 +254,28 @@ export async function upsertBook(input: {
   ]);
   await execute(`DELETE FROM book_series
     WHERE id <> $1 AND NOT EXISTS (SELECT 1 FROM book_volumes WHERE book_volumes.series_id = book_series.id)`, [series.id]);
-  const result = await findBookVolumeBySlug(input.volumeSlug);
+  const result = await findBookVolumeBySlugRaw(input.volumeSlug);
   if (!result) throw new Error("Failed to read indexed book");
   return result;
 }
 
 export async function findBookVolumeBySlug(slug: string): Promise<BookVolume | null> {
+  const volume = await findBookVolumeBySlugRaw(slug);
+  return (await filterVisibleBooks(volume ? [volume] : []))[0] ?? null;
+}
+
+async function findBookVolumeBySlugRaw(slug: string): Promise<BookVolume | null> {
   const row = await queryOne<BookRow>(`${BOOK_SELECT} WHERE bv.slug = $1 LIMIT 1`, [slug]);
   return row ? hydrateMetadata(mapBook(row)) : null;
 }
 
 export async function findBookFileBySlug(slug: string): Promise<{ filename: string; fullPath: string } | null> {
-  const row = await queryOne<{ filename: string; full_path: string }>(
-    "SELECT filename, full_path FROM book_volumes WHERE slug = $1 LIMIT 1",
+  const row = await queryOne<{ filename: string; full_path: string; age_rating: string | null }>(
+    "SELECT bv.filename, bv.full_path, bm.age_rating FROM book_volumes bv INNER JOIN book_metadata bm ON bm.volume_id = bv.id WHERE bv.slug = $1 LIMIT 1",
     [slug],
   );
-  return row ? { filename: row.filename, fullPath: row.full_path } : null;
+  const policy = await getCurrentContentVisibilityPolicy();
+  return row && canViewAgeRating(row.age_rating, "book", policy) ? { filename: row.filename, fullPath: row.full_path } : null;
 }
 
 export async function listBookVolumes(options?: {
@@ -359,7 +373,7 @@ export async function listBookVolumes(options?: {
   const limit = options?.limit ?? 100;
   params.push(limit);
   const rows = await query<BookRow>(`${BOOK_SELECT}${where} ORDER BY bs.sort_title, bv.number NULLS LAST, bv.sort_title LIMIT $${params.length}`, params);
-  return Promise.all(rows.map((row) => hydrateMetadata(mapBook(row))));
+  return filterVisibleBooks(await Promise.all(rows.map((row) => hydrateMetadata(mapBook(row)))));
 }
 
 export async function listBookLibraryFilters(): Promise<{
@@ -493,7 +507,7 @@ export async function classifyBookSubjects(subjectNames: string[]): Promise<Book
 
 export async function listRecentlyAddedBooks(limit = 8, librarySection: BookLibrarySection = "books"): Promise<BookVolume[]> {
   const rows = await query<BookRow>(`${BOOK_SELECT} WHERE bs.library_section = $1 ORDER BY bv.created_at DESC LIMIT $2`, [librarySection, limit]);
-  return Promise.all(rows.map((row) => hydrateMetadata(mapBook(row))));
+  return filterVisibleBooks(await Promise.all(rows.map((row) => hydrateMetadata(mapBook(row)))));
 }
 
 export async function listFavoriteBookSeries(userId: string, options: { page: number; pageSize: number }) {
@@ -534,7 +548,7 @@ export async function listFavoriteBookVolumes(userId: string, options: { page: n
     WHERE ub.user_id = $1 AND ub.is_favorite = TRUE AND bs.library_section = 'books'
     ORDER BY bs.sort_title, bv.number NULLS LAST, bv.sort_title
     LIMIT $2 OFFSET $3`, [userId, options.pageSize, offset]);
-  const items = await Promise.all(rows.map((row) => hydrateMetadata(mapBook(row))));
+  const items = await filterVisibleBooks(await Promise.all(rows.map((row) => hydrateMetadata(mapBook(row)))));
 
   return { items, total, totalPages: Math.max(1, Math.ceil(total / options.pageSize)) };
 }
@@ -545,11 +559,12 @@ export async function listBooksInProgress(userId: string, limit = 12, librarySec
     INNER JOIN user_to_books ub ON ub.volume_id = bv.id
     WHERE ub.user_id = $1 AND ub.cfi IS NOT NULL AND ub.is_read = FALSE AND bs.library_section = $2
     ORDER BY ub.last_read_at DESC NULLS LAST LIMIT $3`, [userId, librarySection, limit]);
-  const books = await Promise.all(rows.map((row) => hydrateMetadata(mapBook(row))));
-  return books.map((book, index) => ({
+  const books = await filterVisibleBooks(await Promise.all(rows.map((row) => hydrateMetadata(mapBook(row)))));
+  const progressById = new Map(rows.map((row) => [row.volume_id, row]));
+  return books.map((book) => ({
     ...book,
-    progression: Number(rows[index].progression ?? 0),
-    lastReadAt: rows[index].last_read_at,
+    progression: Number(progressById.get(book.id)?.progression ?? 0),
+    lastReadAt: progressById.get(book.id)?.last_read_at ?? null,
   }));
 }
 
@@ -591,7 +606,7 @@ export async function listRecentlyReadBooks(userId: string, limit = 12): Promise
     INNER JOIN user_to_books ub ON ub.volume_id = bv.id
     WHERE ub.user_id = $1 AND ub.is_read = TRUE AND ub.last_read_at IS NOT NULL AND bs.library_section = 'books'
     ORDER BY ub.last_read_at DESC LIMIT $2`, [userId, limit]);
-  return Promise.all(rows.map((row) => hydrateMetadata(mapBook(row))));
+  return filterVisibleBooks(await Promise.all(rows.map((row) => hydrateMetadata(mapBook(row)))));
 }
 
 export async function listBookSeries(): Promise<Array<BookSeries & { volumeCount: number }>> {
@@ -605,8 +620,8 @@ export async function listBookSeries(): Promise<Array<BookSeries & { volumeCount
 }
 
 export async function listBookSearchEntries(): Promise<BookSearchEntry[]> {
-  return query<BookSearchEntry>(`
-    SELECT bv.id, bv.slug, bm.title,
+  const entries = await query<BookSearchEntry>(`
+    SELECT bv.id, bv.slug, bm.title, bm.age_rating AS "ageRating",
       bs.id AS "seriesId", bs.slug AS "seriesSlug", bs.title AS "seriesTitle",
       bs.is_oneshot AS "seriesIsOneshot", bs.library_section AS "librarySection",
       COALESCE(
@@ -626,9 +641,11 @@ export async function listBookSearchEntries(): Promise<BookSearchEntry[]> {
     INNER JOIN book_metadata bm ON bm.volume_id = bv.id
     LEFT JOIN book_people bp ON bp.metadata_id = bm.id
     LEFT JOIN book_subjects bsub ON bsub.metadata_id = bm.id
-    GROUP BY bv.id, bv.slug, bv.number, bv.sort_title, bm.title, bs.id, bs.slug, bs.title, bs.is_oneshot, bs.library_section, bs.sort_title
+    GROUP BY bv.id, bv.slug, bv.number, bv.sort_title, bm.title, bm.age_rating, bs.id, bs.slug, bs.title, bs.is_oneshot, bs.library_section, bs.sort_title
     ORDER BY bs.sort_title, bv.number NULLS LAST, bv.sort_title
   `);
+  const policy = await getCurrentContentVisibilityPolicy();
+  return entries.filter((entry) => canViewAgeRating(entry.ageRating, "book", policy));
 }
 
 export async function findBookSeriesBySlug(slug: string): Promise<BookSeries | null> {