Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix bookmarks sort order when WS does not bump update_at #8264

Merged
merged 1 commit into from
Oct 17, 2024
Merged

fix bookmarks sort order when WS does not bump update_at #8264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix bookmarks sort order when WS does not bump update_at
  • Loading branch information
@enahum
enahum committed Oct 15, 2024
commit 59f84a095a730eacbcebd22916bcd950862c4063
2 changes: 1 addition & 1 deletion app/database/operator/server_data_operator/handlers/channel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion app/queries/servers/channel_bookmark.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']);
};