commit 176e95a8855422c7e2c42275abdf6f1ed5068848
parent 58b7ccaff155bb017eff5da26f39186fdc806c91
Author: MTRNord <MTRNord@users.noreply.github.com>
Date: Sat, 4 Apr 2026 14:02:54 +0200
further fixes
Signed-off-by: MTRNord <MTRNord@users.noreply.github.com>
Diffstat:
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/apps/talos_cluster/matrix-backup/backup-tool/main.go b/apps/talos_cluster/matrix-backup/backup-tool/main.go
@@ -1541,9 +1541,11 @@ func paginateRoom(ctx context.Context, client *mautrix.Client, roomID id.RoomID,
}
// Incremental run: if this is a DM but we never completed a backward history
- // fetch (e.g. room was missed due to getDMRooms bug on first run), do it now
- // using the cursor position as the start point for backward pagination.
- if isDM && prevBatch != "" {
+ // fetch (e.g. room was missed because it wasn't in m.direct on first run),
+ // do it now using the saved cursor as the start for backward pagination.
+ // Note: prevBatch may be empty for rooms with no new events in a full_state
+ // sync, so we use cursor.Token directly rather than gating on prevBatch.
+ if isDM {
dmDoneData, _ := s3Get(ctx, dmHistoryDoneKey)
if dmDoneData == nil {
slog.Info("DM catch-up: no history marker found, backfilling", "room_id", roomID)