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

Removed inop actor merge avatar conflict ignore.

Browse Source
This commit is contained in:
DebaucheryLibrarian
2026-07-23 23:36:18 +02:00
parent c9e698c906
commit 32b8f00308
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/actors.js
View File

@@ -867,12 +867,9 @@ export async function mergeActors(targetActorId, sourceActorIds, comment, reqUse
.update('alias_for', targetActorId) .update('alias_for', targetActorId)
.whereIn('id', sourceActorIds) .whereIn('id', sourceActorIds)
.returning(['id', 'alias_for']), .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') trx('actors_avatars')
.update('actor_id', targetActorId) .update('actor_id', targetActorId)
.whereIn('actor_id', sourceActorIds) .whereIn('actor_id', sourceActorIds),
.onConflict()
.ignore(),
]); ]);
// multiple source actors may provide profiles for the same entity, but we can only assign one to the target actor; prefer the newest // multiple source actors may provide profiles for the same entity, but we can only assign one to the target actor; prefer the newest