From 99c6232fde898932d77bab166934f59d3c56d7d1 Mon Sep 17 00:00:00 2001 From: MohamedBassem Date: Sat, 5 Oct 2024 19:22:45 +0000 Subject: fix: Drop the usage of useCursorV2 from the server --- packages/trpc/routers/bookmarks.ts | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) (limited to 'packages/trpc') diff --git a/packages/trpc/routers/bookmarks.ts b/packages/trpc/routers/bookmarks.ts index 44ec6d7a..895e072a 100644 --- a/packages/trpc/routers/bookmarks.ts +++ b/packages/trpc/routers/bookmarks.ts @@ -564,15 +564,13 @@ export const bookmarksAppRouter = router({ ) : undefined, input.cursor - ? input.cursor instanceof Date - ? lte(bookmarks.createdAt, input.cursor) - : or( - lt(bookmarks.createdAt, input.cursor.createdAt), - and( - eq(bookmarks.createdAt, input.cursor.createdAt), - lte(bookmarks.id, input.cursor.id), - ), - ) + ? or( + lt(bookmarks.createdAt, input.cursor.createdAt), + and( + eq(bookmarks.createdAt, input.cursor.createdAt), + lte(bookmarks.id, input.cursor.id), + ), + ) : undefined, ), ) @@ -677,14 +675,10 @@ export const bookmarksAppRouter = router({ let nextCursor = null; if (bookmarksArr.length > input.limit) { const nextItem = bookmarksArr.pop()!; - if (input.useCursorV2) { - nextCursor = { - id: nextItem.id, - createdAt: nextItem.createdAt, - }; - } else { - nextCursor = nextItem.createdAt; - } + nextCursor = { + id: nextItem.id, + createdAt: nextItem.createdAt, + }; } return { bookmarks: bookmarksArr, nextCursor }; -- cgit v1.2.3-70-g09d2