From dbd0fd197323f2a83fab384d7b4b116a02165d16 Mon Sep 17 00:00:00 2001
From: xuatz <xzlow10@gmail.com>
Date: Sun, 18 May 2025 17:21:11 +0900
Subject: fix(search): add new relevance sort order (#1392)

* fix(search): add new relevance sort order

* address pr comments

* some minor fixes

---------

Co-authored-by: Mohamed Bassem <me@mbassem.com>
---
 packages/shared/types/bookmarks.ts |  6 +++---
 packages/trpc/routers/bookmarks.ts | 22 +++++++++++++++++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

(limited to 'packages')

diff --git a/packages/shared/types/bookmarks.ts b/packages/shared/types/bookmarks.ts
index 3cac2845..709fd431 100644
--- a/packages/shared/types/bookmarks.ts
+++ b/packages/shared/types/bookmarks.ts
@@ -12,7 +12,7 @@ export const enum BookmarkTypes {
   UNKNOWN = "unknown",
 }
 
-export const zSortOrder = z.enum(["asc", "desc"]);
+export const zSortOrder = z.enum(["asc", "desc", "relevance"]);
 export type ZSortOrder = z.infer<typeof zSortOrder>;
 
 export const zAssetTypesSchema = z.enum([
@@ -178,7 +178,7 @@ export const zGetBookmarksRequestSchema = z.object({
   // The value is currently not being used, but keeping it so that client can still set it to true for older
   // servers.
   useCursorV2: z.boolean().optional(),
-  sortOrder: zSortOrder.optional().default("desc"),
+  sortOrder: zSortOrder.exclude(["relevance"]).optional().default("desc"),
   includeContent: z.boolean().optional().default(false),
 });
 export type ZGetBookmarksRequest = z.infer<typeof zGetBookmarksRequestSchema>;
@@ -238,6 +238,6 @@ export const zSearchBookmarksRequestSchema = z.object({
   text: z.string(),
   limit: z.number().max(MAX_NUM_BOOKMARKS_PER_PAGE).optional(),
   cursor: zSearchBookmarksCursor.nullish(),
-  sortOrder: zSortOrder.optional().default("desc"),
+  sortOrder: zSortOrder.optional().default("relevance"),
   includeContent: z.boolean().optional().default(false),
 });
diff --git a/packages/trpc/routers/bookmarks.ts b/packages/trpc/routers/bookmarks.ts
index b9a21400..88386657 100644
--- a/packages/trpc/routers/bookmarks.ts
+++ b/packages/trpc/routers/bookmarks.ts
@@ -712,7 +712,7 @@ export const bookmarksAppRouter = router({
       if (!input.limit) {
         input.limit = DEFAULT_NUM_BOOKMARKS_PER_PAGE;
       }
-      const sortOrder = input.sortOrder || "desc";
+      const sortOrder = input.sortOrder || "relevance";
       const client = await getSearchIdxClient();
       if (!client) {
         throw new TRPCError({
@@ -735,11 +735,16 @@ export const bookmarksAppRouter = router({
         filter = [`userId = '${ctx.user.id}'`];
       }
 
+      /**
+       * preserve legacy behaviour
+       */
+      const createdAtSortOrder = sortOrder === "relevance" ? "desc" : sortOrder;
+
       const resp = await client.search(parsedQuery.text, {
         filter,
         showRankingScore: true,
         attributesToRetrieve: ["id"],
-        sort: [`createdAt:${sortOrder}`],
+        sort: [`createdAt:${createdAtSortOrder}`],
         limit: input.limit,
         ...(input.cursor
           ? {
@@ -775,7 +780,18 @@ export const bookmarksAppRouter = router({
           assets: true,
         },
       });
-      results.sort((a, b) => idToRank[b.id] - idToRank[a.id]);
+
+      switch (true) {
+        case sortOrder === "relevance":
+          results.sort((a, b) => idToRank[b.id] - idToRank[a.id]);
+          break;
+        case sortOrder === "desc":
+          results.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime());
+          break;
+        case sortOrder === "asc":
+          results.sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime());
+          break;
+      }
 
       return {
         bookmarks: results.map((b) => toZodSchema(b, input.includeContent)),
-- 
cgit v1.2.3-70-g09d2