Integrated Manticore sync, assuming responsibility from traxxx core/legacy.

src/web/actors.js

@@ -5,6 +5,7 @@ import {
 	fetchActors,
 	fetchActorsById,
 	createActor,
+	mergeActors,
 	fetchActorRevisions,
 	createActorRevision,
 	reviewActorRevision,
@@ -26,6 +27,7 @@ export function curateActorsQuery(query) {
 		weight: query.weight?.split(',').map((weight) => Number(weight)),
 		requireAvatar: query.avatar,
 		stashId: Number(query.stashId) || null,
+		isGlobal: !!query.global,
 	};
 }
 
@@ -177,6 +179,12 @@ export async function createActorApi(req, res) {
 	res.send({ actor });
 }
 
+export async function mergeActorsApi(req, res) {
+	const result = await mergeActors(Number(req.params.targetActorId), Number(req.params.sourceActorId), req.user);
+
+	res.send(result);
+}
+
 async function fetchActorRevisionsApi(req, res) {
 	const revisions = await fetchActorRevisions(Number(req.params.revisionId) || null, req.query, req.user);
 
@@ -200,6 +208,8 @@ export const actorsRouter = Router();
 actorsRouter.get('/api/actors', fetchActorsApi);
 actorsRouter.post('/api/actors', createActorApi);
 
+actorsRouter.post('/api/actors/:targetActorId/merge/:sourceActorId', mergeActorsApi);
+
 actorsRouter.get('/api/revisions/actors', fetchActorRevisionsApi);
 actorsRouter.get('/api/revisions/actors/:revisionId', fetchActorRevisionsApi);
 actorsRouter.post('/api/revisions/actors', createActorRevisionApi);