From 65af850d6830ed5270fe8caeb355cbc0b907884c Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <DebaucheryLibrarian@unknown.name>
Date: Tue, 9 Jun 2026 01:25:34 +0200
Subject: [PATCH] Enforcing global target actor in merge.

---
 src/actors.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/actors.js b/src/actors.js
index f55824b..623eda3 100644
--- 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)