Guest create page: name field autofocus

[bookstack] / app / Actions / CommentRepo.php

diff --git a/app/Actions/CommentRepo.php b/app/Actions/CommentRepo.php
index 3422d141ba05ccec7d1bdf2eb8bdb716057ec9fe..2f2dd658a3c754294e8e45735ba183c5e2cc4d55 100644 (file)
--- a/app/Actions/CommentRepo.php
+++ b/app/Actions/CommentRepo.php
@@ -1,24 +1,21 @@
-<?php namespace BookStack\Actions;
+<?php

 
 

-use BookStack\Actions\Comment;
-use BookStack\Entities\Entity;
+namespace BookStack\Actions;
+
+use BookStack\Entities\Models\Entity;
+use BookStack\Facades\Activity as ActivityService;
+use League\CommonMark\CommonMarkConverter;

 
 /**
 
 /**

- * Class CommentRepo
- * @package BookStack\Repos
+ * Class CommentRepo.

  */
 class CommentRepo
 {
  */
 class CommentRepo
 {

-

     /**
     /**

-     * @var \BookStack\Actions\Comment $comment
+     * @var Comment

      */
     protected $comment;
 
      */
     protected $comment;
 

-    /**
-     * CommentRepo constructor.
-     * @param \BookStack\Actions\Comment $comment
-     */

     public function __construct(Comment $comment)
     {
         $this->comment = $comment;
     public function __construct(Comment $comment)
     {
         $this->comment = $comment;


@@ -26,65 +23,76 @@ class CommentRepo
 
     /**
      * Get a comment by ID.
 
     /**
      * Get a comment by ID.

-     * @param $id
-     * @return \BookStack\Actions\Comment|\Illuminate\Database\Eloquent\Model

      */
      */

-    public function getById($id)
+    public function getById(int $id): Comment

     {
         return $this->comment->newQuery()->findOrFail($id);
     }
 
     /**
      * Create a new comment on an entity.
     {
         return $this->comment->newQuery()->findOrFail($id);
     }
 
     /**
      * Create a new comment on an entity.

-     * @param \BookStack\Entities\Entity $entity
-     * @param array $data
-     * @return \BookStack\Actions\Comment

      */
      */

-    public function create(Entity $entity, $data = [])
+    public function create(Entity $entity, string $text, ?int $parent_id): Comment

     {
         $userId = user()->id;
     {
         $userId = user()->id;

-        $comment = $this->comment->newInstance($data);
+        $comment = $this->comment->newInstance();
+
+        $comment->text = $text;
+        $comment->html = $this->commentToHtml($text);

         $comment->created_by = $userId;
         $comment->updated_by = $userId;
         $comment->local_id = $this->getNextLocalId($entity);
         $comment->created_by = $userId;
         $comment->updated_by = $userId;
         $comment->local_id = $this->getNextLocalId($entity);

+        $comment->parent_id = $parent_id;
+

         $entity->comments()->save($comment);
         $entity->comments()->save($comment);

+        ActivityService::add(ActivityType::COMMENTED_ON, $entity);
+

         return $comment;
     }
 
     /**
      * Update an existing comment.
         return $comment;
     }
 
     /**
      * Update an existing comment.

-     * @param \BookStack\Actions\Comment $comment
-     * @param array $input
-     * @return mixed

      */
      */

-    public function update($comment, $input)
+    public function update(Comment $comment, string $text): Comment

     {
         $comment->updated_by = user()->id;
     {
         $comment->updated_by = user()->id;

-        $comment->update($input);
+        $comment->text = $text;
+        $comment->html = $this->commentToHtml($text);
+        $comment->save();
+

         return $comment;
     }
 
     /**
      * Delete a comment from the system.
         return $comment;
     }
 
     /**
      * Delete a comment from the system.

-     * @param \BookStack\Actions\Comment $comment
-     * @return mixed

      */
      */

-    public function delete($comment)
+    public function delete(Comment $comment): void

     {
     {

-        return $comment->delete();
+        $comment->delete();
+    }
+
+    /**
+     * Convert the given comment Markdown to HTML.
+     */
+    public function commentToHtml(string $commentText): string
+    {
+        $converter = new CommonMarkConverter([
+            'html_input'         => 'strip',
+            'max_nesting_level'  => 10,
+            'allow_unsafe_links' => false,
+        ]);
+
+        return $converter->convertToHtml($commentText);

     }
 
     /**
      * Get the next local ID relative to the linked entity.
     }
 
     /**
      * Get the next local ID relative to the linked entity.

-     * @param \BookStack\Entities\Entity $entity
-     * @return int

      */
      */

-    protected function getNextLocalId(Entity $entity)
+    protected function getNextLocalId(Entity $entity): int

     {
     {

-        $comments = $entity->comments(false)->orderBy('local_id', 'desc')->first();
-        if ($comments === null) {
-            return 1;
-        }
-        return $comments->local_id + 1;
+        /** @var Comment $comment */
+        $comment = $entity->comments(false)->orderBy('local_id', 'desc')->first();
+
+        return ($comment->local_id ?? 0) + 1;

     }
 }
     }
 }