Added actor merge comment.

src/actors.js

@@ -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(),

src/web/actors.js

@@ -192,7 +192,12 @@ export async function createActorApi(req, res) {
 }
 
 export async function mergeActorsApi(req, res) {
-	const result = await mergeActors(Number(req.params.targetActorId), req.params.sourceActorIds.split(',').map((actorId) => Number(actorId)), req.user);
+	const result = await mergeActors(
+		Number(req.params.targetActorId),
+		req.params.sourceActorIds.split(',').map((actorId) => Number(actorId)),
+		req.body.comment,
+		req.user,
+	);
 
 	res.send(result);
 }