Finished migration of last angular code

[bookstack] / app / Comment.php

diff --git a/app/Comment.php b/app/Comment.php
index de01b62128e741c9cf90acc0dd94044b0f4720c7..2800ab21ad3d07a3fca32e28f045eccfad71b787 100644 (file)
--- a/app/Comment.php
+++ b/app/Comment.php
@@ -1,12 +1,10 @@
-<?php
-
-namespace BookStack;
+<?php namespace BookStack;
 
 class Comment extends Ownable
 {
-    public $sub_comments = [];
     protected $fillable = ['text', 'html', 'parent_id'];
-    protected $appends = ['created', 'updated', 'sub_comments'];
+    protected $appends = ['created', 'updated'];
+
     /**
      * Get the entity that this comment belongs to
      * @return \Illuminate\Database\Eloquent\Relations\MorphTo
@@ -17,80 +15,29 @@ class Comment extends Ownable
     }
 
     /**
-     * Get the page that this comment is in.
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * Check if a comment has been updated since creation.
+     * @return bool
      */
-    public function page()
+    public function isUpdated()
     {
-        return $this->belongsTo(Page::class);
+        return $this->updated_at->timestamp > $this->created_at->timestamp;
     }
 
     /**
-     * Get the owner of this comment.
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * Get created date as a relative diff.
+     * @return mixed
      */
-    public function user()
+    public function getCreatedAttribute()
     {
-        return $this->belongsTo(User::class);
+        return $this->created_at->diffForHumans();
     }
 
-    /*
-     * Not being used, but left here because might be used in the future for performance reasons.
+    /**
+     * Get updated date as a relative diff.
+     * @return mixed
      */
-    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, comments.parent_id, '
-                . 'u.name AS created_by_name, u1.name AS updated_by_name, '
-                . '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();
-    }
-
-    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;
-        }
-        $updated = [
-            'day_time_str' => $this->updated_at->toDayDateTimeString(),
-            'diff' => $this->updated_at->diffForHumans()
-        ];
-        return $updated;
-    }
-
-    public function getSubCommentsAttribute() {
-        return $this->sub_comments;
+    public function getUpdatedAttribute()
+    {
+        return $this->updated_at->diffForHumans();
     }
 }