Added actor merge comment.

2026-07-13 03:58:29 +02:00
parent f42a48dbcc
commit 6e82d2af37
3 changed files with 24 additions and 3 deletions
@@ -809,7 +809,7 @@ export async function createActor(newActor, context, reqUser) {
 	return curateActor(actorEntry);
 }

-export async function mergeActors(targetActorId, sourceActorIds, reqUser) {
+export async function mergeActors(targetActorId, sourceActorIds, comment, reqUser) {
 	if (!verifyAbility(reqUser, 'actor', 'merge')) {
 		throw new HttpError('You are not permitted to merge actors', 403);
 	}
@@ -981,6 +981,7 @@ export async function mergeActors(targetActorId, sourceActorIds, reqUser) {
 					base: baseTargetActor,
 					deltas: targetDeltas,
 				}),
+				comment,
 				reviewed_by: reqUser.id,
 				reviewed_at: knex.fn.now(),
 				applied_at: knex.fn.now(),
@@ -1009,6 +1010,7 @@ export async function mergeActors(targetActorId, sourceActorIds, reqUser) {
 						base: baseSourceActor,
 						deltas: targetDeltas,
 					}),
+					comment,
 					reviewed_by: reqUser.id,
 					reviewed_at: knex.fn.now(),
 					applied_at: knex.fn.now(),