hicli/sync: ignore failing to recalculate preview

This commit is contained in:
Tulir Asokan 2025-03-15 12:32:31 +02:00
parent 4262b5abfa
commit 696687f60c
2 changed files with 8 additions and 4 deletions

View file

@ -132,6 +132,9 @@ func (rq *RoomQuery) UpdatePreviewIfLaterOnTimeline(ctx context.Context, roomID
func (rq *RoomQuery) RecalculatePreview(ctx context.Context, roomID id.RoomID) (rowID EventRowID, err error) { func (rq *RoomQuery) RecalculatePreview(ctx context.Context, roomID id.RoomID) (rowID EventRowID, err error) {
err = rq.GetDB().QueryRow(ctx, recalculateRoomPreviewEventQuery, roomID).Scan(&rowID) err = rq.GetDB().QueryRow(ctx, recalculateRoomPreviewEventQuery, roomID).Scan(&rowID)
if errors.Is(err, sql.ErrNoRows) {
err = nil
}
return return
} }

View file

@ -969,10 +969,11 @@ func (h *HiClient) processStateAndTimeline(
updatedRoom.PreviewEventRowID, err = h.DB.Room.RecalculatePreview(ctx, room.ID) updatedRoom.PreviewEventRowID, err = h.DB.Room.RecalculatePreview(ctx, room.ID)
if err != nil { if err != nil {
return fmt.Errorf("failed to recalculate preview event: %w", err) return fmt.Errorf("failed to recalculate preview event: %w", err)
} } else if updatedRoom.PreviewEventRowID != 0 {
_, err = addOldEvent(updatedRoom.PreviewEventRowID, "") _, err = addOldEvent(updatedRoom.PreviewEventRowID, "")
if err != nil { if err != nil {
return fmt.Errorf("failed to get preview event: %w", err) return fmt.Errorf("failed to get preview event: %w", err)
}
} }
} }
// Calculate name from participants if participants changed and current name was generated from participants, or if the room name was unset // Calculate name from participants if participants changed and current name was generated from participants, or if the room name was unset