From 32b8f00308edea9c9215c9a5370d89d10ec58e77 Mon Sep 17 00:00:00 2001 From: DebaucheryLibrarian Date: Thu, 23 Jul 2026 23:36:18 +0200 Subject: [PATCH] Removed inop actor merge avatar conflict ignore. --- src/actors.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/actors.js b/src/actors.js index cfc66fd..9cea730 100644 --- a/src/actors.js +++ b/src/actors.js @@ -867,12 +867,9 @@ export async function mergeActors(targetActorId, sourceActorIds, comment, reqUse .update('alias_for', targetActorId) .whereIn('id', sourceActorIds) .returning(['id', 'alias_for']), - // some avatars are not matched to a profile, need to investigate why this happens and the avatar table needs a dedicated actor field trx('actors_avatars') .update('actor_id', targetActorId) - .whereIn('actor_id', sourceActorIds) - .onConflict() - .ignore(), + .whereIn('actor_id', sourceActorIds), ]); // multiple source actors may provide profiles for the same entity, but we can only assign one to the target actor; prefer the newest