Enforcing global target actor in merge.

2026-06-09 01:25:34 +02:00
parent f7425cdc03
commit 65af850d68
1 changed files with 2 additions and 0 deletions
--- a/src/actors.js
+++ b/src/actors.js
@@ -559,6 +559,8 @@ export async function mergeActors(targetActorId, sourceActorId, reqUser) {
 	const [targetActor, sourceActor] = await Promise.all([
 		knex('actors')
 			.where('id', targetActorId)
+			.whereNull('entity_id')
+			.whereNull('alias_for')
 			.first(),
 		knex('actors')
 			.where('id', sourceActorId)