Moved tag merging to API

public_html/dispatch.php

@@ -129,10 +129,11 @@ $tagValidation =
 \Chibi\Router::register(['TagController', 'relatedView'], 'GET', '/tags-related', $tagValidation);
 \Chibi\Router::register(['TagController', 'renameView'], 'GET', '/tags-rename', $tagValidation);
 \Chibi\Router::register(['TagController', 'renameAction'], 'POST', '/tags-rename', $tagValidation);
+\Chibi\Router::register(['TagController', 'mergeView'], 'GET', '/tags-merge', $tagValidation);
+\Chibi\Router::register(['TagController', 'mergeAction'], 'POST', '/tags-merge', $tagValidation);
 
 foreach (['GET', 'POST'] as $method)
 {
-	\Chibi\Router::register(['TagController', 'mergeAction'], $method, '/tags-merge', $tagValidation);
 	\Chibi\Router::register(['TagController', 'massTagRedirectAction'], $method, '/mass-tag-redirect', $tagValidation);
 
 	$userValidations =

src/Api/Jobs/MergeTagsJob.php

@@ -0,0 +1,35 @@
+<?php
+class MergeTagsJob extends AbstractJob
+{
+	const SOURCE_TAG_NAME = 'source-tag-name';
+	const TARGET_TAG_NAME = 'target-tag-name';
+
+	public function execute()
+	{
+		$sourceTag = $this->getArgument(self::SOURCE_TAG_NAME);
+		$targetTag = $this->getArgument(self::TARGET_TAG_NAME);
+
+		TagModel::removeUnused();
+		TagModel::merge($sourceTag, $targetTag);
+
+		LogHelper::log('{user} merged {source} with {target}', [
+			'user' => TextHelper::reprUser(Auth::getCurrentUser()),
+			'source' => TextHelper::reprTag($sourceTag),
+			'target' => TextHelper::reprTag($targetTag)]);
+	}
+
+	public function requiresPrivilege()
+	{
+		return Privilege::MergeTags;
+	}
+
+	public function requiresAuthentication()
+	{
+		return false;
+	}
+
+	public function requiresConfirmedEmail()
+	{
+		return false;
+	}
+}

src/Controllers/TagController.php

@@ -67,6 +67,12 @@ class TagController
 				}, $ret->entities));
 	}
 
+	public function mergeView()
+	{
+		$context = getContext();
+		$context->viewName = 'tag-list-wrapper';
+	}
+
 	public function mergeAction()
 	{
 		$context = getContext();
@@ -74,22 +80,13 @@ class TagController
 		$context->handleExceptions = true;
 
 		Access::assert(Privilege::MergeTags);
-		if (!InputHelper::get('submit'))
-			return;
 
-		TagModel::removeUnused();
+		Api::run(
-
+			new MergeTagsJob(),
-		$suppliedSourceTag = InputHelper::get('source-tag');
+			[
-		$suppliedSourceTag = TagModel::validateTag($suppliedSourceTag);
+				MergeTagsJob::SOURCE_TAG_NAME => InputHelper::get('source-tag'),
-
+				MergeTagsJob::TARGET_TAG_NAME => InputHelper::get('target-tag'),
-		$suppliedTargetTag = InputHelper::get('target-tag');
+			]);
-		$suppliedTargetTag = TagModel::validateTag($suppliedTargetTag);
-
-		TagModel::merge($suppliedSourceTag, $suppliedTargetTag);
-
-		LogHelper::log('{user} merged {source} with {target}', [
-			'source' => TextHelper::reprTag($suppliedSourceTag),
-			'target' => TextHelper::reprTag($suppliedTargetTag)]);
 
 		Messenger::message('Tags merged successfully.');
 	}

src/Views/tag-list-wrapper.phtml

@@ -4,8 +4,8 @@ Assets::addStylesheet('tag-list.css');
 
 $tabs = [];
 if (Access::check(Privilege::ListTags)) $tabs['list'] = ['List', 'listView'];
-if (Access::check(Privilege::MergeTags)) $tabs['merge'] = ['Merge', 'mergeAction'];
 if (Access::check(Privilege::RenameTags)) $tabs['rename'] = ['Rename', 'renameView'];
+if (Access::check(Privilege::MergeTags)) $tabs['merge'] = ['Merge', 'mergeView'];
 if (Access::check(Privilege::MassTag)) $tabs['mass-tag-redirect'] = ['Mass tag', 'massTagRedirectAction'];
 $showTabs = count($tabs) > 1;
 ?>