Skip intermediate login page with single provider

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

diff --git a/app/Entities/Models/Chapter.php b/app/Entities/Models/Chapter.php
index 4514bef036177faa24a6ed422c5bc30ee9a4df25..af4bbd8e3a66238d722272358086aa45f4aa970d 100644 (file)
--- a/app/Entities/Models/Chapter.php
+++ b/app/Entities/Models/Chapter.php
@@ -1,65 +1,50 @@
-<?php namespace BookStack\Entities\Models;
+<?php

 
 

-use BookStack\Entities\Models\BookChild;
-use BookStack\Entities\Models\Page;
+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'];
+    protected $fillable = ['name', 'description', 'priority'];
+    protected $hidden = ['restricted', 'pivot', 'deleted_at'];

 
     /**
      * Get the pages that this chapter contains.
 
     /**
      * 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);
     }
 
     /**
      * Get the url of this chapter.
     {
         return $this->hasMany(Page::class)->orderBy('priority', $dir);
     }
 
     /**
      * Get the url of this chapter.

-     * @param string|bool $path
-     * @return string
-     */
-    public function getUrl($path = false)
-    {
-        $bookSlug = $this->getAttribute('bookSlug') ? $this->getAttribute('bookSlug') : $this->book->slug;
-        $fullPath = '/books/' . urlencode($bookSlug) . '/chapter/' . urlencode($this->slug);
-
-        if ($path !== false) {
-            $fullPath .= '/' . trim($path, '/');
-        }
-
-        return url($fullPath);
-    }
-
-    /**
-     * Get an excerpt of this chapter's description to the specified length or less.
-     * @param int $length
-     * @return string
-     */
-    public function getExcerpt(int $length = 100)
-    {
-        $description = $this->text ?? $this->description;
-        return mb_strlen($description) > $length ? mb_substr($description, 0, $length-3) . '...' : $description;
-    }
-
-    /**
-     * Check if this chapter has any child pages.
-     * @return bool

      */
      */

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

     {
     {

-        return count($this->pages) > 0;
+        $parts = [
+            'books',
+            urlencode($this->book_slug ?? $this->book->slug),
+            'chapter',
+            urlencode($this->slug),
+            trim($path, '/'),
+        ];
+
+        return url('/' . implode('/', $parts));

     }
 
     /**
     }
 
     /**


@@ -67,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();