Removed inop actor merge avatar conflict ignore.

This commit is contained in:
2026-07-23 23:36:18 +02:00
parent c9e698c906
commit 32b8f00308

View File

@@ -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