Moved comment removal to API

src/Controllers/CommentController.php

@@ -46,7 +46,7 @@ class CommentController
 		if (InputHelper::get('sender') == 'preview')
 			return $this->previewAction();
 
-		$comment = Api::run(
+		Api::run(
 			new AddCommentJob(),
 			[
 				JobArgs::POST_ID => InputHelper::get('post-id'),
@@ -64,7 +64,7 @@ class CommentController
 		if (InputHelper::get('sender') == 'preview')
 			return $this->previewAction();
 
-		$comment = Api::run(
+		Api::run(
 			new EditCommentJob(),
 			[
 				JobArgs::COMMENT_ID => $id,
@@ -74,15 +74,10 @@ class CommentController
 
 	public function deleteAction($id)
 	{
-		$comment = CommentModel::findById($id);
+		$comment = Api::run(
-
+			new DeleteCommentJob(),
-		Access::assert(
+			[
-			Privilege::DeleteComment,
+				JobArgs::COMMENT_ID => $id,
-			Access::getIdentity($comment->getCommenter()));
+			]);
-
-		CommentModel::remove($comment);
-
-		LogHelper::log('{user} removed comment from {post}', [
-			'post' => TextHelper::reprPost($comment->getPost())]);
 	}
 }

src/Jobs/DeleteCommentJob.php

@@ -0,0 +1,40 @@
+<?php
+class DeleteCommentJob extends AbstractJob
+{
+	protected $comment;
+
+	public function prepare()
+	{
+		$this->comment = CommentModel::findById($this->getArgument(JobArgs::COMMENT_ID));
+	}
+
+	public function execute()
+	{
+		$post = $this->comment->getPost();
+
+		CommentModel::remove($this->comment);
+
+		LogHelper::log('{user} removed comment from {post}', [
+			'user' => TextHelper::reprUser(Auth::getCurrentUser()),
+			'post' => TextHelper::reprPost($post)]);
+	}
+
+	public function requiresPrivilege()
+	{
+		return
+		[
+			Privilege::DeleteComment,
+			Access::getIdentity($this->comment->getCommenter())
+		];
+	}
+
+	public function requiresAuthentication()
+	{
+		return true;
+	}
+
+	public function requiresConfirmedEmail()
+	{
+		return getConfig()->registration->needEmailForCommenting;
+	}
+}

src/Jobs/EditCommentJob.php

@@ -10,7 +10,6 @@ class EditCommentJob extends AbstractJob
 
 	public function execute()
 	{
-		$user = Auth::getCurrentUser();
 		$comment = $this->comment;
 
 		$comment->commentDate = time();
@@ -18,7 +17,7 @@ class EditCommentJob extends AbstractJob
 
 		CommentModel::save($comment);
 		LogHelper::log('{user} edited comment in {post}', [
-			'user' => TextHelper::reprUser($user),
+			'user' => TextHelper::reprUser(Auth::getCurrentUser()),
 			'post' => TextHelper::reprPost($comment->getPost())]);
 
 		return $comment;