X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/138f5d5c4f1570ed041c93ee8a558fe792b16025..refs/pull/2023/head:/app/Entities/Bookshelf.php diff --git a/app/Entities/Bookshelf.php b/app/Entities/Bookshelf.php index 6753c2882..c7ba840e0 100644 --- a/app/Entities/Bookshelf.php +++ b/app/Entities/Bookshelf.php @@ -1,8 +1,10 @@ belongsToMany(Book::class, 'bookshelves_books', 'bookshelf_id', 'book_id')->orderBy('order', 'asc'); + return $this->belongsToMany(Book::class, 'bookshelves_books', 'bookshelf_id', 'book_id') + ->withPivot('order') + ->orderBy('order', 'asc'); + } + + /** + * Related books that are visible to the current user. + */ + public function visibleBooks(): BelongsToMany + { + return $this->books()->visible(); } /** @@ -37,9 +42,9 @@ class Bookshelf extends Entity public function getUrl($path = false) { if ($path !== false) { - return baseUrl('/shelves/' . urlencode($this->slug) . '/' . trim($path, '/')); + return url('/http/source.bookstackapp.com/shelves/' . urlencode($this->slug) . '/' . trim($path, '/')); } - return baseUrl('/shelves/' . urlencode($this->slug)); + return url('/http/source.bookstackapp.com/shelves/' . urlencode($this->slug)); } /** @@ -51,13 +56,13 @@ class Bookshelf extends Entity public function getBookCover($width = 440, $height = 250) { // TODO - Make generic, focused on books right now, Perhaps set-up a better image - $default = baseUrl('/book_default_cover.png'); + $default = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=='; if (!$this->image_id) { return $default; } try { - $cover = $this->cover ? baseUrl($this->cover->getThumb($width, $height, false)) : $default; + $cover = $this->cover ? url($this->cover->getThumb($width, $height, false)) : $default; } catch (\Exception $err) { $cover = $default; } @@ -66,30 +71,52 @@ class Bookshelf extends Entity /** * Get the cover image of the shelf - * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function cover() + public function cover(): BelongsTo { return $this->belongsTo(Image::class, 'image_id'); } + /** + * Get the type of the image model that is used when storing a cover image. + */ + public function coverImageTypeKey(): string + { + return 'cover_shelf'; + } + /** * Get an excerpt of this book's description to the specified length or less. * @param int $length * @return string */ - public function getExcerpt($length = 100) + public function getExcerpt(int $length = 100) { $description = $this->description; - return strlen($description) > $length ? substr($description, 0, $length-3) . '...' : $description; + return mb_strlen($description) > $length ? mb_substr($description, 0, $length-3) . '...' : $description; } /** - * Return a generalised, common raw query that can be 'unioned' across entities. - * @return string + * Check if this shelf contains the given book. + * @param Book $book + * @return bool */ - public function entityRawQuery() + public function contains(Book $book): bool { - return "'BookStack\\\\BookShelf' as entity_type, id, id as entity_id, slug, name, {$this->textField} as text,'' as html, '0' as book_id, '0' as priority, '0' as chapter_id, '0' as draft, created_by, updated_by, updated_at, created_at"; + return $this->books()->where('id', '=', $book->id)->count() > 0; + } + + /** + * Add a book to the end of this shelf. + * @param Book $book + */ + public function appendBook(Book $book) + { + if ($this->contains($book)) { + return; + } + + $maxOrder = $this->books()->max('order'); + $this->books()->attach($book->id, ['order' => $maxOrder + 1]); } }