@itsmrtr/bunkoshelf 1.18.4 → 1.19.0

package/dist/src/components/clubs/ClubReader.tsx

@@ -3,10 +3,49 @@
 import { useRouter } from "next/navigation";
 import MangaReader from "@/components/reader/MangaReader";
 import EpubReader from "@/components/reader/EpubReader";
+import { syncReadingProgress } from "@/actions/progress";
+import { useResourceMutation } from "@/lib/client/resourceState";
 import type { Dictionary } from "@/lib/types";
 
-export default function ClubReader({ kind, volume, intl }: { kind: "manga" | "books"; volume: { id: string; slug: string; title: string; mangaStyle?: string | null; layout?: "reflowable" | "pre-paginated" }; intl: Dictionary }) {
+function getLocalDateString() {
+  const now = new Date();
+  return `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}-${String(now.getDate()).padStart(2, "0")}`;
+}
+
+export default function ClubReader({ kind, volume, returnHref, intl }: { kind: "manga" | "books"; volume: { id: string; slug: string; title: string; mangaStyle?: string | null; layout?: "reflowable" | "pre-paginated" }; returnHref: string; intl: Dictionary }) {
   const router = useRouter();
-  if (kind === "books") return <EpubReader isOpen onClose={() => router.back()} progressResourceId={volume.id} slug={volume.slug} title={volume.title} layout={volume.layout ?? "reflowable"} intl={intl} />;
-  return <MangaReader isOpen onClose={() => router.back()} slug={volume.slug} intl={intl} isYoureiMode={false} readingDirection={volume.mangaStyle === "YesLTR" || volume.mangaStyle === "No" ? "ltr" : "rtl"} volumeId={volume.id} communityRating={null} initialPersonalRating={null} mangaTitle={volume.title} />;
+  const mutateResource = useResourceMutation();
+  const closeReader = () => router.push(returnHref);
+  const closeMangaReader = async () => {
+    try {
+      const saved = localStorage.getItem(`reader-progress:${volume.slug}`);
+      if (saved) {
+        const { lastPage, totalPages, lastReadAt } = JSON.parse(saved);
+        const isFinished = lastPage >= totalPages - 1;
+        const result = await mutateResource({
+          resource: "manga-volume",
+          id: volume.id,
+          patch: isFinished ? { isRead: true } : {},
+          mutate: () => syncReadingProgress({
+            volumeSlug: volume.slug,
+            lastPage,
+            totalPages,
+            lastReadAt,
+            date: getLocalDateString(),
+          }),
+          isSuccess: (value) => Boolean(value && "success" in value && value.success),
+          refresh: false,
+        });
+        if (result && "success" in result && result.success && isFinished) {
+          window.dispatchEvent(new Event("bunko:challenge-updated"));
+        }
+      }
+    } catch (error) {
+      console.error("Error syncing club reading progress:", error);
+    } finally {
+      closeReader();
+    }
+  };
+  if (kind === "books") return <EpubReader isOpen onClose={closeReader} progressResourceId={volume.id} slug={volume.slug} title={volume.title} layout={volume.layout ?? "reflowable"} intl={intl} />;
+  return <MangaReader isOpen onClose={closeMangaReader} slug={volume.slug} intl={intl} isYoureiMode={false} readingDirection={volume.mangaStyle === "YesLTR" || volume.mangaStyle === "No" ? "ltr" : "rtl"} volumeId={volume.id} communityRating={null} initialPersonalRating={null} mangaTitle={volume.title} />;
 }

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

@@ -96,7 +96,7 @@ export default function CreateUserForm({ intl }: CreateUserFormProps) {
           <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>
+          <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></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>

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

@@ -154,7 +154,7 @@ export default function EditUserForm({
           <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>}
+        {!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></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/UsersTable.tsx

@@ -90,14 +90,16 @@ export default function UsersTable({
                     <div className="p-4 text-center">{age}</div>
                   </div>
                   <div className="w-24 shrink-0 sticky right-0 bg-blackamber p-4 flex items-center justify-center">
-                    <button
-                      type="button"
-                      onClick={() => handleEdit(user)}
-                      title={intl.settings.edit as string}
-                      className="border border-neutral-800 hover:text-pearl rounded-lg p-2 cursor-pointer transition-all duration-300 hover:border-lilah"
-                    >
-                      <UserRoundPenIcon size={16} />
-                    </button>
+                    {user.role !== "GUEST" && (
+                      <button
+                        type="button"
+                        onClick={() => handleEdit(user)}
+                        title={intl.settings.edit as string}
+                        className="border border-neutral-800 hover:text-pearl rounded-lg p-2 cursor-pointer transition-all duration-300 hover:border-lilah"
+                      >
+                        <UserRoundPenIcon size={16} />
+                      </button>
+                    )}
                   </div>
                 </div>
               );

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

@@ -11,7 +11,8 @@ export type ResourceKind =
   | "manga-volume"
   | "manga-series"
   | "book-volume"
-  | "book-series";
+  | "book-series"
+  | "club";
 
 export interface ResourceState {
   isFavorite?: boolean;

package/dist/src/lib/clubs/access.ts

@@ -1,6 +1,104 @@
-import { queryOne } from "@/lib/db/query";
+import { getAppSettings } from "@/lib/db/appSettings";
+import { query, queryOne } from "@/lib/db/query";
+import { canViewAgeRating, getContentVisibilityPolicy } from "@/lib/parentalControl";
 import type { Session } from "@/lib/types";
 
+type ClubSourceType = "LIBRARY_SERIES" | "BOOK_SERIES";
+
+interface PolicyUserRow {
+  id: string;
+  username: string;
+  is_admin: boolean;
+  role: Session["role"];
+  name: string | null;
+  lastname: string | null;
+  birth_year: number | null;
+  birth_month: number | null;
+  birth_day: number | null;
+  parental_control_enabled: boolean;
+  parental_control_mode: "flexible" | "strict";
+  profile_image: string | null;
+}
+
+function mapPolicyUser(user: PolicyUserRow): Session {
+  return {
+    id: user.id,
+    username: user.username,
+    isAdmin: user.is_admin,
+    role: user.role,
+    name: user.name,
+    lastname: user.lastname,
+    birthYear: user.birth_year,
+    birthMonth: user.birth_month,
+    birthDay: user.birth_day,
+    parentalControlEnabled: user.parental_control_enabled,
+    parentalControlMode: user.parental_control_mode,
+    profileImage: user.profile_image,
+  };
+}
+
+async function getPolicyUser(userId: string): Promise<Session | null> {
+  const user = await queryOne<PolicyUserRow>(`SELECT id,username,is_admin,role,name,lastname,
+    birth_year,birth_month,birth_day,parental_control_enabled,parental_control_mode,profile_image
+    FROM users WHERE id=$1 AND disabled_at IS NULL`, [userId]);
+  return user ? mapPolicyUser(user) : null;
+}
+
+async function getClubPolicyUsers(clubId: string): Promise<Session[]> {
+  const users = await query<PolicyUserRow>(`SELECT u.id,u.username,u.is_admin,u.role,u.name,u.lastname,
+    u.birth_year,u.birth_month,u.birth_day,u.parental_control_enabled,u.parental_control_mode,u.profile_image
+    FROM reading_club_members member
+    INNER JOIN users u ON u.id=member.user_id
+    WHERE member.club_id=$1 AND member.status='APPROVED' AND u.disabled_at IS NULL`, [clubId]);
+  return users.map(mapPolicyUser);
+}
+
+async function getWorkAgeRatings(sourceType: ClubSourceType, sourceId: string): Promise<string[]> {
+  if (sourceType === "LIBRARY_SERIES") {
+    const ratings = await query<{ age_rating: string | null }>(`SELECT metadata.age_rating
+      FROM library_volumes volume
+      LEFT JOIN volume_metadata metadata ON metadata.id=volume.metadata_id
+      WHERE volume.series_id=$1`, [sourceId]);
+    return ratings.map((rating) => rating.age_rating ?? "");
+  }
+
+  const ratings = await query<{ age_rating: string | null }>(`SELECT metadata.age_rating
+    FROM book_volumes volume
+    LEFT JOIN book_metadata metadata ON metadata.volume_id=volume.id
+    WHERE volume.series_id=$1`, [sourceId]);
+  return ratings.map((rating) => rating.age_rating ?? "");
+}
+
+function canViewWork(user: Session, sourceType: ClubSourceType, ratings: string[], globallyEnabled: boolean, globalMode: "flexible" | "strict"): boolean {
+  const policy = getContentVisibilityPolicy(user, globallyEnabled, globalMode);
+  const library = sourceType === "BOOK_SERIES" ? "book" : "manga";
+  return ratings.length > 0 && ratings.every((rating) => canViewAgeRating(rating, library, policy));
+}
+
+export async function canClubMembersAccessWork(clubId: string, sourceType: ClubSourceType, sourceId: string): Promise<boolean> {
+  const settings = await getAppSettings();
+  if (!settings.parentalControlEnabled) return true;
+  const [users, ratings] = await Promise.all([
+    getClubPolicyUsers(clubId),
+    getWorkAgeRatings(sourceType, sourceId),
+  ]);
+  return users.every((user) => canViewWork(user, sourceType, ratings, settings.parentalControlEnabled, settings.parentalControlMode));
+}
+
+export async function canUserAccessClubReading(userId: string, clubId: string): Promise<boolean> {
+  const settings = await getAppSettings();
+  if (!settings.parentalControlEnabled) return true;
+  const [user, cycles] = await Promise.all([
+    getPolicyUser(userId),
+    query<{ selected_type: ClubSourceType; selected_id: string }>(`SELECT selected_type,selected_id
+      FROM reading_club_cycles
+      WHERE club_id=$1 AND status='READING' AND selected_type IS NOT NULL AND selected_id IS NOT NULL`, [clubId]),
+  ]);
+  if (!user) return false;
+  const ratings = await Promise.all(cycles.map((cycle) => getWorkAgeRatings(cycle.selected_type, cycle.selected_id)));
+  return cycles.every((cycle, index) => canViewWork(user, cycle.selected_type, ratings[index], settings.parentalControlEnabled, settings.parentalControlMode));
+}
+
 export async function canAccessLibraryVolume(user: Session, volumeId: string): Promise<boolean> {
   if (user.role !== "GUEST") return true;
   const row = await queryOne<{ id: string }>(`

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

@@ -7,6 +7,7 @@ import { execute, query, queryOne } from "./query";
 export type ClubMemberStatus = "PENDING" | "APPROVED" | "REJECTED" | "REVOKED";
 export type ClubCycleStatus = "DRAFT" | "VOTING" | "READING" | "COMPLETED";
 export type ClubSourceType = "LIBRARY_SERIES" | "BOOK_SERIES";
+export type ClubMilestoneTargetKind = "PAGE" | "PROGRESSION" | "VOLUME";
 
 export interface ReadingClub {
   id: string;
@@ -18,6 +19,7 @@ export interface ReadingClub {
   createdAt: Date;
   participantCount: number;
   membershipStatus: ClubMemberStatus | null;
+  isInvited: boolean;
   workTitle: string | null;
   workCover: string | null;
   workSourceType: ClubSourceType | null;
@@ -31,11 +33,20 @@ export interface ClubMember {
   userId: string;
   username: string;
   name: string | null;
+  lastname: string | null;
   role: string;
   status: ClubMemberStatus;
   progress: number | null;
 }
 
+export interface ClubUser {
+  id: string;
+  username: string;
+  name: string | null;
+  lastname: string | null;
+  role: string;
+}
+
 export interface ClubCycle {
   id: string;
   title: string;
@@ -45,6 +56,7 @@ export interface ClubCycle {
   selectedId: string | null;
   workTitle: string | null;
   workCover: string | null;
+  workIsOneshot: boolean;
   startedAt: Date | null;
 }
 
@@ -86,6 +98,7 @@ function mapClub(row: Record<string, unknown>): ReadingClub {
     createdAt: row.created_at as Date,
     participantCount: Number(row.participant_count ?? 0),
     membershipStatus: (row.membership_status as ClubMemberStatus | null) ?? null,
+    isInvited: row.invited_by_user_id !== null && row.invited_by_user_id !== undefined,
     workTitle: (row.work_title as string | null) ?? null,
     workCover: getWorkCover(row),
     workSourceType: (row.source_type as ClubSourceType | null) ?? null,
@@ -116,7 +129,7 @@ export async function listClubsForUser(userId: string, options?: { includePublic
       WHERE member_count.club_id = c.id AND member_count.status = 'APPROVED'
     ) members ON TRUE
     LEFT JOIN LATERAL (
-      SELECT membership.status
+      SELECT membership.status, membership.invited_by_user_id
       FROM reading_club_members membership
       WHERE membership.club_id = c.id AND membership.user_id = $1
     ) viewer ON TRUE
@@ -166,9 +179,9 @@ export async function listClubsForUser(userId: string, options?: { includePublic
   return rows.map(mapClub);
 }
 
-export async function getMembership(clubId: string, userId: string): Promise<{ id: string; status: ClubMemberStatus } | null> {
-  return queryOne<{ id: string; status: ClubMemberStatus }>(
-    "SELECT id, status FROM reading_club_members WHERE club_id = $1 AND user_id = $2", [clubId, userId]);
+export async function getMembership(clubId: string, userId: string): Promise<{ id: string; status: ClubMemberStatus; invited_by_user_id: string | null } | null> {
+  return queryOne<{ id: string; status: ClubMemberStatus; invited_by_user_id: string | null }>(
+    "SELECT id, status, invited_by_user_id FROM reading_club_members WHERE club_id = $1 AND user_id = $2", [clubId, userId]);
 }
 
 export async function canManageClub(club: ReadingClub, userId: string, isAdmin: boolean): Promise<boolean> {
@@ -213,10 +226,62 @@ export async function findFixedClubInvite(token: string) {
 export async function requestMembership(clubId: string, userId: string): Promise<void> {
   await execute(`INSERT INTO reading_club_members (id, club_id, user_id, status)
     VALUES ($1,$2,$3,'PENDING') ON CONFLICT (club_id, user_id)
-    DO UPDATE SET status = CASE WHEN reading_club_members.status IN ('REJECTED','REVOKED') THEN 'PENDING' ELSE reading_club_members.status END`,
+    DO UPDATE SET
+      status = CASE WHEN reading_club_members.status IN ('REJECTED','REVOKED') THEN 'PENDING' ELSE reading_club_members.status END,
+      invited_by_user_id = CASE WHEN reading_club_members.status IN ('REJECTED','REVOKED') THEN NULL ELSE reading_club_members.invited_by_user_id END`,
   [createId(), clubId, userId]);
 }
 
+export async function inviteMembership(clubId: string, userId: string, invitedByUserId: string): Promise<void> {
+  await execute(`INSERT INTO reading_club_members (id, club_id, user_id, status, invited_by_user_id)
+    VALUES ($1,$2,$3,'PENDING',$4) ON CONFLICT (club_id, user_id)
+    DO UPDATE SET
+      status = CASE WHEN reading_club_members.status IN ('REJECTED','REVOKED') THEN 'PENDING' ELSE reading_club_members.status END,
+      invited_by_user_id = CASE WHEN reading_club_members.status IN ('REJECTED','REVOKED') THEN EXCLUDED.invited_by_user_id ELSE reading_club_members.invited_by_user_id END`,
+  [createId(), clubId, userId, invitedByUserId]);
+}
+
+export async function addApprovedMembership(clubId: string, userId: string): Promise<void> {
+  await execute(`INSERT INTO reading_club_members (id, club_id, user_id, status, reviewed_at)
+    VALUES ($1,$2,$3,'APPROVED',NOW()) ON CONFLICT (club_id, user_id)
+    DO UPDATE SET status = 'APPROVED', reviewed_at = NOW()`,
+  [createId(), clubId, userId]);
+}
+
+export async function listClubUsers(): Promise<ClubUser[]> {
+  return query<ClubUser>(`SELECT id, username, name, lastname, role
+    FROM users
+    WHERE disabled_at IS NULL AND role <> 'GUEST'
+    ORDER BY COALESCE(name, username) ASC, username ASC`);
+}
+
+export async function deleteGuestWithoutActiveClubs(userId: string): Promise<void> {
+  await execute(`DELETE FROM users
+    WHERE id = $1
+      AND role = 'GUEST'
+      AND NOT EXISTS (
+        SELECT 1
+        FROM reading_club_members member
+        INNER JOIN reading_clubs club ON club.id = member.club_id
+        WHERE member.user_id = users.id
+          AND member.status IN ('PENDING', 'APPROVED')
+          AND club.status = 'ACTIVE'
+      )`, [userId]);
+}
+
+async function deleteGuestsWithoutActiveClubs(): Promise<void> {
+  await execute(`DELETE FROM users
+    WHERE role = 'GUEST'
+      AND NOT EXISTS (
+        SELECT 1
+        FROM reading_club_members member
+        INNER JOIN reading_clubs club ON club.id = member.club_id
+        WHERE member.user_id = users.id
+          AND member.status IN ('PENDING', 'APPROVED')
+          AND club.status = 'ACTIVE'
+      )`);
+}
+
 export async function reviewMembership(memberId: string, status: Extract<ClubMemberStatus, "APPROVED" | "REJECTED" | "REVOKED">): Promise<void> {
   await execute("UPDATE reading_club_members SET status = $2, reviewed_at = NOW() WHERE id = $1", [memberId, status]);
 }
@@ -239,6 +304,7 @@ function mapCycle(row: Record<string, unknown>): ClubCycle {
     selectedId: row.selected_id as string | null,
     workTitle: (row.work_title as string | null) ?? null,
     workCover: getWorkCover(row),
+    workIsOneshot: row.work_is_oneshot === true,
     startedAt: row.started_at as Date | null,
   };
 }
@@ -260,8 +326,8 @@ export async function selectCycleWork(cycleId: string, sourceType: ClubSourceTyp
   await execute(`UPDATE reading_club_cycles SET selected_type=$2, selected_id=$3, status='READING', started_at=COALESCE(started_at,NOW()), updated_at=NOW() WHERE id=$1`, [cycleId, sourceType, sourceId]);
 }
 
-export async function addMilestoneRecord(cycleId: string, position: number, label: string, targetDate: string): Promise<void> {
-  await execute("INSERT INTO reading_club_milestones (id,cycle_id,position,label,target_date) VALUES ($1,$2,$3,$4,$5)", [createId(), cycleId, position, label, targetDate]);
+export async function addMilestoneRecord(cycleId: string, targetKind: ClubMilestoneTargetKind, targetValue: number, targetDate: string): Promise<void> {
+  await execute("INSERT INTO reading_club_milestones (id,cycle_id,label,target_kind,target_value,target_date) VALUES ($1,$2,$3,$4,$5,$6)", [createId(), cycleId, `${targetKind}:${targetValue}`, targetKind, targetValue, targetDate]);
 }
 
 export async function castVoteRecord(cycleId: string, candidateId: string, memberId: string): Promise<void> {
@@ -271,23 +337,21 @@ export async function castVoteRecord(cycleId: string, candidateId: string, membe
 
 export async function archiveClubRecord(clubId: string): Promise<void> {
   await execute("UPDATE reading_clubs SET status='ARCHIVED', archived_at=NOW(), updated_at=NOW() WHERE id=$1", [clubId]);
-  await execute(`UPDATE users SET disabled_at=NOW() FROM reading_club_guest_accounts g
-    WHERE g.club_id=$1 AND g.user_id=users.id`, [clubId]);
+  await deleteGuestsWithoutActiveClubs();
 }
 
 export async function deleteClubRecord(clubId: string): Promise<void> {
-  await execute(`DELETE FROM users WHERE id IN (
-    SELECT user_id FROM reading_club_guest_accounts WHERE club_id=$1
-  )`, [clubId]);
   await execute("DELETE FROM reading_clubs WHERE id=$1", [clubId]);
+  await deleteGuestsWithoutActiveClubs();
 }
 
 export async function getClubDashboard(club: ReadingClub, userId: string) {
   const [members, cycles, activities] = await Promise.all([
-    query<Record<string, unknown>>(`SELECT m.id,m.user_id,u.username,u.name,u.role,m.status
+    query<Record<string, unknown>>(`SELECT m.id,m.user_id,u.username,u.name,u.lastname,u.role,m.status
       FROM reading_club_members m INNER JOIN users u ON u.id=m.user_id WHERE m.club_id=$1 AND m.status <> 'REVOKED' ORDER BY m.status, COALESCE(u.name,u.username)`, [club.id]),
-    query<Record<string, unknown>>(`SELECT c.id,c.title,c.status,c.vote_closes_at,c.selected_type,c.selected_id,c.started_at,
+    query<Record<string, unknown>>(`SELECT c.id,c.title,c.status,c.vote_closes_at,c.selected_type,c.selected_type AS source_type,c.selected_id,c.started_at,
       COALESCE(ls.title,bs.title) AS work_title,
+      COALESCE(ls.is_oneshot,bs.is_oneshot,FALSE) AS work_is_oneshot,
       library_cover.slug AS library_cover_slug, library_cover.cover_image AS library_cover_image, library_cover.updated_at AS library_cover_updated_at,
       book_cover.slug AS book_cover_slug, book_cover.cover_path AS book_cover_path
       FROM reading_club_cycles c
@@ -309,8 +373,15 @@ export async function getClubDashboard(club: ReadingClub, userId: string) {
         LIMIT 1
       ) book_cover ON TRUE
       WHERE c.club_id=$1 ORDER BY c.created_at DESC`, [club.id]),
-    query<{ id: string; type: string; created_at: Date; username: string; name: string | null; label: string | null }>(`
-      SELECT a.id,a.type,a.created_at,u.username,u.name,ms.label FROM reading_club_activities a
+    query<{ id: string; type: string; created_at: Date; username: string; name: string | null; lastname: string | null; milestone_number: number | null }>(`
+      SELECT a.id,a.type,a.created_at,u.username,u.name,u.lastname,
+        CASE WHEN ms.id IS NULL THEN NULL ELSE (
+          SELECT COUNT(*)::int
+          FROM reading_club_milestones earlier
+          WHERE earlier.cycle_id=ms.cycle_id
+            AND (earlier.target_date,earlier.created_at,earlier.id) <= (ms.target_date,ms.created_at,ms.id)
+        ) END AS milestone_number
+      FROM reading_club_activities a
       INNER JOIN reading_club_members m ON m.id=a.member_id INNER JOIN users u ON u.id=m.user_id
       LEFT JOIN reading_club_milestones ms ON ms.id=a.milestone_id WHERE a.club_id=$1 ORDER BY a.created_at DESC LIMIT 50`, [club.id]),
   ]);
@@ -319,7 +390,7 @@ export async function getClubDashboard(club: ReadingClub, userId: string) {
   return {
     club,
     currentUserMembership: await getMembership(club.id, userId),
-    members: members.map((member) => ({ id: member.id as string, userId: member.user_id as string, username: member.username as string, name: member.name as string | null, role: member.role as string, status: member.status as ClubMemberStatus, progress: memberProgress.get(member.user_id as string) ?? null } satisfies ClubMember)),
+    members: members.map((member) => ({ id: member.id as string, userId: member.user_id as string, username: member.username as string, name: member.name as string | null, lastname: member.lastname as string | null, role: member.role as string, status: member.status as ClubMemberStatus, progress: memberProgress.get(member.user_id as string) ?? null } satisfies ClubMember)),
     cycles: cycles.map(mapCycle),
     activities,
   };
@@ -392,8 +463,25 @@ export async function listCycleCandidates(cycleId: string): Promise<ClubCandidat
 }
 
 export async function listCycleMilestones(cycleId: string) {
-  return query<{ id: string; position: number; label: string; target_date: string }>(
-    "SELECT id,position,label,target_date::text FROM reading_club_milestones WHERE cycle_id=$1 ORDER BY position", [cycleId]);
+  return query<{ id: string; target_kind: ClubMilestoneTargetKind; target_value: number; target_date: string; reached_count: number; participant_count: number }>(`
+    SELECT ms.id,ms.target_kind,ms.target_value::float8 AS target_value,ms.target_date::text,
+      COALESCE(reached.count,0)::int AS reached_count,
+      COALESCE(participants.count,0)::int AS participant_count
+    FROM reading_club_milestones ms
+    LEFT JOIN LATERAL (
+      SELECT COUNT(*)::int AS count
+      FROM reading_club_activities activity
+      INNER JOIN reading_club_members member ON member.id=activity.member_id AND member.status='APPROVED'
+      WHERE activity.milestone_id=ms.id AND activity.type='MILESTONE_REACHED'
+    ) reached ON TRUE
+    LEFT JOIN LATERAL (
+      SELECT COUNT(*)::int AS count
+      FROM reading_club_members member
+      WHERE member.club_id=(SELECT club_id FROM reading_club_cycles WHERE id=ms.cycle_id)
+        AND member.status='APPROVED'
+    ) participants ON TRUE
+    WHERE ms.cycle_id=$1
+    ORDER BY ms.target_date,ms.created_at`, [cycleId]);
 }
 
 export async function listSelectedCycleVolumes(cycle: ClubCycle | null) {
@@ -407,18 +495,41 @@ export async function listSelectedCycleVolumes(cycle: ClubCycle | null) {
 
 export async function recordClubProgressActivities(userId: string, sourceType: ClubSourceType, sourceId: string): Promise<void> {
   const progressRow = sourceType === "LIBRARY_SERIES"
-    ? await queryOne<{ progress: number }>(`SELECT AVG(CASE WHEN u.is_read THEN 1 WHEN u.total_pages > 0 THEN LEAST(1, GREATEST(0, (u.last_page + 1)::float / u.total_pages)) ELSE 0 END) AS progress
+    ? await queryOne<{ progress: number; pages: number; completed_volumes: number }>(`SELECT
+      AVG(CASE WHEN u.is_read THEN 1 WHEN u.total_pages > 0 THEN LEAST(1, GREATEST(0, (u.last_page + 1)::float / u.total_pages)) ELSE 0 END) AS progress,
+      MAX(CASE WHEN u.is_read THEN u.total_pages ELSE u.last_page + 1 END) AS pages,
+      COUNT(*) FILTER (WHERE u.is_read) AS completed_volumes
       FROM library_volumes v LEFT JOIN user_to_volumes u ON u.volume_id=v.id AND u.user_id=$1 WHERE v.series_id=$2`, [userId, sourceId])
-    : await queryOne<{ progress: number }>(`SELECT AVG(CASE WHEN u.is_read THEN 1 ELSE COALESCE(u.progression,0) END) AS progress
+    : await queryOne<{ progress: number; pages: number; completed_volumes: number }>(`SELECT
+      AVG(CASE WHEN u.is_read THEN 1 ELSE COALESCE(u.progression,0) END) AS progress,
+      0 AS pages,
+      COUNT(*) FILTER (WHERE u.is_read) AS completed_volumes
       FROM book_volumes v LEFT JOIN user_to_books u ON u.volume_id=v.id AND u.user_id=$1 WHERE v.series_id=$2`, [userId, sourceId]);
   const progress = Number(progressRow?.progress ?? 0);
-  const rows = await query<{ club_id: string; cycle_id: string; member_id: string; milestone_id: string | null; position: number }>(`
-    SELECT c.club_id,c.id AS cycle_id,m.id AS member_id,ms.id AS milestone_id,ms.position
+  const pages = Number(progressRow?.pages ?? 0);
+  const completedVolumes = Number(progressRow?.completed_volumes ?? 0);
+  const rows = await query<{ club_id: string; cycle_id: string; member_id: string; milestone_id: string | null; target_kind: ClubMilestoneTargetKind | null; target_value: number | null }>(`
+    SELECT c.club_id,c.id AS cycle_id,m.id AS member_id,ms.id AS milestone_id,ms.target_kind,ms.target_value::float8 AS target_value
     FROM reading_club_cycles c INNER JOIN reading_club_members m ON m.club_id=c.club_id AND m.user_id=$1 AND m.status='APPROVED'
     LEFT JOIN reading_club_milestones ms ON ms.cycle_id=c.id
     WHERE c.status='READING' AND c.selected_type=$2 AND c.selected_id=$3`, [userId, sourceType, sourceId]);
   for (const row of rows) {
     if (progress >= 1) await execute(`INSERT INTO reading_club_activities (id,club_id,cycle_id,member_id,type) VALUES ($1,$2,$3,$4,'COMPLETED') ON CONFLICT DO NOTHING`, [createId(), row.club_id, row.cycle_id, row.member_id]);
-    if (row.milestone_id && progress * 100 >= row.position) await execute(`INSERT INTO reading_club_activities (id,club_id,cycle_id,member_id,milestone_id,type) VALUES ($1,$2,$3,$4,$5,'MILESTONE_REACHED') ON CONFLICT DO NOTHING`, [createId(), row.club_id, row.cycle_id, row.member_id, row.milestone_id]);
+    const targetValue = Number(row.target_value ?? 0);
+    const reached = row.milestone_id && row.target_kind === "PAGE"
+      ? pages >= targetValue
+      : row.milestone_id && row.target_kind === "PROGRESSION"
+        ? progress * 100 >= targetValue
+        : row.milestone_id && row.target_kind === "VOLUME"
+          ? completedVolumes >= targetValue
+          : false;
+    if (reached && row.milestone_id) await execute(`INSERT INTO reading_club_activities (id,club_id,cycle_id,member_id,milestone_id,type) VALUES ($1,$2,$3,$4,$5,'MILESTONE_REACHED') ON CONFLICT DO NOTHING`, [createId(), row.club_id, row.cycle_id, row.member_id, row.milestone_id]);
   }
 }
+
+export async function recordCycleMilestoneActivities(cycleId: string): Promise<void> {
+  const cycle = await queryOne<{ selected_type: ClubSourceType | null; selected_id: string | null }>("SELECT selected_type,selected_id FROM reading_club_cycles WHERE id=$1 AND status='READING'", [cycleId]);
+  if (!cycle?.selected_type || !cycle.selected_id) return;
+  const members = await query<{ user_id: string }>("SELECT user_id FROM reading_club_members WHERE club_id=(SELECT club_id FROM reading_club_cycles WHERE id=$1) AND status='APPROVED'", [cycleId]);
+  await Promise.all(members.map((member) => recordClubProgressActivities(member.user_id, cycle.selected_type!, cycle.selected_id!)));
+}

package/dist/src/lib/db/migrations/016_guest_club_membership_lifecycle.sql

@@ -0,0 +1,22 @@
+DROP TABLE IF EXISTS reading_club_guest_accounts;
+
+ALTER TABLE user_to_series DROP CONSTRAINT IF EXISTS user_to_series_user_id_fkey;
+ALTER TABLE user_to_series
+  ADD CONSTRAINT user_to_series_user_id_fkey
+  FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE;
+
+ALTER TABLE user_to_volumes DROP CONSTRAINT IF EXISTS user_to_volumes_user_id_fkey;
+ALTER TABLE user_to_volumes
+  ADD CONSTRAINT user_to_volumes_user_id_fkey
+  FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE;
+
+DELETE FROM users
+WHERE role = 'GUEST'
+  AND NOT EXISTS (
+    SELECT 1
+    FROM reading_club_members member
+    INNER JOIN reading_clubs club ON club.id = member.club_id
+    WHERE member.user_id = users.id
+      AND member.status IN ('PENDING', 'APPROVED')
+      AND club.status = 'ACTIVE'
+  );

package/dist/src/lib/db/migrations/017_club_member_invitations.sql

@@ -0,0 +1,2 @@
+ALTER TABLE reading_club_members
+  ADD COLUMN IF NOT EXISTS invited_by_user_id TEXT REFERENCES users(id) ON DELETE SET NULL;

package/dist/src/lib/db/migrations/018_club_milestone_goals.sql

@@ -0,0 +1,5 @@
+ALTER TABLE reading_club_milestones
+  ALTER COLUMN position DROP NOT NULL;
+
+ALTER TABLE reading_club_milestones
+  DROP CONSTRAINT IF EXISTS reading_club_milestones_cycle_id_position_key;

package/dist/src/lib/db/migrations/019_club_milestone_targets.sql

@@ -0,0 +1,5 @@
+ALTER TABLE reading_club_milestones
+  ADD COLUMN IF NOT EXISTS target_kind TEXT NOT NULL DEFAULT 'PROGRESSION'
+    CHECK (target_kind IN ('PAGE', 'PROGRESSION', 'VOLUME')),
+  ADD COLUMN IF NOT EXISTS target_value NUMERIC NOT NULL DEFAULT 100
+    CHECK (target_value > 0);

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

@@ -67,6 +67,7 @@ export async function listUsers(): Promise<PublicUser[]> {
     SELECT id, created_at, username, password, is_admin, role, name, lastname, birth_year, birth_month, birth_day, parental_control_enabled, parental_control_mode
     , profile_image
     FROM users
+    WHERE disabled_at IS NULL
     ORDER BY COALESCE(name, username) ASC, username ASC
   `);
 

package/dist/src/lib/i18n/dictionaries/en/clubs.json

@@ -31,6 +31,12 @@
     "reachedMilestone": "reached the milestone",
     "noActivity": "No activity has been recorded yet.",
     "manage": "Manage",
+    "selectUser": "Select user",
+    "addMember": "Add participant",
+    "inviteUser": "Invite user",
+    "acceptInvitation": "Accept invitation",
+    "clubInvitationPushTitle": "Club invitation",
+    "clubInvitationPushBody": "You have an invitation to join {club}.",
     "createInvite": "Create invitation",
     "copyInvite": "Copy invitation",
     "inviteCopied": "Invitation copied",
@@ -61,14 +67,27 @@
     "votingMustClose": "Voting must close before choosing a work.",
     "archive": "Archive club",
     "milestones": "Milestones",
-    "milestoneLabel": "For example, Volume 3",
+    "milestoneLabel": "Reading goal",
     "milestonePosition": "Percentage",
+    "targetDate": "Target date",
+    "milestone": "Milestone",
+    "page": "Page",
+    "percentage": "Percentage",
+    "volume": "Volume",
+    "clubMilestoneReached": "Milestone reached by the club",
     "addMilestone": "Add milestone",
     "selectWorkForMilestones": "Choose a work before adding milestones.",
     "inviteLabel": "Private invitation",
     "invitePending": "Your request will be pending until the club owner approves it.",
     "requestJoin": "Request to join",
     "joinGuest": "Join as a guest",
+    "name": "First name",
+    "lastname": "Last name",
+    "guestNameRequired": "Enter your first and last name.",
+    "guestPasswordTooShort": "Use a password of at least 8 characters.",
+    "guestUsernameInvalid": "Use a first and last name with letters or numbers.",
+    "clubReadingRestricted": "This person cannot access the club's current reading.",
+    "clubWorkRestricted": "The selected work is restricted for a club participant.",
     "username": "Username",
     "password": "Password (8 characters minimum)",
     "createGuest": "Request"