@serifpersia/dango 3.4.4 → 3.4.5

package/server/dist/server.js

@@ -12,6 +12,7 @@ import logger from './logger.js';
 import { notifyServerExit } from './lib/ipc.js';
 import { CONFIG } from './config.js';
 import { initializeDatabase, initializeMangaDatabase, initializeTvDatabase, initializeAsmrDatabase, runFullSyncSequence, syncUp, waitForSync, KIND_SYNC, } from './sync.js';
+import { isJasmrApi } from './hono/asmr.js';
 import { loadRemoteProviders } from './providers/remote-loader.js';
 import { discordRPCService } from './discord-rpc.js';
 import { discordGatewayService } from './discord-gateway.js';
@@ -38,7 +39,10 @@ const app = createHonoApp(() => ({ shuttingDown: isShuttingDown, dbReady: !!db }
     getProviders: () => providers,
     getMangaProvider: (name) => mangaProviders[name],
     getTvProvider: (name) => tvProviders[name],
-    getJasmr: () => providers['jasmr'],
+    getJasmr: () => {
+        const mod = providers['jasmr'];
+        return isJasmrApi(mod) ? mod : undefined;
+    },
 });
 const apiCache = new AppCache({ ttlSeconds: 3600, maxKeys: 5000 });
 const providers = {};

package/server/dist/sync.js

@@ -151,13 +151,11 @@ class Mutex {
         });
     }
     unlock() {
-        if (this._waiting.length > 0) {
-            const resolve = this._waiting.shift();
+        const resolve = this._waiting.shift();
+        if (resolve)
             resolve();
-        }
-        else {
+        else
             this._locked = false;
-        }
     }
 }
 const syncMutex = new Mutex();

package/server/dist/trpc/routers/asmr-library.js

@@ -2,23 +2,13 @@ import { TRPCError } from '@trpc/server';
 import { protectedProcedure, router } from '../index.js';
 import { performAsmrWriteTransactionAsync } from '../../sync.js';
 import { buildAsmrId, ASMR_STATUSES, AsmrLibraryRepository, AsmrProgressRepository, } from '../../repositories/asmr.repository.js';
-import { defineSchema, reqObj, reqStr, optStr, reqStrArray } from '../validation.js';
+import { defineSchema, reqObj, reqStr, optStr, reqStrArray, readPageLimit } from '../validation.js';
 const asmrLibraryListInput = () => defineSchema((value) => {
     const obj = reqObj(value);
-    const out = {};
+    const out = { ...readPageLimit(obj) };
     const status = optStr(obj, 'status');
     if (status !== undefined)
         out.status = status;
-    if (obj.page !== undefined && obj.page !== null && obj.page !== '') {
-        const page = Number(obj.page);
-        if (Number.isFinite(page))
-            out.page = page;
-    }
-    if (obj.limit !== undefined && obj.limit !== null && obj.limit !== '') {
-        const limit = Number(obj.limit);
-        if (Number.isFinite(limit))
-            out.limit = limit;
-    }
     return out;
 });
 const asmrLibraryIdInput = () => defineSchema((value) => ({

package/server/dist/trpc/routers/asmr-progress.js

@@ -1,17 +1,10 @@
 import { protectedProcedure, router } from '../index.js';
 import { performAsmrWriteTransactionAsync } from '../../sync.js';
-import { dbAll } from '../../utils/db-utils.js';
+import { adultNonListIds } from '../../utils/db-utils.js';
 import { SettingsRepository } from '../../repositories/settings.repository.js';
 import { AsmrLibraryRepository, AsmrProgressRepository, } from '../../repositories/asmr.repository.js';
-import { defineSchema, reqObj, reqStr, reqStrArray } from '../validation.js';
-async function getAdultNonListWorkIds(db) {
-    const rows = await dbAll(db, `SELECT DISTINCT p.workId as workId
-       FROM asmr_progress p
-       LEFT JOIN asmr_library l ON l.id = p.workId
-       WHERE COALESCE(l.isAdult, p.isAdult) = 1
-         AND l.id IS NULL`);
-    return rows.map((r) => r.workId);
-}
+import { defineSchema, reqObj, reqStr, reqStrArray, strOrNull } from '../validation.js';
+const getAdultNonListWorkIds = (db) => adultNonListIds(db, 'asmr_progress', 'asmr_library', 'workId', 'COALESCE(l.isAdult, p.isAdult) = 1');
 const asmrProgressIdsInput = () => defineSchema((value) => ({
     ids: reqStrArray(reqObj(value), 'ids', true),
 }));
@@ -26,9 +19,9 @@ const asmrProgressSaveInput = () => defineSchema((value) => {
         trackLabel: obj.trackLabel,
         currentTime: obj.currentTime,
         duration: obj.duration,
-        title: obj.title ?? null,
-        thumbnail: obj.thumbnail ?? null,
-        rjCode: obj.rjCode ?? null,
+        title: strOrNull(obj, 'title'),
+        thumbnail: strOrNull(obj, 'thumbnail'),
+        rjCode: strOrNull(obj, 'rjCode'),
         isAdult: obj.isAdult ?? null,
     };
 });
@@ -66,9 +59,9 @@ export const asmrProgressRouter = router({
                 trackLabel: String(input.trackLabel || ''),
                 currentTime: timeNum,
                 duration: durationNum,
-                title: (input.title ?? null),
-                thumbnail: (input.thumbnail ?? null),
-                rjCode: (input.rjCode ?? null),
+                title: input.title ?? null,
+                thumbnail: input.thumbnail ?? null,
+                rjCode: input.rjCode ?? null,
                 isAdult: input.isAdult != null ? Number(input.isAdult) : null,
             });
             await AsmrLibraryRepository.touchProgress(tx, String(input.workId), {
@@ -101,12 +94,7 @@ export const asmrProgressRouter = router({
         .input(asmrContinueListeningInput())
         .query(async ({ ctx, input }) => {
         const limit = Math.min(Math.max(parseInt(String(input.limit ?? 24)) || 24, 1), 100);
-        const ignoreAdultRow = await SettingsRepository.getByKey(ctx.db, 'asmrIgnoreAdultContent');
-        const ignoreAdult = ignoreAdultRow ? ignoreAdultRow.value !== 'false' : true;
-        const listOnlyRow = await SettingsRepository.getByKey(ctx.db, 'asmrCwWatchlistOnly');
-        const listOnly = listOnlyRow
-            ? listOnlyRow.value === 'true' || listOnlyRow.value === '1'
-            : false;
+        const { ignoreAdult, listOnly } = await SettingsRepository.readContinueFlags(ctx.db, 'asmrIgnoreAdultContent', 'asmrCwWatchlistOnly');
         const rows = (await AsmrProgressRepository.getContinueListening(ctx.asmrDb, limit)).filter((row) => {
             if (ignoreAdult && row.isAdult === 1)
                 return false;

package/server/dist/trpc/routers/data.js

@@ -1,6 +1,6 @@
 import { TRPCError } from '@trpc/server';
 import { protectedProcedure, router } from '../index.js';
-import { defineSchema, optStr, reqObj, reqStr } from '../validation.js';
+import { badRequest, defineSchema, failed, optNum, optStr, readCount, reqObj, reqStr, } from '../validation.js';
 import { parseJsonBody } from '../../utils/http.utils.js';
 import { getTrending, getLatestReleases, getSeasonal, getSchedule, searchAnilist, searchAnilistByTitle, getSpotlightBanners, getBatchedHomeData, getGenreTagLists, anilistUnavailable, wasAnilistDownAtBoot, checkAnilistStatus, getShowMetaById, getAnilistEpisodes, parseMalId, getShowMetaByMalId, fromAnilistMedia, } from '../../lib/anilist.js';
 import { malAnimeDetail, malSearchMedia, malSearchTitle } from '../../lib/mal.js';
@@ -14,25 +14,6 @@ import { ShowsMetaRepository } from '../../repositories/shows-meta.repository.js
 import { WatchlistRepository } from '../../repositories/watchlist.repository.js';
 import { dbRun } from '../../utils/db-utils.js';
 import logger from '../../logger.js';
-function failed(message) {
-    return new TRPCError({ code: 'INTERNAL_SERVER_ERROR', message });
-}
-function badRequest(message) {
-    return new TRPCError({ code: 'BAD_REQUEST', message });
-}
-function optInt(obj, name, fallback) {
-    const value = obj[name];
-    if (value === undefined || value === null || value === '')
-        return fallback;
-    return parseInt(String(value), 10) || fallback;
-}
-function optIntOrUndefined(obj, name) {
-    const value = obj[name];
-    if (value === undefined || value === null || value === '')
-        return undefined;
-    const parsed = parseInt(String(value), 10);
-    return Number.isFinite(parsed) ? parsed : undefined;
-}
 async function cached(ctx, key, ttl, validate, produce) {
     const hit = ctx.apiCache.get(key);
     if (hit)
@@ -62,9 +43,9 @@ const dataLatestReleasesInput = () => defineSchema((value) => {
     if (format !== undefined)
         out.format = format;
     if (obj.page !== undefined)
-        out.page = optInt(obj, 'page', 1);
+        out.page = readCount(obj, 'page', 1);
     if (obj.size !== undefined)
-        out.size = optInt(obj, 'size', 12);
+        out.size = readCount(obj, 'size', 12);
     return out;
 });
 const dataSearchInput = () => defineSchema((value) => {
@@ -74,9 +55,9 @@ const dataSearchInput = () => defineSchema((value) => {
     if (query !== undefined)
         out.query = query;
     if (obj.page !== undefined)
-        out.page = optInt(obj, 'page', 1);
+        out.page = readCount(obj, 'page', 1);
     if (obj.limit !== undefined)
-        out.limit = optInt(obj, 'limit', 14);
+        out.limit = readCount(obj, 'limit', 14);
     const sortBy = optStr(obj, 'sortBy');
     if (sortBy !== undefined)
         out.sortBy = sortBy;
@@ -89,7 +70,7 @@ const dataSearchInput = () => defineSchema((value) => {
     const season = optStr(obj, 'season');
     if (season !== undefined)
         out.season = season;
-    const year = optIntOrUndefined(obj, 'year');
+    const year = optNum(obj, 'year');
     if (year !== undefined)
         out.year = year;
     const country = optStr(obj, 'country');
@@ -104,10 +85,10 @@ const dataSearchInput = () => defineSchema((value) => {
     const excludeTags = optStr(obj, 'excludeTags');
     if (excludeTags !== undefined)
         out.excludeTags = excludeTags;
-    const minScore = optIntOrUndefined(obj, 'minScore');
+    const minScore = optNum(obj, 'minScore');
     if (minScore !== undefined)
         out.minScore = minScore;
-    const minEpisodes = optIntOrUndefined(obj, 'minEpisodes');
+    const minEpisodes = optNum(obj, 'minEpisodes');
     if (minEpisodes !== undefined)
         out.minEpisodes = minEpisodes;
     const adult = optStr(obj, 'adult');
@@ -138,9 +119,9 @@ const dataSeasonalInput = () => defineSchema((value) => {
     const obj = reqObj(value);
     const out = {};
     if (obj.page !== undefined)
-        out.page = optInt(obj, 'page', 1);
+        out.page = readCount(obj, 'page', 1);
     if (obj.size !== undefined)
-        out.size = optInt(obj, 'size', 14);
+        out.size = readCount(obj, 'size', 14);
     const format = optStr(obj, 'format');
     if (format !== undefined)
         out.format = format;
@@ -153,9 +134,9 @@ const dataPopularListInput = () => defineSchema((value) => {
     if (sort !== undefined)
         out.sort = sort;
     if (obj.page !== undefined)
-        out.page = optInt(obj, 'page', 1);
+        out.page = readCount(obj, 'page', 1);
     if (obj.size !== undefined)
-        out.size = optInt(obj, 'size', 20);
+        out.size = readCount(obj, 'size', 20);
     return out;
 });
 const dataHomeInput = () => defineSchema((value) => {
@@ -229,16 +210,16 @@ const dataMatureSearchInput = () => defineSchema((value) => {
             out[k] = v;
     }
     if (obj.page !== undefined)
-        out.page = optInt(obj, 'page', 1);
+        out.page = readCount(obj, 'page', 1);
     if (obj.limit !== undefined)
-        out.limit = optInt(obj, 'limit', 14);
-    const year = optIntOrUndefined(obj, 'year');
+        out.limit = readCount(obj, 'limit', 14);
+    const year = optNum(obj, 'year');
     if (year !== undefined)
         out.year = year;
-    const minScore = optIntOrUndefined(obj, 'minScore');
+    const minScore = optNum(obj, 'minScore');
     if (minScore !== undefined)
         out.minScore = minScore;
-    const minEpisodes = optIntOrUndefined(obj, 'minEpisodes');
+    const minEpisodes = optNum(obj, 'minEpisodes');
     if (minEpisodes !== undefined)
         out.minEpisodes = minEpisodes;
     return out;

package/server/dist/trpc/routers/discord.js

@@ -1,18 +1,11 @@
-import { TRPCError } from '@trpc/server';
 import { protectedProcedure, router } from '../index.js';
-import { defineSchema, optStr, reqObj } from '../validation.js';
+import { badRequest, defineSchema, failed, optStr, reqObj } from '../validation.js';
 import { discordRPCService } from '../../discord-rpc.js';
 import { discordGatewayService } from '../../discord-gateway.js';
 import { getDlsitePoster, getMangadexCover } from '../../hono/watchlist.js';
 import { updateEnvFile } from '../../utils/env.utils.js';
 import { CONFIG } from '../../config.js';
 import logger from '../../logger.js';
-function failed(message) {
-    return new TRPCError({ code: 'INTERNAL_SERVER_ERROR', message });
-}
-function badRequest(message) {
-    return new TRPCError({ code: 'BAD_REQUEST', message });
-}
 function maskToken(t) {
     if (!t)
         return 'none';

package/server/dist/trpc/routers/insights.js

@@ -1,12 +1,21 @@
-import { TRPCError } from '@trpc/server';
 import { protectedProcedure, router } from '../index.js';
 import { getWatchInsights, getGenreCards } from '../../lib/insights.js';
 import { computeDiscordSyncStats, getCachedRecommendations, getLinkedDiscordUser, setLinkedDiscordUser, syncDiscordRoles, } from '../../lib/discord-roles-sync.service.js';
-import { defineSchema, reqObj } from '../validation.js';
+import { defineSchema, optStr, reqObj, reqStr } from '../validation.js';
 const discordUserInput = () => defineSchema((value) => {
     if (value === undefined || value === null)
         return {};
-    return { user: reqObj(value).user };
+    const raw = reqObj(value).user;
+    if (raw === undefined || raw === null)
+        return { user: null };
+    const obj = reqObj(raw);
+    return {
+        user: {
+            id: reqStr(obj, 'id'),
+            username: optStr(obj, 'username') ?? '',
+            avatar: optStr(obj, 'avatar') ?? null,
+        },
+    };
 });
 export const insightsRouter = router({
     summary: protectedProcedure.query(async ({ ctx }) => {
@@ -25,19 +34,9 @@ export const insightsRouter = router({
         return { user: await getLinkedDiscordUser(ctx.db) };
     }),
     setDiscordUser: protectedProcedure.input(discordUserInput()).mutation(async ({ ctx, input }) => {
-        const { user } = input;
-        if (user !== null &&
-            user !== undefined &&
-            (typeof user !== 'object' ||
-                typeof user.id !== 'string' ||
-                !user.id)) {
-            throw new TRPCError({
-                code: 'BAD_REQUEST',
-                message: 'Invalid user payload: expected { id, ... } or null',
-            });
-        }
-        await setLinkedDiscordUser(ctx.db, user || null);
-        return { success: true, user: user || null };
+        const user = input.user ?? null;
+        await setLinkedDiscordUser(ctx.db, user);
+        return { success: true, user };
     }),
     discordSyncNow: protectedProcedure.mutation(async ({ ctx }) => {
         return syncDiscordRoles(ctx.db, true);

package/server/dist/trpc/routers/manga-library.js

@@ -2,7 +2,7 @@ import { TRPCError } from '@trpc/server';
 import { protectedProcedure, router } from '../index.js';
 import { performMangaWriteTransactionAsync } from '../../sync.js';
 import { buildMangaId, MANGA_STATUSES, MangaLibraryRepository, MangaProgressRepository, } from '../../repositories/manga.repository.js';
-import { defineSchema, optStr, reqObj } from '../validation.js';
+import { badRequest, defineSchema, failed, optStr, readCount, reqObj, reqStr, } from '../validation.js';
 function mangaDb(ctx) {
     const db = ctx.mangaDb;
     if (!db || db.isClosedCheck())
@@ -14,19 +14,6 @@ function normalizeId(provider, mangaId, idRaw) {
         return idRaw;
     return buildMangaId(provider, mangaId || idRaw || '');
 }
-function badRequest(message) {
-    return new TRPCError({ code: 'BAD_REQUEST', message });
-}
-function failed(message) {
-    return new TRPCError({ code: 'INTERNAL_SERVER_ERROR', message });
-}
-function readCount(obj, name, fallback) {
-    const raw = obj[name];
-    if (raw === undefined || raw === null || raw === '')
-        return fallback;
-    const n = Math.floor(Number(raw));
-    return Number.isFinite(n) ? n : fallback;
-}
 const mangaLibraryListInput = () => defineSchema((value) => {
     const obj = reqObj(value);
     const status = optStr(obj, 'status');
@@ -34,13 +21,9 @@ const mangaLibraryListInput = () => defineSchema((value) => {
     const limit = Math.min(Math.max(readCount(obj, 'limit', 24), 1), 100);
     return { status, page, limit };
 });
-const mangaLibraryIdInput = () => defineSchema((value) => {
-    const obj = reqObj(value);
-    const id = obj.id;
-    if (typeof id !== 'string')
-        throw new Error('id must be a string');
-    return { id };
-});
+const mangaLibraryIdInput = () => defineSchema((value) => ({
+    id: reqStr(reqObj(value), 'id'),
+}));
 const mangaLibraryAddInput = () => defineSchema((value) => {
     const obj = reqObj(value);
     const out = {
@@ -179,7 +162,7 @@ export const mangaLibraryRouter = router({
     setStatus: protectedProcedure
         .input(mangaLibraryStatusInput())
         .mutation(async ({ ctx, input }) => {
-        if (!input.id || !MANGA_STATUSES.includes(input.status)) {
+        if (!input.id || !input.status || !MANGA_STATUSES.includes(input.status)) {
             throw badRequest('id and a valid status are required');
         }
         try {

package/server/dist/trpc/routers/manga-progress.js

@@ -1,19 +1,12 @@
 import { protectedProcedure, router } from '../index.js';
 import { defineSchema, optStr, reqObj, reqStr, reqStrArray } from '../validation.js';
 import { performMangaWriteTransactionAsync } from '../../sync.js';
-import { dbAll } from '../../utils/db-utils.js';
+import { adultNonListIds } from '../../utils/db-utils.js';
 import { SettingsRepository } from '../../repositories/settings.repository.js';
 import { MangaLibraryRepository, MangaProgressRepository, } from '../../repositories/manga.repository.js';
 const MANGA_ADULT_RATINGS = ['erotica', 'pornographic'];
 const isMangaContinueAdult = (row) => !!row.contentRating && MANGA_ADULT_RATINGS.includes(row.contentRating);
-async function getAdultNonListMangaIds(db) {
-    const rows = await dbAll(db, `SELECT DISTINCT p.mangaId as mangaId
-       FROM manga_progress p
-       LEFT JOIN manga_library l ON l.id = p.mangaId
-       WHERE COALESCE(l.contentRating, p.contentRating) IN ('erotica', 'pornographic')
-         AND l.id IS NULL`);
-    return rows.map((r) => r.mangaId);
-}
+const getAdultNonListMangaIds = (db) => adultNonListIds(db, 'manga_progress', 'manga_library', 'mangaId', "COALESCE(l.contentRating, p.contentRating) IN ('erotica', 'pornographic')");
 const mangaIdInput = () => defineSchema((value) => ({
     mangaId: reqStr(reqObj(value), 'mangaId'),
 }));
@@ -102,11 +95,11 @@ export const mangaProgressRouter = router({
                 chapterNumber: String(input.chapterNumber || ''),
                 page: pageNum,
                 pageCount: pageCountNum,
-                title: (input.title ?? null),
-                cover: (input.cover ?? null),
-                provider: (input.provider ?? null),
-                altTitle: (input.altTitle ?? null),
-                contentRating: (input.contentRating ?? null),
+                title: input.title ?? null,
+                cover: input.cover ?? null,
+                provider: input.provider ?? null,
+                altTitle: input.altTitle ?? null,
+                contentRating: input.contentRating ?? null,
             });
             await MangaLibraryRepository.touchProgress(tx, String(input.mangaId), {
                 chapterId: String(input.chapterId),
@@ -141,12 +134,7 @@ export const mangaProgressRouter = router({
         .query(async ({ ctx, input }) => {
         try {
             const limit = Math.min(Math.max(parseInt(String(input.limit)) || 24, 1), 100);
-            const ignoreAdultRow = await SettingsRepository.getByKey(ctx.db, 'mangaIgnoreAdultContent');
-            const ignoreAdult = ignoreAdultRow ? ignoreAdultRow.value !== 'false' : true;
-            const listOnlyRow = await SettingsRepository.getByKey(ctx.db, 'mangaCwWatchlistOnly');
-            const listOnly = listOnlyRow
-                ? listOnlyRow.value === 'true' || listOnlyRow.value === '1'
-                : false;
+            const { ignoreAdult, listOnly } = await SettingsRepository.readContinueFlags(ctx.db, 'mangaIgnoreAdultContent', 'mangaCwWatchlistOnly');
             const rows = (await MangaProgressRepository.getContinueReading(ctx.mangaDb, limit)).filter((row) => {
                 if (ignoreAdult && isMangaContinueAdult(row))
                     return false;

package/server/dist/trpc/routers/music.js

@@ -1,6 +1,6 @@
 import { TRPCError } from '@trpc/server';
 import { protectedProcedure, router } from '../index.js';
-import { defineSchema, optStr, reqObj } from '../validation.js';
+import { badRequest, defineSchema, failed, optStr, reqObj } from '../validation.js';
 import logger from '../../logger.js';
 import { getInnertube, getAuthedInnertube, refreshAuthedInnertube, saveMusicCookie, getMusicAuthStatus, signOutMusic, isParserVariantError, } from '../../lib/ytmusic.js';
 const NAME_SUFFIXES = [
@@ -152,7 +152,8 @@ function upnextToTrack(node, trustLike = false) {
 }
 function parseUpnext(panel, trustLike) {
     const tracks = [];
-    const contents = panel.contents ?? [];
+    const shaped = panel;
+    const contents = shaped.contents ?? [];
     for (const item of contents) {
         const track = upnextToTrack(item, trustLike);
         if (track)
@@ -160,7 +161,7 @@ function parseUpnext(panel, trustLike) {
         if (tracks.length >= 50)
             break;
     }
-    const playlistId = panel.playlist_id ?? null;
+    const playlistId = shaped.playlist_id ?? null;
     return { tracks, playlistId };
 }
 function asMenuItems(menu) {
@@ -285,15 +286,9 @@ async function readLibrary(yt) {
     logger.info(`[music] library parsed tracks=${tracks.length} playlists=${playlists.length} gridItems=${gridItems.length}`);
     return { tracks, playlists };
 }
-function badRequest(message) {
-    return new TRPCError({ code: 'BAD_REQUEST', message });
-}
 function unauthorized(message) {
     return new TRPCError({ code: 'UNAUTHORIZED', message });
 }
-function failed(message) {
-    return new TRPCError({ code: 'INTERNAL_SERVER_ERROR', message });
-}
 const musicSearchInput = () => defineSchema((value) => {
     const obj = reqObj(value);
     const out = {};
@@ -598,8 +593,8 @@ export const musicRouter = router({
             throw unauthorized('MUSIC_AUTH_REQUIRED');
         }
         const attempt = async (session) => {
-            const actions = session.actions ??
-                session.session?.actions;
+            const shaped = session;
+            const actions = shaped.actions ?? shaped.session?.actions;
             if (!actions)
                 throw new Error('Actions unavailable');
             const panel = await session.music.getUpNext(id);

package/server/dist/trpc/routers/queue.js

@@ -68,7 +68,7 @@ export const queueRouter = router({
     }),
     removeMany: protectedProcedure.input(queueRemoveManyInput()).mutation(async ({ ctx, input }) => {
         const showId = await getMigratedId(ctx.db, input.showId);
-        let removed;
+        let removed = [];
         await performWriteTransactionAsync(ctx.db, async (tx) => {
             removed = ((await QueueRepository.getByShow(tx, showId)) || []).map((ep) => ep.episodeNumber);
             const toRemove = Array.isArray(input.episodeNumbers) && input.episodeNumbers.length

package/server/dist/trpc/routers/tracker.js

@@ -5,15 +5,9 @@ import { performWriteTransactionAsync } from '../../sync.js';
 import { AniListTracker } from '../../lib/tracker/anilist-tracker.js';
 import { syncAniList, importFromMalUsername, importFromUsername, } from '../../lib/tracker/sync.service.js';
 import { syncAniListManga, importFromUsernameManga, importMangaFromMalUsername, } from '../../lib/tracker/manga-sync.service.js';
-import { defineSchema, reqObj } from '../validation.js';
+import { badRequest, defineSchema, failed, reqObj } from '../validation.js';
 const TRACKER_TOKEN_KEY = 'tracker_anilist_token';
 const TRACKER_USER_KEY = 'tracker_anilist_user';
-function badRequest(message) {
-    return new TRPCError({ code: 'BAD_REQUEST', message });
-}
-function failed(message) {
-    return new TRPCError({ code: 'INTERNAL_SERVER_ERROR', message });
-}
 function unavailable(message) {
     return new TRPCError({ code: 'SERVICE_UNAVAILABLE', message });
 }

package/server/dist/trpc/routers/tv-library.js

@@ -2,26 +2,16 @@ import { TRPCError } from '@trpc/server';
 import { protectedProcedure, router } from '../index.js';
 import { performTvWriteTransactionAsync } from '../../sync.js';
 import { buildTvId, TV_STATUSES, TvLibraryRepository, TvProgressRepository, } from '../../repositories/tv.repository.js';
-import { defineSchema, reqObj, reqStr, optStr, reqStrArray } from '../validation.js';
+import { defineSchema, reqObj, reqStr, optStr, reqStrArray, readPageLimit } from '../validation.js';
 function normalizeMediaType(raw) {
     return String(raw).toLowerCase() === 'movie' ? 'movie' : 'tv';
 }
 const tvLibraryListInput = () => defineSchema((value) => {
     const obj = reqObj(value);
-    const out = {};
+    const out = { ...readPageLimit(obj) };
     const status = optStr(obj, 'status');
     if (status !== undefined)
         out.status = status;
-    if (obj.page !== undefined && obj.page !== null && obj.page !== '') {
-        const page = Number(obj.page);
-        if (Number.isFinite(page))
-            out.page = page;
-    }
-    if (obj.limit !== undefined && obj.limit !== null && obj.limit !== '') {
-        const limit = Number(obj.limit);
-        if (Number.isFinite(limit))
-            out.limit = limit;
-    }
     return out;
 });
 const tvLibraryIdInput = () => defineSchema((value) => ({

package/server/dist/trpc/routers/tv-progress.js

@@ -1,19 +1,12 @@
 import { TRPCError } from '@trpc/server';
 import { protectedProcedure, router } from '../index.js';
 import { performTvWriteTransactionAsync } from '../../sync.js';
-import { dbAll } from '../../utils/db-utils.js';
+import { adultNonListIds } from '../../utils/db-utils.js';
 import { SettingsRepository } from '../../repositories/settings.repository.js';
 import { normalizeTvMediaId, TvLibraryRepository, TvProgressRepository, } from '../../repositories/tv.repository.js';
-import { defineSchema, reqObj, reqStr } from '../validation.js';
+import { defineSchema, reqObj, reqStr, strOrNull } from '../validation.js';
 const isTvContinueAdult = (row) => row.adult === true || row.adult === 1;
-async function getAdultNonListMediaIds(db) {
-    const rows = await dbAll(db, `SELECT DISTINCT p.mediaId as mediaId
-       FROM tv_progress p
-       LEFT JOIN tv_library l ON l.id = p.mediaId
-       WHERE COALESCE(l.adult, p.adult) = 1
-         AND l.id IS NULL`);
-    return rows.map((r) => r.mediaId);
-}
+const getAdultNonListMediaIds = (db) => adultNonListIds(db, 'tv_progress', 'tv_library', 'mediaId', 'COALESCE(l.adult, p.adult) = 1');
 const tvProgressMediaInput = () => defineSchema((value) => ({
     mediaId: reqStr(reqObj(value), 'mediaId'),
 }));
@@ -30,13 +23,13 @@ const tvProgressSaveInput = () => defineSchema((value) => {
         currentTime: obj.currentTime,
         duration: obj.duration,
         completed: obj.completed,
-        title: obj.title ?? null,
-        poster: obj.poster ?? null,
-        backdrop: obj.backdrop ?? null,
-        year: obj.year ?? null,
-        overview: obj.overview ?? null,
+        title: strOrNull(obj, 'title'),
+        poster: strOrNull(obj, 'poster'),
+        backdrop: strOrNull(obj, 'backdrop'),
+        year: strOrNull(obj, 'year'),
+        overview: strOrNull(obj, 'overview'),
         tmdbId: obj.tmdbId ?? null,
-        mediaType: obj.mediaType ?? null,
+        mediaType: strOrNull(obj, 'mediaType'),
         adult: obj.adult ?? null,
     };
 });
@@ -95,13 +88,13 @@ export const tvProgressRouter = router({
                 currentTime: storedTime,
                 duration: durationNum,
                 completed: completedNow,
-                title: (input.title ?? null),
-                poster: (input.poster ?? null),
-                backdrop: (input.backdrop ?? null),
-                year: (input.year ?? null),
-                overview: (input.overview ?? null),
+                title: input.title ?? null,
+                poster: input.poster ?? null,
+                backdrop: input.backdrop ?? null,
+                year: input.year ?? null,
+                overview: input.overview ?? null,
                 tmdbId: input.tmdbId != null ? Number(input.tmdbId) : null,
-                mediaType: (input.mediaType ?? null),
+                mediaType: input.mediaType ?? null,
                 adult: input.adult != null ? Number(input.adult) : null,
             });
             await TvLibraryRepository.touchProgress(tx, String(mediaId), {
@@ -139,12 +132,7 @@ export const tvProgressRouter = router({
         .input(tvContinueWatchingInput())
         .query(async ({ ctx, input }) => {
         const limit = Math.min(Math.max(parseInt(String(input.limit ?? 24)) || 24, 1), 100);
-        const ignoreAdultRow = await SettingsRepository.getByKey(ctx.db, 'tvIgnoreAdultContent');
-        const ignoreAdult = ignoreAdultRow ? ignoreAdultRow.value !== 'false' : true;
-        const listOnlyRow = await SettingsRepository.getByKey(ctx.db, 'tvCwWatchlistOnly');
-        const listOnly = listOnlyRow
-            ? listOnlyRow.value === 'true' || listOnlyRow.value === '1'
-            : false;
+        const { ignoreAdult, listOnly } = await SettingsRepository.readContinueFlags(ctx.db, 'tvIgnoreAdultContent', 'tvCwWatchlistOnly');
         const rows = (await TvProgressRepository.getContinueWatching(ctx.tvDb, limit)).filter((row) => {
             if (ignoreAdult && isTvContinueAdult(row))
                 return false;