Code cleanup, bug squashing

[bookstack] / app / Http / Controllers / CommentController.php

diff --git a/app/Http/Controllers/CommentController.php b/app/Http/Controllers/CommentController.php
index 7bf0a2aacde5f1779b3bf093e7866de18db0cb2d..bf1a76f518f3ce70f2792bd1138bc309ca961d4d 100644 (file)
--- a/app/Http/Controllers/CommentController.php
+++ b/app/Http/Controllers/CommentController.php
@@ -1,50 +1,37 @@
 <?php namespace BookStack\Http\Controllers;
 
 use Activity;
 <?php namespace BookStack\Http\Controllers;
 
 use Activity;

-use BookStack\Repos\CommentRepo;
-use BookStack\Repos\EntityRepo;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
+use BookStack\Actions\ActivityType;
+use BookStack\Actions\CommentRepo;
+use BookStack\Entities\Models\Page;

 use Illuminate\Http\Request;
 use Illuminate\Http\Request;

+use Illuminate\Validation\ValidationException;

 
 class CommentController extends Controller
 {
 
 class CommentController extends Controller
 {

-    protected $entityRepo;

     protected $commentRepo;
 
     protected $commentRepo;
 

-    /**
-     * CommentController constructor.
-     * @param EntityRepo $entityRepo
-     * @param CommentRepo $commentRepo
-     */
-    public function __construct(EntityRepo $entityRepo, CommentRepo $commentRepo)
+    public function __construct(CommentRepo $commentRepo)

     {
     {

-        $this->entityRepo = $entityRepo;

         $this->commentRepo = $commentRepo;
         $this->commentRepo = $commentRepo;

-        parent::__construct();

     }
 
     /**
      * Save a new comment for a Page
     }
 
     /**
      * Save a new comment for a Page

-     * @param Request $request
-     * @param integer $pageId
-     * @param null|integer $commentId
-     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\Response
+     * @throws ValidationException

      */
      */

-    public function savePageComment(Request $request, $pageId, $commentId = null)
+    public function savePageComment(Request $request, int $pageId)

     {
         $this->validate($request, [
             'text' => 'required|string',
     {
         $this->validate($request, [
             'text' => 'required|string',

-            'html' => 'required|string',
+            'parent_id' => 'nullable|integer',

         ]);
 
         ]);
 

-        try {
-            $page = $this->entityRepo->getById('page', $pageId, true);
-        } catch (ModelNotFoundException $e) {
+        $page = Page::visible()->find($pageId);
+        if ($page === null) {

             return response('Not found', 404);
         }
 
             return response('Not found', 404);
         }
 

-        $this->checkOwnablePermission('page-view', $page);
-

         // Prevent adding comments to draft pages
         if ($page->draft) {
             return $this->jsonError(trans('errors.cannot_add_comment_to_draft'), 400);
         // Prevent adding comments to draft pages
         if ($page->draft) {
             return $this->jsonError(trans('errors.cannot_add_comment_to_draft'), 400);


@@ -52,41 +39,36 @@ class CommentController extends Controller
 
         // Create a new comment.
         $this->checkPermission('comment-create-all');
 
         // Create a new comment.
         $this->checkPermission('comment-create-all');

-        $comment = $this->commentRepo->create($page, $request->only(['html', 'text', 'parent_id']));
-        Activity::add($page, 'commented_on', $page->book->id);
-        return view('comments/comment', ['comment' => $comment]);
+        $comment = $this->commentRepo->create($page, $request->get('text'), $request->get('parent_id'));
+        return view('comments.comment', ['comment' => $comment]);

     }
 
     /**
      * Update an existing comment.
     }
 
     /**
      * Update an existing comment.

-     * @param Request $request
-     * @param integer $commentId
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @throws ValidationException

      */
      */

-    public function update(Request $request, $commentId)
+    public function update(Request $request, int $commentId)

     {
         $this->validate($request, [
             'text' => 'required|string',
     {
         $this->validate($request, [
             'text' => 'required|string',

-            'html' => 'required|string',

         ]);
 
         $comment = $this->commentRepo->getById($commentId);
         $this->checkOwnablePermission('page-view', $comment->entity);
         $this->checkOwnablePermission('comment-update', $comment);
 
         ]);
 
         $comment = $this->commentRepo->getById($commentId);
         $this->checkOwnablePermission('page-view', $comment->entity);
         $this->checkOwnablePermission('comment-update', $comment);
 

-        $comment = $this->commentRepo->update($comment, $request->only(['html', 'text']));
-        return view('comments/comment', ['comment' => $comment]);
+        $comment = $this->commentRepo->update($comment, $request->get('text'));
+        return view('comments.comment', ['comment' => $comment]);

     }
 
     /**
      * Delete a comment from the system.
     }
 
     /**
      * Delete a comment from the system.

-     * @param integer $id
-     * @return \Illuminate\Http\JsonResponse

      */
      */

-    public function destroy($id)
+    public function destroy(int $id)

     {
         $comment = $this->commentRepo->getById($id);
         $this->checkOwnablePermission('comment-delete', $comment);
     {
         $comment = $this->commentRepo->getById($id);
         $this->checkOwnablePermission('comment-delete', $comment);

+

         $this->commentRepo->delete($comment);
         return response()->json(['message' => trans('entities.comment_deleted')]);
     }
         $this->commentRepo->delete($comment);
         return response()->json(['message' => trans('entities.comment_deleted')]);
     }