From 21eaeeaecf6987a234c265a1e54979c24fac6c9f Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Tue, 15 Oct 2024 02:19:04 +0300 Subject: [PATCH] hicli/sync: always set sorting timestamp for new rooms --- hicli/database/room.go | 2 +- hicli/sync.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hicli/database/room.go b/hicli/database/room.go index c20ed2c5..d9293cf8 100644 --- a/hicli/database/room.go +++ b/hicli/database/room.go @@ -27,7 +27,7 @@ const ( preview_event_rowid, sorting_timestamp, prev_batch FROM room ` - getRoomsBySortingTimestampQuery = getRoomBaseQuery + `WHERE sorting_timestamp < $1 ORDER BY sorting_timestamp DESC LIMIT $2` + getRoomsBySortingTimestampQuery = getRoomBaseQuery + `WHERE sorting_timestamp < $1 AND sorting_timestamp > 0 ORDER BY sorting_timestamp DESC LIMIT $2` getRoomByIDQuery = getRoomBaseQuery + `WHERE room_id = $1` ensureRoomExistsQuery = ` INSERT INTO room (room_id) VALUES ($1) diff --git a/hicli/sync.go b/hicli/sync.go index a6da9517..16930b59 100644 --- a/hicli/sync.go +++ b/hicli/sync.go @@ -161,7 +161,7 @@ func (h *HiClient) processSyncJoinedRoom(ctx context.Context, roomID id.RoomID, if err != nil { return fmt.Errorf("failed to ensure room row exists: %w", err) } - existingRoomData = &database.Room{ID: roomID} + existingRoomData = &database.Room{ID: roomID, SortingTimestamp: jsontime.UnixMilliNow()} } for _, evt := range room.AccountData.Events {