Make building of search results work for multi-byte encoded characters

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

diff --git a/app/Entities/Models/Chapter.php b/app/Entities/Models/Chapter.php
index 257b19e37e45afe981ffeb7cf6ccfcd82cdefec3..08d6608a9e4a5fc77578f50db98100cec91f659f 100644 (file)
--- a/app/Entities/Models/Chapter.php
+++ b/app/Entities/Models/Chapter.php
@@ -1,24 +1,32 @@
-<?php namespace BookStack\Entities\Models;
+<?php

 
 

+namespace BookStack\Entities\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\HasMany;

 use Illuminate\Support\Collection;
 
 /**
 use Illuminate\Support\Collection;
 
 /**

- * Class Chapter
+ * Class Chapter.
+ *

  * @property Collection<Page> $pages
  * @property Collection<Page> $pages

+ * @property string           $description

  */
 class Chapter extends BookChild
 {
  */
 class Chapter extends BookChild
 {

-    public $searchFactor = 1.3;
+    use HasFactory;
+
+    public $searchFactor = 1.2;

 
     protected $fillable = ['name', 'description', 'priority', 'book_id'];
     protected $hidden = ['restricted', 'pivot', 'deleted_at'];
 
     /**
      * Get the pages that this chapter contains.
 
     protected $fillable = ['name', 'description', 'priority', 'book_id'];
     protected $hidden = ['restricted', 'pivot', 'deleted_at'];
 
     /**
      * Get the pages that this chapter contains.

-     * @param string $dir
-     * @return mixed
+     *
+     * @return HasMany<Page>

      */
      */

-    public function pages($dir = 'ASC')
+    public function pages(string $dir = 'ASC'): HasMany

     {
         return $this->hasMany(Page::class)->orderBy('priority', $dir);
     }
     {
         return $this->hasMany(Page::class)->orderBy('priority', $dir);
     }


@@ -26,11 +34,11 @@ class Chapter extends BookChild
     /**
      * Get the url of this chapter.
      */
     /**
      * Get the url of this chapter.
      */

-    public function getUrl($path = ''): string
+    public function getUrl(string $path = ''): string

     {
         $parts = [
             'books',
     {
         $parts = [
             'books',

-            urlencode($this->getAttribute('bookSlug') ?? $this->book->slug),
+            urlencode($this->book_slug ?? $this->book->slug),

             'chapter',
             urlencode($this->slug),
             trim($path, '/'),
             'chapter',
             urlencode($this->slug),
             trim($path, '/'),


@@ -44,7 +52,8 @@ class Chapter extends BookChild
      */
     public function getVisiblePages(): Collection
     {
      */
     public function getVisiblePages(): Collection
     {

-        return $this->pages()->visible()
+        return $this->pages()
+        ->scopes('visible')

         ->orderBy('draft', 'desc')
         ->orderBy('priority', 'asc')
         ->get();
         ->orderBy('draft', 'desc')
         ->orderBy('priority', 'asc')
         ->get();