A self-hostable bookmark-everything app (links, notes and images) with AI-based automatic tagging and full text search
refactor: drop support for ids in getBookmarks trpc endpoint
Mohamed Bassem590019da338c
diff --git a/packages/benchmarks/src/benchmarks.ts b/packages/benchmarks/src/benchmarks.tsindex 5f3601e4..e7ead4d2 100644--- a/packages/benchmarks/src/benchmarks.ts+++ b/packages/benchmarks/src/benchmarks.ts@@ -74,13 +74,6 @@ export async function runBenchmarks(});});- bench.add("bookmarks.getBookmarks (by ids)", async () => {- await seed.trpc.bookmarks.getBookmarks.query({- ids: sampleIds.slice(0, 20),- includeContent: false,- });- });-// Benchmark with cursor (without listId){const firstPage = await seed.trpc.bookmarks.getBookmarks.query({diff --git a/packages/shared/types/bookmarks.ts b/packages/shared/types/bookmarks.tsindex 7d56c3e1..348c7560 100644--- a/packages/shared/types/bookmarks.ts+++ b/packages/shared/types/bookmarks.ts@@ -285,7 +285,6 @@ export const DEFAULT_NUM_BOOKMARKS_PER_PAGE = 20;export const MAX_NUM_BOOKMARKS_PER_PAGE = 100;export const zGetBookmarksRequestSchema = z.object({- ids: z.array(z.string()).optional(),archived: z.boolean().optional(),favourited: z.boolean().optional(),tagId: z.string().optional(),diff --git a/packages/trpc/models/bookmarks.ts b/packages/trpc/models/bookmarks.tsindex 13fed6d0..77f01c26 100644--- a/packages/trpc/models/bookmarks.ts+++ b/packages/trpc/models/bookmarks.ts@@ -425,7 +425,9 @@ export class Bookmark extends BareBookmark {static async loadMulti(ctx: AuthedContext,- input: z.infer<typeof zGetBookmarksRequestSchema>,+ // `ids` is intentionally not part of the public getBookmarks API; it's+ // only settable by server-side callers (search, smart lists, public lists).+ input: z.infer<typeof zGetBookmarksRequestSchema> & { ids?: string[] },): Promise<{bookmarks: Bookmark[];nextCursor: ZCursor | null;@@ -434,7 +436,11 @@ export class Bookmark extends BareBookmark {return { bookmarks: [], nextCursor: null };}if (!input.limit) {- input.limit = DEFAULT_NUM_BOOKMARKS_PER_PAGE;+ // When loading by ids, callers expect all requested bookmarks back,+ // not a single default-sized page.+ input.limit = input.ids+ ? input.ids.length+ : DEFAULT_NUM_BOOKMARKS_PER_PAGE;}// Validate that only one of listId, tagId, or rssFeedId is specifieddiff --git a/packages/trpc/routers/bookmarks.test.ts b/packages/trpc/routers/bookmarks.test.tsindex 04b249fd..15c9efa2 100644--- a/packages/trpc/routers/bookmarks.test.ts+++ b/packages/trpc/routers/bookmarks.test.ts@@ -335,12 +335,6 @@ describe("Bookmark Routes", () => {expect(bookmarks.bookmarks[0].id).toEqual(bookmark1.id);}- {- const bookmarks = await api.getBookmarks({ ids: [bookmark1.id] });- expect(bookmarks.bookmarks.length).toEqual(1);- expect(bookmarks.bookmarks[0].id).toEqual(bookmark1.id);- }-// Test tagId filter{const tagId = await createTestTag(apiCallers[0], "testTag");