From 37e23996479a56b190b9183604f16f490e103d52 Mon Sep 17 00:00:00 2001
From: Jannis Braun <151788261+TheZwiss@users.noreply.github.com>
Date: Thu, 26 Mar 2026 22:21:03 +0100
Subject: [PATCH] fix(migrate): move ownerId fix before federated_id backfill

The federated_id backfill queries WHERE owner_id IS NULL. If the
ownerId fix runs after it, broken 1-on-1 DMs would be skipped.
---
 packages/server/src/db/migrate.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/db/migrate.ts b/packages/server/src/db/migrate.ts
index e5a3feca..a960edc6 100644
--- a/packages/server/src/db/migrate.ts
+++ b/packages/server/src/db/migrate.ts
@@ -497,6 +497,9 @@ export function runMigrations(db: Database.Database): void {
   // ─── Rename canonical_pair_id → federated_id, add group DM columns ───────
   migrateDmChannelsFederatedId(db);
 
+  // ─── Fix ownerId on 1-on-1 DMs (must run before federated_id backfill) ──
+  migrateFixOneOnOneOwnerIds(db);
+
   // ─── Backfill federated_id for existing 1-on-1 DM channels ──────────────
   // (Runs after migrateDmChannelsFederatedId so the federated_id column is guaranteed to exist)
   try {
@@ -607,8 +610,6 @@ export function runMigrations(db: Database.Database): void {
     console.error('Federation mutation log backfill failed (non-fatal):', err);
   }
 
-  migrateFixOneOnOneOwnerIds(db);
-
   console.log('Migrations complete.');
 }