Fixed occurances of altered titles in search results

[bookstack] / app / Entities / Models / Entity.php

diff --git a/app/Entities/Models/Entity.php b/app/Entities/Models/Entity.php
index 29853fe309760807d3b1fa17606e996e1754ca9d..4c4e55bb83f29319962e0797538b3c7bc58af143 100644 (file)
--- a/app/Entities/Models/Entity.php
+++ b/app/Entities/Models/Entity.php
@@ -1,13 +1,23 @@
-<?php namespace BookStack\Entities;
+<?php
+
+namespace BookStack\Entities\Models;

 
 use BookStack\Actions\Activity;
 use BookStack\Actions\Comment;
 
 use BookStack\Actions\Activity;
 use BookStack\Actions\Comment;

+use BookStack\Actions\Favourite;

 use BookStack\Actions\Tag;
 use BookStack\Actions\View;
 use BookStack\Auth\Permissions\EntityPermission;
 use BookStack\Auth\Permissions\JointPermission;
 use BookStack\Actions\Tag;
 use BookStack\Actions\View;
 use BookStack\Auth\Permissions\EntityPermission;
 use BookStack\Auth\Permissions\JointPermission;

+use BookStack\Entities\Tools\SearchIndex;
+use BookStack\Entities\Tools\SlugGenerator;

 use BookStack\Facades\Permissions;
 use BookStack\Facades\Permissions;

-use BookStack\Ownable;
+use BookStack\Interfaces\Favouritable;
+use BookStack\Interfaces\Sluggable;
+use BookStack\Interfaces\Viewable;
+use BookStack\Model;
+use BookStack\Traits\HasCreatorAndUpdater;
+use BookStack\Traits\HasOwner;

 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;


@@ -19,23 +29,26 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * The base class for book-like items such as pages, chapters & books.
  * This is not a database model in itself but extended.
  *
  * The base class for book-like items such as pages, chapters & books.
  * This is not a database model in itself but extended.
  *

- * @property int $id
- * @property string $name
- * @property string $slug
- * @property Carbon $created_at
- * @property Carbon $updated_at
- * @property int $created_by
- * @property int $updated_by
- * @property boolean $restricted
+ * @property int        $id
+ * @property string     $name
+ * @property string     $slug
+ * @property Carbon     $created_at
+ * @property Carbon     $updated_at
+ * @property int        $created_by
+ * @property int        $updated_by
+ * @property bool       $restricted

  * @property Collection $tags
  * @property Collection $tags

+ *

  * @method static Entity|Builder visible()
  * @method static Entity|Builder hasPermission(string $permission)
  * @method static Builder withLastView()
  * @method static Builder withViewCount()
  */
  * @method static Entity|Builder visible()
  * @method static Entity|Builder hasPermission(string $permission)
  * @method static Builder withLastView()
  * @method static Builder withViewCount()
  */

-class Entity extends Ownable
+abstract class Entity extends Model implements Sluggable, Favouritable, Viewable

 {
     use SoftDeletes;
 {
     use SoftDeletes;

+    use HasCreatorAndUpdater;
+    use HasOwner;

 
     /**
      * @var string - Name of property where the main text content is found
 
     /**
      * @var string - Name of property where the main text content is found


@@ -50,7 +63,7 @@ class Entity extends Ownable
     /**
      * Get the entities that are visible to the current user.
      */
     /**
      * Get the entities that are visible to the current user.
      */

-    public function scopeVisible(Builder $query)
+    public function scopeVisible(Builder $query): Builder

     {
         return $this->scopeHasPermission($query, 'view');
     }
     {
         return $this->scopeHasPermission($query, 'view');
     }


@@ -92,24 +105,18 @@ class Entity extends Ownable
     /**
      * Compares this entity to another given entity.
      * Matches by comparing class and id.
     /**
      * Compares this entity to another given entity.
      * Matches by comparing class and id.

-     * @param $entity
-     * @return bool

      */
      */

-    public function matches($entity)
+    public function matches(self $entity): bool

     {
         return [get_class($this), $this->id] === [get_class($entity), $entity->id];
     }
 
     /**
     {
         return [get_class($this), $this->id] === [get_class($entity), $entity->id];
     }
 
     /**

-     * Checks if an entity matches or contains another given entity.
-     * @param Entity $entity
-     * @return bool
+     * Checks if the current entity matches or contains the given.

      */
      */

-    public function matchesOrContains(Entity $entity)
+    public function matchesOrContains(self $entity): bool

     {
     {

-        $matches = [get_class($this), $this->id] === [get_class($entity), $entity->id];
-
-        if ($matches) {
+        if ($this->matches($entity)) {

             return true;
         }
 
             return true;
         }
 


@@ -126,9 +133,8 @@ class Entity extends Ownable
 
     /**
      * Gets the activity objects for this entity.
 
     /**
      * Gets the activity objects for this entity.

-     * @return MorphMany

      */
      */

-    public function activity()
+    public function activity(): MorphMany

     {
         return $this->morphMany(Activity::class, 'entity')
             ->orderBy('created_at', 'desc');
     {
         return $this->morphMany(Activity::class, 'entity')
             ->orderBy('created_at', 'desc');


@@ -137,36 +143,33 @@ class Entity extends Ownable
     /**
      * Get View objects for this entity.
      */
     /**
      * Get View objects for this entity.
      */

-    public function views()
+    public function views(): MorphMany

     {
         return $this->morphMany(View::class, 'viewable');
     }
 
     /**
      * Get the Tag models that have been user assigned to this entity.
     {
         return $this->morphMany(View::class, 'viewable');
     }
 
     /**
      * Get the Tag models that have been user assigned to this entity.

-     * @return MorphMany

      */
      */

-    public function tags()
+    public function tags(): MorphMany

     {
         return $this->morphMany(Tag::class, 'entity')->orderBy('order', 'asc');
     }
 
     /**
     {
         return $this->morphMany(Tag::class, 'entity')->orderBy('order', 'asc');
     }
 
     /**

-     * Get the comments for an entity
-     * @param bool $orderByCreated
-     * @return MorphMany
+     * Get the comments for an entity.

      */
      */

-    public function comments($orderByCreated = true)
+    public function comments(bool $orderByCreated = true): MorphMany

     {
         $query = $this->morphMany(Comment::class, 'entity');
     {
         $query = $this->morphMany(Comment::class, 'entity');

+

         return $orderByCreated ? $query->orderBy('created_at', 'asc') : $query;
     }
 
     /**
      * Get the related search terms.
         return $orderByCreated ? $query->orderBy('created_at', 'asc') : $query;
     }
 
     /**
      * Get the related search terms.

-     * @return MorphMany

      */
      */

-    public function searchTerms()
+    public function searchTerms(): MorphMany

     {
         return $this->morphMany(SearchTerm::class, 'entity');
     }
     {
         return $this->morphMany(SearchTerm::class, 'entity');
     }


@@ -174,18 +177,15 @@ class Entity extends Ownable
     /**
      * Get this entities restrictions.
      */
     /**
      * Get this entities restrictions.
      */

-    public function permissions()
+    public function permissions(): MorphMany

     {
         return $this->morphMany(EntityPermission::class, 'restrictable');
     }
 
     /**
      * Check if this entity has a specific restriction set against it.
     {
         return $this->morphMany(EntityPermission::class, 'restrictable');
     }
 
     /**
      * Check if this entity has a specific restriction set against it.

-     * @param $role_id
-     * @param $action
-     * @return bool

      */
      */

-    public function hasRestriction($role_id, $action)
+    public function hasRestriction(int $role_id, string $action): bool

     {
         return $this->permissions()->where('role_id', '=', $role_id)
             ->where('action', '=', $action)->count() > 0;
     {
         return $this->permissions()->where('role_id', '=', $role_id)
             ->where('action', '=', $action)->count() > 0;


@@ -209,7 +209,7 @@ class Entity extends Ownable
 
     /**
      * Check if this instance or class is a certain type of entity.
 
     /**
      * Check if this instance or class is a certain type of entity.

-     * Examples of $type are 'page', 'book', 'chapter'
+     * Examples of $type are 'page', 'book', 'chapter'.

      */
     public static function isA(string $type): bool
     {
      */
     public static function isA(string $type): bool
     {


@@ -217,28 +217,13 @@ class Entity extends Ownable
     }
 
     /**
     }
 
     /**

-     * Get entity type.
-     * @return mixed
+     * Get the entity type as a simple lowercase word.

      */
      */

-    public static function getType()
+    public static function getType(): string

     {
     {

-        return strtolower(static::getClassName());
-    }
+        $className = array_slice(explode('\\', static::class), -1, 1)[0];

 
 

-    /**
-     * Get an instance of an entity of the given type.
-     * @param $type
-     * @return Entity
-     */
-    public static function getEntityInstance($type)
-    {
-        $types = ['Page', 'Book', 'Chapter', 'Bookshelf'];
-        $className = str_replace([' ', '-', '_'], '', ucwords($type));
-        if (!in_array($className, $types)) {
-            return null;
-        }
-
-        return app('BookStack\\Entities\\' . $className);
+        return strtolower($className);

     }
 
     /**
     }
 
     /**


@@ -249,55 +234,43 @@ class Entity extends Ownable
         if (mb_strlen($this->name) <= $length) {
             return $this->name;
         }
         if (mb_strlen($this->name) <= $length) {
             return $this->name;
         }

-        return mb_substr($this->name, 0, $length - 3) . '...';
-    }

 
 

-    /**
-     * Get the body text of this entity.
-     * @return mixed
-     */
-    public function getText()
-    {
-        return $this->{$this->textField};
+        return mb_substr($this->name, 0, $length - 3) . '...';

     }
 
     /**
      * Get an excerpt of this entity's descriptive content to the specified length.
     }
 
     /**
      * Get an excerpt of this entity's descriptive content to the specified length.

-     * @param int $length
-     * @return mixed

      */
      */

-    public function getExcerpt(int $length = 100)
+    public function getExcerpt(int $length = 100): string

     {
     {

-        $text = $this->getText();
+        $text = $this->{$this->textField} ?? '';
+

         if (mb_strlen($text) > $length) {
         if (mb_strlen($text) > $length) {

-            $text = mb_substr($text, 0, $length-3) . '...';
+            $text = mb_substr($text, 0, $length - 3) . '...';

         }
         }

+

         return trim($text);
     }
 
     /**
         return trim($text);
     }
 
     /**

-     * Get the url of this entity
-     * @param $path
-     * @return string
+     * Get the url of this entity.

      */
      */

-    public function getUrl($path = '/')
-    {
-        return $path;
-    }
+    abstract public function getUrl(string $path = '/'): string;

 
     /**
      * Get the parent entity if existing.
      * This is the "static" parent and does not include dynamic
      * relations such as shelves to books.
      */
 
     /**
      * Get the parent entity if existing.
      * This is the "static" parent and does not include dynamic
      * relations such as shelves to books.
      */

-    public function getParent(): ?Entity
+    public function getParent(): ?self

     {
     {

-        if ($this->isA('page')) {
+        if ($this instanceof Page) {

             return $this->chapter_id ? $this->chapter()->withTrashed()->first() : $this->book()->withTrashed()->first();
         }
             return $this->chapter_id ? $this->chapter()->withTrashed()->first() : $this->book()->withTrashed()->first();
         }

-        if ($this->isA('chapter')) {
+        if ($this instanceof Chapter) {

             return $this->book()->withTrashed()->first();
         }
             return $this->book()->withTrashed()->first();
         }

+

         return null;
     }
 
         return null;
     }
 


@@ -311,20 +284,38 @@ class Entity extends Ownable
     }
 
     /**
     }
 
     /**

-     * Index the current entity for search
+     * Index the current entity for search.

      */
     public function indexForSearch()
     {
      */
     public function indexForSearch()
     {

-        $searchService = app()->make(SearchService::class);
-        $searchService->indexEntity(clone $this);
+        app(SearchIndex::class)->indexEntity(clone $this);

     }
 
     /**
     }
 
     /**

-     * Generate and set a new URL slug for this model.
+     * {@inheritdoc}

      */
     public function refreshSlug(): string
     {
      */
     public function refreshSlug(): string
     {

-        $this->slug = (new SlugGenerator)->generate($this);
+        $this->slug = app(SlugGenerator::class)->generate($this);
+

         return $this->slug;
     }
         return $this->slug;
     }

+
+    /**
+     * {@inheritdoc}
+     */
+    public function favourites(): MorphMany
+    {
+        return $this->morphMany(Favourite::class, 'favouritable');
+    }
+
+    /**
+     * Check if the entity is a favourite of the current user.
+     */
+    public function isFavourite(): bool
+    {
+        return $this->favourites()
+            ->where('user_id', '=', user()->id)
+            ->exists();
+    }

 }
 }