Ignoring actor merge avatar conflicts, put actor merge source IDs in post body.

2026-07-23 22:54:35 +02:00
parent 62d19d1a04
commit b54174eb5e
5 changed files with 12 additions and 5 deletions
@@ -870,7 +870,9 @@ export async function mergeActors(targetActorId, sourceActorIds, comment, reqUse
 			// 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),
+				.whereIn('actor_id', sourceActorIds)
+				.onConflict(['profile_id', 'media_id'])
+				.ignore(),
 		]);

 		// multiple source actors may provide profiles for the same entity, but we can only assign one to the target actor; prefer the newest