DebaucheryLibrarian/traxxx-web
1
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Enforcing global target actor in merge.

Browse Source
This commit is contained in:
DebaucheryLibrarian
2026-06-09 01:25:34 +02:00
parent f7425cdc03
commit 65af850d68
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/actors.js
View File

@@ -559,6 +559,8 @@ export async function mergeActors(targetActorId, sourceActorId, reqUser) {
const [targetActor, sourceActor] = await Promise.all([ const [targetActor, sourceActor] = await Promise.all([
knex('actors') knex('actors')
.where('id', targetActorId) .where('id', targetActorId)
.whereNull('entity_id')
.whereNull('alias_for')
.first(), .first(),
knex('actors') knex('actors')
.where('id', sourceActorId) .where('id', sourceActorId)