From 555660ca5ab51cb8fdf6f6686d4674919e9199be Mon Sep 17 00:00:00 2001
From: Joe <joe@joebailey.xyz>
Date: Sun, 14 Jun 2026 21:40:45 +0100
Subject: [PATCH 1/2] Add rewatch tag

---
 app/components/nav.vue         |  3 ++
 app/pages/my-shows.vue         |  3 +-
 app/pages/show/[id].vue        | 40 +++++++++++++++++++++--
 drizzle/0003_rewatch_shows.sql | 18 +++++++++++
 server/api/show/[id].get.ts    | 29 ++++++++++++++++-
 server/api/show/[id].patch.ts  | 58 ++++++++++++++++++++++++++++------
 server/api/shows.get.ts        | 29 ++++++++++++++---
 server/db/schema.ts            | 19 +++++++++++
 server/types/transformed.d.ts  |  8 +++++
 9 files changed, 189 insertions(+), 18 deletions(-)
 create mode 100644 drizzle/0003_rewatch_shows.sql

diff --git a/app/components/nav.vue b/app/components/nav.vue
index 0fa8adb..62d0303 100644
--- a/app/components/nav.vue
+++ b/app/components/nav.vue
@@ -103,6 +103,9 @@ nav {
           <nuxt-link to="/my-shows?category=cancelled" class="nav-link" :class="{ active: $route.query.category === 'cancelled' }">
             Cancelled
           </nuxt-link>
+          <nuxt-link to="/my-shows?category=rewatch" class="nav-link" :class="{ active: $route.query.category === 'rewatch' }">
+            Rewatch
+          </nuxt-link>
           <nuxt-link to="/watch-partners" class="nav-link" :class="{ active: $route.path === '/watch-partners' }">
             Friends & Family
           </nuxt-link>
diff --git a/app/pages/my-shows.vue b/app/pages/my-shows.vue
index 0bab4c4..fd2dce2 100644
--- a/app/pages/my-shows.vue
+++ b/app/pages/my-shows.vue
@@ -1,13 +1,12 @@
 <style lang="scss" scoped>
 .sort-controls {
   display: flex;
+  flex-wrap: wrap;
   gap: .5rem;
   align-items: center;
   justify-content: end;
   margin-top: 1rem;
   margin-bottom: 1rem;
-  flex-wrap: wrap;
-
   > div {
     display: flex;
     gap: .5rem;
diff --git a/app/pages/show/[id].vue b/app/pages/show/[id].vue
index 114155c..2e165e8 100644
--- a/app/pages/show/[id].vue
+++ b/app/pages/show/[id].vue
@@ -21,6 +21,7 @@ h1 {
   display: grid;
   gap: 1rem;
 }
+.show-tags,
 .watching-with {
   display: grid;
   gap: 0.5rem;
@@ -28,7 +29,7 @@ h1 {
     color: white;
     font-weight: 600;
   }
-  .watching-with-header {
+  .section-header {
     display: flex;
     gap: 1rem;
     align-items: center;
@@ -56,10 +57,12 @@ h1 {
     color: #d1d5db;
     font-size: 0.9rem;
   }
+  .tag-option,
   .partner-options {
     display: grid;
     gap: 0.5rem;
   }
+  .tag-option,
   .partner-option {
     display: flex;
     gap: 0.6rem;
@@ -132,8 +135,22 @@ h1 {
         <h1 v-html="name" />
         <p v-html="description" />
         <div class="info">
+          <div class="show-tags">
+            <div class="section-header">
+              <p>Tags:</p>
+            </div>
+            <label class="tag-option" for="rewatch">
+              <input
+                id="rewatch"
+                type="checkbox"
+                :checked="rewatch"
+                @change="updateRewatch"
+              >
+              <span>Rewatch</span>
+            </label>
+          </div>
           <div class="watching-with">
-            <div class="watching-with-header">
+            <div class="section-header">
               <p>Watching together with:</p>
               <button
                 type="button"
@@ -213,6 +230,7 @@ export default defineComponent({
     const show = ref<EpisodateShowTransformed | null>(null)
     const partners = ref<{id:number, name:string}[]>([])
     const selectedPartners = ref<number[]>([])
+    const rewatch = ref(false)
 
     const loadPartners = async () => {
       try {
@@ -234,6 +252,7 @@ export default defineComponent({
     const showState = reactive(response.data.value) as EpisodateShowTransformed
     show.value = showState
     selectedPartners.value = showState.watchingWith.map(item => item.id)
+    rewatch.value = showState.rewatch
 
     const seasons: ComputedRef<Season[]> = computed(() => {
       if (show.value && show.value.episodes.length > 0) {
@@ -258,6 +277,21 @@ export default defineComponent({
       await $fetch<{ success: boolean, watchedEpisodeIds: number[] }>(`/api/show/${showId}` as string, { method: 'PATCH', headers, body: { watchPartnerIds } })
     }
 
+    async function updateRewatch (event: Event) {
+      const target = event.target as HTMLInputElement
+      rewatch.value = target.checked
+      await $fetch<{ success: boolean, watchedEpisodeIds: number[] }>(`/api/show/${showId}` as string, { method: 'PATCH', headers, body: { rewatch: rewatch.value } })
+      if (show.value) {
+        const hasRewatchTag = show.value.tags.some(tag => tag.slug === 'rewatch')
+        if (rewatch.value && !hasRewatchTag) {
+          show.value.tags = [...show.value.tags, { id: 0, slug: 'rewatch', name: 'Rewatch' }]
+        } else if (!rewatch.value) {
+          show.value.tags = show.value.tags.filter(tag => tag.slug !== 'rewatch')
+        }
+        show.value.rewatch = rewatch.value
+      }
+    }
+
     async function updateWatchingWith (partnerId: number, event: Event) {
       const target = event.target as HTMLInputElement
       const selectedSet = new Set(selectedPartners.value)
@@ -309,6 +343,8 @@ export default defineComponent({
       deleteShowCallback,
       partners,
       selectedPartners,
+      rewatch,
+      updateRewatch,
       updateWatchingWith,
       clearWatchingWith
     }
diff --git a/drizzle/0003_rewatch_shows.sql b/drizzle/0003_rewatch_shows.sql
new file mode 100644
index 0000000..77d6c87
--- /dev/null
+++ b/drizzle/0003_rewatch_shows.sql
@@ -0,0 +1,18 @@
+CREATE TABLE IF NOT EXISTS `tags` (
+  `id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+  `slug` text NOT NULL,
+  `name` text NOT NULL
+);
+
+CREATE UNIQUE INDEX IF NOT EXISTS `tagsSlugIdx` ON `tags` (`slug`);
+
+CREATE TABLE IF NOT EXISTS `showTags` (
+  `showId` integer NOT NULL,
+  `tagId` integer NOT NULL,
+  FOREIGN KEY (`showId`) REFERENCES `tv_shows`(`id`) ON UPDATE no action ON DELETE cascade,
+  FOREIGN KEY (`tagId`) REFERENCES `tags`(`id`) ON UPDATE no action ON DELETE cascade
+);
+
+CREATE UNIQUE INDEX IF NOT EXISTS `showTagsIdx` ON `showTags` (`showId`,`tagId`);
+
+INSERT OR IGNORE INTO `tags` (`slug`, `name`) VALUES ('rewatch', 'Rewatch');
diff --git a/server/api/show/[id].get.ts b/server/api/show/[id].get.ts
index a397afb..fe829a0 100644
--- a/server/api/show/[id].get.ts
+++ b/server/api/show/[id].get.ts
@@ -1,7 +1,7 @@
 import type { H3Event } from 'h3'
 import { eq, and, asc, sql, gt } from 'drizzle-orm'
 import { getAuthenticatedUserEmail } from '../../lib/auth'
-import { tvShows, users, episodateTvShows, episodes, showWatchPartners, watchPartners } from '../../db/schema'
+import { tvShows, users, episodateTvShows, episodes, showWatchPartners, watchPartners, showTags, tags } from '../../db/schema'
 import { useDb } from '../../lib/db'
 import { getEpisodesForShow } from '../../lib/getEpisodesForShow'
 
@@ -9,6 +9,10 @@ function isWatchPartner (item: { id: number | null, name: string | null }): item
   return item.id !== null && item.name !== null
 }
 
+function isShowTag (item: { id: number | null, slug: string | null, name: string | null }): item is ShowTag {
+  return item.id !== null && item.slug !== null && item.name !== null
+}
+
 export default defineEventHandler(async (event: H3Event): Promise<EpisodateShowTransformed|null> => {
   const userEmail = await getAuthenticatedUserEmail(event)
 
@@ -69,6 +73,11 @@ export default defineEventHandler(async (event: H3Event): Promise<EpisodateShowT
     genres: episodateTvShows.genres,
     pictures: episodateTvShows.pictures,
     updatedAt: episodateTvShows.updatedAt,
+    rewatch: sql<boolean>`exists (
+      select 1 from ${showTags} st
+      join ${tags} t on t.id = st.tagId
+      where st.showId = ${tvShows.id} and t.slug = 'rewatch'
+    )`,
     countdown: {
       id: countdown.id,
       season: countdown.season,
@@ -127,10 +136,28 @@ export default defineEventHandler(async (event: H3Event): Promise<EpisodateShowT
     )
 
   const episodesFromDb = await getEpisodesForShow(showId, userEmail, event)
+  const showTagsResponse = await DB.select({
+    id: tags.id,
+    slug: tags.slug,
+    name: tags.name
+  })
+    .from(tvShows)
+    .leftJoin(showTags, eq(showTags.showId, tvShows.id))
+    .leftJoin(tags, eq(tags.id, showTags.tagId))
+    .leftJoin(users, eq(users.id, tvShows.userId))
+    .where(
+      and(
+        eq(tvShows.showId, showId),
+        eq(users.email, userEmail),
+        sql`${tags.id} is not null`
+      )
+    )
 
   return {
     ...showResponse[0],
     tracked: true,
+    rewatch: Boolean(showResponse[0].rewatch),
+    tags: showTagsResponse.filter(isShowTag),
     genres: showResponse[0]?.genres ? showResponse[0].genres.split(',') : [],
     pictures: showResponse[0]?.pictures ? showResponse[0].pictures.split(',') : [],
     episodes: episodesFromDb,
diff --git a/server/api/show/[id].patch.ts b/server/api/show/[id].patch.ts
index e267842..eabf736 100644
--- a/server/api/show/[id].patch.ts
+++ b/server/api/show/[id].patch.ts
@@ -2,7 +2,7 @@ import type { H3Event } from 'h3'
 import { eq, and, inArray, sql } from 'drizzle-orm'
 import type { BatchItem } from 'drizzle-orm/batch'
 import { getShowExists } from '../../lib/getShowExists'
-import { episodes, watchedEpisodes, users, tvShows, showWatchPartners, watchPartners } from '../../db/schema'
+import { episodes, watchedEpisodes, users, tvShows, showWatchPartners, watchPartners, showTags, tags } from '../../db/schema'
 import { getAuthenticatedUserEmail } from '../../lib/auth'
 import { useDb } from '../../lib/db'
 import { getUserByEmail } from '../../lib/getUserByEmail'
@@ -42,9 +42,14 @@ export default defineEventHandler(async (event: H3Event) => {
 
   const hasEpisode = body.episode !== undefined
   const hasWatchPartnerIds = body.watchPartnerIds !== undefined
+  const hasRewatch = body.rewatch !== undefined
 
-  if (!hasEpisode && !hasWatchPartnerIds) {
-    throw createError({ statusMessage: 'You must pass at least one supported field (episode or watchPartnerIds)', statusCode: 400 })
+  if (!hasEpisode && !hasWatchPartnerIds && !hasRewatch) {
+    throw createError({ statusMessage: 'You must pass at least one supported field (episode, watchPartnerIds or rewatch)', statusCode: 400 })
+  }
+
+  if (hasRewatch && typeof body.rewatch !== 'boolean') {
+    throw createError({ statusMessage: 'rewatch must be a boolean', statusCode: 400 })
   }
 
   if (hasWatchPartnerIds && !Array.isArray(body.watchPartnerIds)) {
@@ -56,7 +61,7 @@ export default defineEventHandler(async (event: H3Event) => {
   }
 
 
-  const showRecord = Array.isArray(body.watchPartnerIds)
+  const showRecord = (Array.isArray(body.watchPartnerIds) || hasRewatch)
     ? await DB.select({ id: tvShows.id })
       .from(tvShows)
       .leftJoin(users, eq(users.id, tvShows.userId))
@@ -65,6 +70,20 @@ export default defineEventHandler(async (event: H3Event) => {
     : []
 
   let validWatchPartnerIds: number[] = []
+  let rewatchTagId = 0
+
+  if (hasRewatch) {
+    const rewatchTag = await DB.select({ id: tags.id })
+      .from(tags)
+      .where(eq(tags.slug, 'rewatch'))
+      .limit(1)
+
+    if (!rewatchTag[0]) {
+      throw createError({ statusMessage: 'Rewatch tag does not exist', statusCode: 500 })
+    }
+
+    rewatchTagId = rewatchTag[0].id
+  }
 
   if (Array.isArray(body.watchPartnerIds) && body.watchPartnerIds.length > 0) {
     // Validate that all provided IDs actually belong to the authenticated user
@@ -80,14 +99,35 @@ export default defineEventHandler(async (event: H3Event) => {
   // Set up batch requests after validation so partner and episode mutations commit together.
   const dbRequestBatch: BatchItem<'sqlite'>[] = []
 
-  if (Array.isArray(body.watchPartnerIds) && showRecord[0]) {
+  if (showRecord[0]) {
     const showDbId = showRecord[0].id
 
-    dbRequestBatch.push(
-      DB.delete(showWatchPartners).where(eq(showWatchPartners.showId, showDbId))
-    )
+    if (hasRewatch) {
+      if (body.rewatch) {
+        dbRequestBatch.push(
+          DB.insert(showTags)
+            .values({ showId: showDbId, tagId: rewatchTagId })
+            .onConflictDoNothing()
+        )
+      } else {
+        dbRequestBatch.push(
+          DB.delete(showTags).where(
+            and(
+              eq(showTags.showId, showDbId),
+              eq(showTags.tagId, rewatchTagId)
+            )
+          )
+        )
+      }
+    }
+
+    if (Array.isArray(body.watchPartnerIds)) {
+      dbRequestBatch.push(
+        DB.delete(showWatchPartners).where(eq(showWatchPartners.showId, showDbId))
+      )
+    }
 
-    if (validWatchPartnerIds.length > 0) {
+    if (Array.isArray(body.watchPartnerIds) && validWatchPartnerIds.length > 0) {
       dbRequestBatch.push(
         DB.insert(showWatchPartners).values(validWatchPartnerIds.map((watchPartnerId: number) => ({
           showId: showDbId,
diff --git a/server/api/shows.get.ts b/server/api/shows.get.ts
index 9cf01a8..d7571e7 100644
--- a/server/api/shows.get.ts
+++ b/server/api/shows.get.ts
@@ -3,11 +3,11 @@ import { asc, desc, eq, inArray, and, countDistinct, gt, sql, notInArray, lte }
 import { alias } from 'drizzle-orm/sqlite-core'
 import type { SQLiteSelect } from 'drizzle-orm/sqlite-core'
 import { getAuthenticatedUserEmail } from '../lib/auth'
-import { tvShows, users, episodateTvShows, episodes, watchedEpisodes, showWatchPartners } from '../db/schema'
+import { tvShows, users, episodateTvShows, episodes, watchedEpisodes, showWatchPartners, showTags, tags } from '../db/schema'
 import { pageSize as ps } from '../api/shows.get'
 import { useDb } from '../lib/db'
 
-type ShowCategory = 'wantToWatch'|'toCatchUpOn'|'waitingFor'|'cancelled'|''
+type ShowCategory = 'wantToWatch'|'toCatchUpOn'|'waitingFor'|'cancelled'|'rewatch'|''
 type SortType =
   | 'alphabetical'
   | 'episodesToWatch'
@@ -87,7 +87,18 @@ export default defineEventHandler(async (event: H3Event): Promise<CustomSearch>
             : sql`1=1`,
           watchingWith === -1
             ? sql`not exists (select 1 from ${showWatchPartners} swp where swp.showId = ${tvShows.id})`
-            : sql`1=1`
+            : sql`1=1`,
+          showCategory === 'rewatch'
+            ? sql`exists (
+              select 1 from ${showTags} st
+              join ${tags} t on t.id = st.tagId
+              where st.showId = ${tvShows.id} and t.slug = 'rewatch'
+            )`
+            : sql`not exists (
+              select 1 from ${showTags} st
+              join ${tags} t on t.id = st.tagId
+              where st.showId = ${tvShows.id} and t.slug = 'rewatch'
+            )`
         )
       )
 
@@ -130,6 +141,7 @@ export default defineEventHandler(async (event: H3Event): Promise<CustomSearch>
     } else {
       q = q.orderBy(order === 'asc' ? asc(episodateTvShows.name) : desc(episodateTvShows.name))
     }
+
     return q
   }
 
@@ -206,7 +218,12 @@ export default defineEventHandler(async (event: H3Event): Promise<CustomSearch>
     updatedAt: episodateTvShows.updatedAt,
     watchedEpisodeCount: countDistinct(watchedEpisodes.id),
     pastEpisodeCount: countDistinct(episodes.id),
-    episodesToWatch: sql<number>`count(distinct ${episodes.id}) - count(distinct ${watchedEpisodes.id})`
+    episodesToWatch: sql<number>`count(distinct ${episodes.id}) - count(distinct ${watchedEpisodes.id})`,
+    rewatch: sql<boolean>`exists (
+      select 1 from ${showTags} st
+      join ${tags} t on t.id = st.tagId
+      where st.showId = ${tvShows.id} and t.slug = 'rewatch'
+    )`
   })
     .from(episodateTvShows)
     .$dynamic()
@@ -238,8 +255,12 @@ export default defineEventHandler(async (event: H3Event): Promise<CustomSearch>
   ])
 
   const showsToReturn = batch[1].map((show) => {
+    const rewatch = Boolean(show.rewatch)
+
     return {
       ...show,
+      rewatch,
+      tags: rewatch ? [{ id: 0, slug: 'rewatch', name: 'Rewatch' }] : [],
       tracked: true
     } as EpisodateShowFromSearchTransformed
   })
diff --git a/server/db/schema.ts b/server/db/schema.ts
index e91dd4d..e9d6cca 100644
--- a/server/db/schema.ts
+++ b/server/db/schema.ts
@@ -12,6 +12,25 @@ export const tvShows = sqliteTable('tv_shows', {
   }
 })
 
+export const tags = sqliteTable('tags', {
+  id: integer('id').notNull().primaryKey({ autoIncrement: true }),
+  slug: text('slug').notNull(),
+  name: text('name').notNull()
+}, (table) => {
+  return {
+    tagsSlugIdx: uniqueIndex('tagsSlugIdx').on(table.slug)
+  }
+})
+
+export const showTags = sqliteTable('showTags', {
+  showId: integer('showId').notNull().references(() => tvShows.id, { onDelete: 'cascade' }),
+  tagId: integer('tagId').notNull().references(() => tags.id, { onDelete: 'cascade' })
+}, (table) => {
+  return {
+    showTagsIdx: uniqueIndex('showTagsIdx').on(table.showId, table.tagId)
+  }
+})
+
 export const episodateTvShows = sqliteTable('episodateTvShows', {
   id: integer('id').notNull().primaryKey(),
   name: text('name'),
diff --git a/server/types/transformed.d.ts b/server/types/transformed.d.ts
index bf8d11c..f13d59a 100644
--- a/server/types/transformed.d.ts
+++ b/server/types/transformed.d.ts
@@ -1,6 +1,12 @@
 export {}
 
 declare global {
+  interface ShowTag {
+    id: number
+    slug: string
+    name: string
+  }
+
   interface EpisodateShowFromSearchTransformed extends EpisodateShowFromSearch {
     tracked: boolean
     episodesToWatch: number
@@ -22,5 +28,7 @@ declare global {
     countdown: EpisodesTransformed | null
     episodes: EpisodesTransformed[]
     watchingWith: WatchPartner[]
+    tags: ShowTag[]
+    rewatch: boolean
   }
 }

From f73903024714f2593801449e610db960ea6494b0 Mon Sep 17 00:00:00 2001
From: Joe <joe@joebailey.xyz>
Date: Sun, 14 Jun 2026 21:47:06 +0100
Subject: [PATCH 2/2] Ensure watched shows are included on all shows page

---
 server/api/shows.get.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/api/shows.get.ts b/server/api/shows.get.ts
index d7571e7..b3d1e77 100644
--- a/server/api/shows.get.ts
+++ b/server/api/shows.get.ts
@@ -94,11 +94,13 @@ export default defineEventHandler(async (event: H3Event): Promise<CustomSearch>
               join ${tags} t on t.id = st.tagId
               where st.showId = ${tvShows.id} and t.slug = 'rewatch'
             )`
-            : sql`not exists (
+            : showCategory
+              ? sql`not exists (
               select 1 from ${showTags} st
               join ${tags} t on t.id = st.tagId
               where st.showId = ${tvShows.id} and t.slug = 'rewatch'
             )`
+              : sql`1=1`
         )
       )