X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/03e5d61798e6b8df3b4d74b5f3bb1a96fe8199bb..refs/pull/479/head:/app/Comment.php diff --git a/app/Comment.php b/app/Comment.php index e7df32015..de01b6212 100644 --- a/app/Comment.php +++ b/app/Comment.php @@ -1,12 +1,12 @@ belongsTo(User::class); } - public function getCommentsByPage($pageId, $commentId, $pageNum = 0, $limit = 0) { - + /* + * Not being used, but left here because might be used in the future for performance reasons. + */ + public function getPageComments($pageId) { $query = static::newQuery(); $query->join('users AS u', 'comments.created_by', '=', 'u.id'); $query->leftJoin('users AS u1', 'comments.updated_by', '=', 'u1.id'); $query->leftJoin('images AS i', 'i.id', '=', 'u.image_id'); - $query->selectRaw('comments.id, text, html, comments.created_by, comments.updated_by, comments.created_at, comments.updated_at, ' + $query->selectRaw('comments.id, text, html, comments.created_by, comments.updated_by, ' + . 'comments.created_at, comments.updated_at, comments.parent_id, ' . 'u.name AS created_by_name, u1.name AS updated_by_name, ' - . '(SELECT count(c.id) FROM bookstack.comments c WHERE c.parent_id = comments.id AND page_id = ?) AS cnt_sub_comments, i.url AS avatar ', - [$pageId]); + . 'i.url AS avatar '); + $query->whereRaw('page_id = ?', [$pageId]); + $query->orderBy('created_at'); + return $query->get(); + } + + public function getAllPageComments($pageId) { + return self::where('page_id', '=', $pageId)->with(['createdBy' => function($query) { + $query->select('id', 'name', 'image_id'); + }, 'updatedBy' => function($query) { + $query->select('id', 'name'); + }, 'createdBy.avatar' => function ($query) { + $query->select('id', 'path', 'url'); + }])->get(); + } - if (empty($commentId)) { - $query->whereRaw('page_id = ? AND parent_id IS NULL', [$pageId]); - } else { - $query->whereRaw('page_id = ? AND parent_id = ?', [$pageId, $commentId]); + public function getCommentById($commentId) { + return self::where('id', '=', $commentId)->with(['createdBy' => function($query) { + $query->select('id', 'name', 'image_id'); + }, 'updatedBy' => function($query) { + $query->select('id', 'name'); + }, 'createdBy.avatar' => function ($query) { + $query->select('id', 'path', 'url'); + }])->first(); + } + + public function getCreatedAttribute() { + $created = [ + 'day_time_str' => $this->created_at->toDayDateTimeString(), + 'diff' => $this->created_at->diffForHumans() + ]; + return $created; + } + + public function getUpdatedAttribute() { + if (empty($this->updated_at)) { + return null; } - $query->orderBy('created_at'); - return $query; + $updated = [ + 'day_time_str' => $this->updated_at->toDayDateTimeString(), + 'diff' => $this->updated_at->diffForHumans() + ]; + return $updated; + } + + public function getSubCommentsAttribute() { + return $this->sub_comments; } }