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

Widened actor merge avatar conflict ignore scope.

Browse Source
This commit is contained in:
DebaucheryLibrarian
2026-07-23 23:06:18 +02:00
parent f9e03f47ba
commit 286248e403
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/actors.js
View File

@@ -871,7 +871,7 @@ export async function mergeActors(targetActorId, sourceActorIds, comment, reqUse
trx('actors_avatars') trx('actors_avatars')
.update('actor_id', targetActorId) .update('actor_id', targetActorId)
.whereIn('actor_id', sourceActorIds) .whereIn('actor_id', sourceActorIds)
.onConflict(['profile_id', 'media_id']) .onConflict()
.ignore(), .ignore(),
]); ]);