From 98b8bf109f54e2141d52d16cb6b5ea533cbe6d47 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Thu, 17 Oct 2024 09:05:01 +0800
Subject: [PATCH] fix bookmarks sort order when WS does not bump update_at
 (#8264)

---
 app/database/operator/server_data_operator/handlers/channel.ts | 2 +-
 app/queries/servers/channel_bookmark.ts                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/database/operator/server_data_operator/handlers/channel.ts b/app/database/operator/server_data_operator/handlers/channel.ts
index b5f7f3cbe..2bb159aff 100644
--- a/app/database/operator/server_data_operator/handlers/channel.ts
+++ b/app/database/operator/server_data_operator/handlers/channel.ts
@@ -392,7 +392,7 @@ const ChannelHandler = <TBase extends Constructor<ServerDataOperatorBase>>(super
                 return res;
             }
 
-            if (e.updateAt !== b.update_at) {
+            if (e.updateAt !== b.update_at || e.sortOrder !== b.sort_order) {
                 res.createOrUpdateRaws.push(b);
                 if (b.file) {
                     files.push(b.file);
diff --git a/app/queries/servers/channel_bookmark.ts b/app/queries/servers/channel_bookmark.ts
index 9baeeecde..5427eafc4 100644
--- a/app/queries/servers/channel_bookmark.ts
+++ b/app/queries/servers/channel_bookmark.ts
@@ -113,5 +113,5 @@ export const getBookmarksSince = async (database: Database, channelId: string) =
 };
 
 export const observeBookmarks = (database: Database, channelId: string) => {
-    return queryBookmarks(database, channelId).observeWithColumns(['file_id']);
+    return queryBookmarks(database, channelId).observeWithColumns(['update_at', 'sort_order']);
 };