Drawings: Added class to extract drawio data from png files

.env.example

@@ -26,13 +26,6 @@ DB_DATABASE=database_database
 DB_USERNAME=database_username
 DB_PASSWORD=database_user_password
 
-# Storage system to use
-# By default files are stored on the local filesystem, with images being placed in
-# public web space so they can be efficiently served directly by the web-server.
-# For other options with different security levels & considerations, refer to:
-# https://www.bookstackapp.com/docs/admin/upload-config/
-STORAGE_TYPE=local
-
 # Mail system to use
 # Can be 'smtp' or 'sendmail'
 MAIL_DRIVER=smtp

.env.example.complete

@@ -36,14 +36,10 @@ APP_LANG=en
 # APP_LANG will be used if such a header is not provided.
 APP_AUTO_LANG_PUBLIC=true
 
-# Application timezones
-# The first option is used to determine what timezone is used for date storage.
-# Leaving that as "UTC" is advised.
-# The second option is used to set the timezone which will be used for date
-# formatting and display. This defaults to the "APP_TIMEZONE" value.
+# Application timezone
+# Used where dates are displayed such as on exported content.
 # Valid timezone values can be found here: https://www.php.net/manual/en/timezones.php
 APP_TIMEZONE=UTC
-APP_DISPLAY_TIMEZONE=UTC
 
 # Application theme
 # Used to specific a themes/<APP_THEME> folder where BookStack UI

.github/translators.txt

@@ -177,7 +177,7 @@ Alexander Predl (Harveyhase68) :: German
 Rem (Rem9000) :: Dutch
 Michał Stelmach (stelmach-web) :: Polish
 arniom :: French
-REMOVED_USER :: French; German; Dutch; Portuguese, Brazilian; Portuguese; Turkish; 
+REMOVED_USER :: French; Dutch; Portuguese, Brazilian; Portuguese; Turkish; 
 林祖年 (contagion) :: Chinese Traditional
 Siamak Guodarzi (siamakgoudarzi88) :: Persian
 Lis Maestrelo (lismtrl) :: Portuguese, Brazilian
@@ -222,7 +222,7 @@ SmokingCrop :: Dutch
 Maciej Lebiest (Szwendacz) :: Polish
 DiscordDigital :: German; German Informal
 Gábor Marton (dodver) :: Hungarian
-Jakob Åsell (Jasell) :: Swedish
+Jasell :: Swedish
 Ghost_chu (ghostchu) :: Chinese Simplified
 Ravid Shachar (ravidshachar) :: Hebrew
 Helga Guchshenskaya (guchshenskaya) :: Russian
@@ -438,7 +438,7 @@ javadataherian :: Persian
 Ludo-code :: French
 hollsten :: Swedish
 Ngoc Lan Phung (lanpncz) :: Vietnamese
-Worive :: Catalan; French
+Worive :: Catalan
 Илья Скаба (skabailya) :: Russian
 Irjan Olsen (Irch) :: Norwegian Bokmal
 Aleksandar Jovanovic (jovanoviczaleksandar) :: Serbian (Cyrillic)
@@ -489,26 +489,3 @@ Hari (muhhari) :: Indonesian
 仙君御 (xjy) :: Chinese Simplified
 TapioM :: Finnish
 lingb58 :: Chinese Traditional
-Angel Pandey (angel-pandey) :: Nepali
-Supriya Shrestha (supriyashrestha) :: Nepali
-gprabhat :: Nepali
-CellCat :: Chinese Simplified
-Al Desrahim (aldesrahim) :: Indonesian
-ahmad abbaspour (deshneh.dar.diss) :: Persian
-Erjon K. (ekr) :: Albanian
-LiZerui (iamzrli) :: Chinese Traditional
-Ticker (ticker.com) :: Hebrew
-CrazyComputer :: Chinese Simplified
-Firr (FirrV) :: Russian
-João Faro (FaroJoaoFaro) :: Portuguese
-Danilo dos Santos Barbosa (bozochegou) :: Portuguese, Brazilian
-Chris (furesoft) :: German
-Silvia Isern (eiendragon) :: Catalan
-Dennis Kron Pedersen (ahjdp) :: Danish
-iamwhoiamwhoami :: Swedish
-Grogui :: French
-MrCharlesIII :: Arabic
-David Olsen (dawin) :: Danish
-ltnzr :: French
-Frank Holler (holler.frank) :: German; German Informal
-Korab Arifi (korabidev) :: Albanian

.github/workflows/test-migrations.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        php: ['8.2', '8.3', '8.4', '8.5']
+        php: ['8.2', '8.3', '8.4']
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/test-php.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        php: ['8.2', '8.3', '8.4', '8.5']
+        php: ['8.2', '8.3', '8.4']
     steps:
     - uses: actions/checkout@v4
 

app/Access/Controllers/OidcController.php

@@ -9,9 +9,11 @@ use Illuminate\Http\Request;
 
 class OidcController extends Controller
 {
-    public function __construct(
-        protected OidcService $oidcService
-    ) {
+    protected OidcService $oidcService;
+
+    public function __construct(OidcService $oidcService)
+    {
+        $this->oidcService = $oidcService;
         $this->middleware('guard:oidc');
     }
 
@@ -28,7 +30,7 @@ class OidcController extends Controller
             return redirect('/login');
         }
 
-        session()->put('oidc_state', time() . ':' . $loginDetails['state']);
+        session()->flash('oidc_state', $loginDetails['state']);
 
         return redirect($loginDetails['url']);
     }
@@ -39,16 +41,10 @@ class OidcController extends Controller
      */
     public function callback(Request $request)
     {
+        $storedState = session()->pull('oidc_state');
         $responseState = $request->query('state');
-        $splitState =  explode(':', session()->pull('oidc_state', ':'), 2);
-        if (count($splitState) !== 2) {
-            $splitState = [null, null];
-        }
 
-        [$storedStateTime, $storedState] = $splitState;
-        $threeMinutesAgo = time() - 3 * 60;
-
-        if (!$storedState || $storedState !== $responseState || intval($storedStateTime) < $threeMinutesAgo) {
+        if ($storedState !== $responseState) {
             $this->showErrorNotification(trans('errors.oidc_fail_authed', ['system' => config('oidc.name')]));
 
             return redirect('/login');
@@ -66,7 +62,7 @@ class OidcController extends Controller
     }
 
     /**
-     * Log the user out, then start the OIDC RP-initiated logout process.
+     * Log the user out then start the OIDC RP-initiated logout process.
      */
     public function logout()
     {

app/Access/ExternalBaseUserProvider.php

@@ -2,18 +2,33 @@
 
 namespace BookStack\Access;
 
-use BookStack\Users\Models\User;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\UserProvider;
+use Illuminate\Database\Eloquent\Model;
 
 class ExternalBaseUserProvider implements UserProvider
 {
+    public function __construct(
+        protected string $model
+    ) {
+    }
+
+    /**
+     * Create a new instance of the model.
+     */
+    public function createModel(): Model
+    {
+        $class = '\\' . ltrim($this->model, '\\');
+
+        return new $class();
+    }
+
     /**
      * Retrieve a user by their unique identifier.
      */
     public function retrieveById(mixed $identifier): ?Authenticatable
     {
-        return User::query()->find($identifier);
+        return $this->createModel()->newQuery()->find($identifier);
     }
 
     /**
@@ -44,7 +59,10 @@ class ExternalBaseUserProvider implements UserProvider
      */
     public function retrieveByCredentials(array $credentials): ?Authenticatable
     {
-        return User::query()
+        // Search current user base by looking up a uid
+        $model = $this->createModel();
+
+        return $model->newQuery()
             ->where('external_auth_id', $credentials['external_auth_id'])
             ->first();
     }

app/Access/Guards/AsyncExternalBaseSessionGuard.php

@@ -3,18 +3,23 @@
 namespace BookStack\Access\Guards;
 
 /**
- * External Auth Session Guard.
+ * Saml2 Session Guard.
  *
- * The login process for external auth (SAML2/OIDC) is async in nature, meaning it does not fit very well
- * into the default laravel 'Guard' auth flow. Instead, most of the logic is done via the relevant
- * controller and services. This class provides a safer, thin version of SessionGuard.
+ * The saml2 login process is async in nature meaning it does not fit very well
+ * into the default laravel 'Guard' auth flow. Instead most of the logic is done
+ * via the Saml2 controller & Saml2Service. This class provides a safer, thin
+ * version of SessionGuard.
  */
 class AsyncExternalBaseSessionGuard extends ExternalBaseSessionGuard
 {
     /**
      * Validate a user's credentials.
+     *
+     * @param array $credentials
+     *
+     * @return bool
      */
-    public function validate(array $credentials = []): bool
+    public function validate(array $credentials = [])
     {
         return false;
     }
@@ -22,9 +27,12 @@ class AsyncExternalBaseSessionGuard extends ExternalBaseSessionGuard
     /**
      * Attempt to authenticate a user using the given credentials.
      *
+     * @param array $credentials
      * @param bool  $remember
+     *
+     * @return bool
      */
-    public function attempt(array $credentials = [], $remember = false): bool
+    public function attempt(array $credentials = [], $remember = false)
     {
         return false;
     }

app/Access/Guards/ExternalBaseSessionGuard.php

@@ -4,7 +4,7 @@ namespace BookStack\Access\Guards;
 
 use BookStack\Access\RegistrationService;
 use Illuminate\Auth\GuardHelpers;
-use Illuminate\Contracts\Auth\Authenticatable;
+use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\StatefulGuard;
 use Illuminate\Contracts\Auth\UserProvider;
 use Illuminate\Contracts\Session\Session;
@@ -24,31 +24,43 @@ class ExternalBaseSessionGuard implements StatefulGuard
      * The name of the Guard. Typically "session".
      *
      * Corresponds to guard name in authentication configuration.
+     *
+     * @var string
      */
-    protected readonly string $name;
+    protected $name;
 
     /**
      * The user we last attempted to retrieve.
+     *
+     * @var \Illuminate\Contracts\Auth\Authenticatable
      */
-    protected Authenticatable|null $lastAttempted;
+    protected $lastAttempted;
 
     /**
      * The session used by the guard.
+     *
+     * @var \Illuminate\Contracts\Session\Session
      */
-    protected Session $session;
+    protected $session;
 
     /**
      * Indicates if the logout method has been called.
+     *
+     * @var bool
      */
-    protected bool $loggedOut = false;
+    protected $loggedOut = false;
 
     /**
      * Service to handle common registration actions.
+     *
+     * @var RegistrationService
      */
-    protected RegistrationService $registrationService;
+    protected $registrationService;
 
     /**
      * Create a new authentication guard.
+     *
+     * @return void
      */
     public function __construct(string $name, UserProvider $provider, Session $session, RegistrationService $registrationService)
     {
@@ -60,11 +72,13 @@ class ExternalBaseSessionGuard implements StatefulGuard
 
     /**
      * Get the currently authenticated user.
+     *
+     * @return \Illuminate\Contracts\Auth\Authenticatable|null
      */
-    public function user(): Authenticatable|null
+    public function user()
     {
         if ($this->loggedOut) {
-            return null;
+            return;
         }
 
         // If we've already retrieved the user for the current request we can just
@@ -87,11 +101,13 @@ class ExternalBaseSessionGuard implements StatefulGuard
 
     /**
      * Get the ID for the currently authenticated user.
+     *
+     * @return int|null
      */
-    public function id(): int|null
+    public function id()
     {
         if ($this->loggedOut) {
-            return null;
+            return;
         }
 
         return $this->user()
@@ -101,8 +117,12 @@ class ExternalBaseSessionGuard implements StatefulGuard
 
     /**
      * Log a user into the application without sessions or cookies.
+     *
+     * @param array $credentials
+     *
+     * @return bool
      */
-    public function once(array $credentials = []): bool
+    public function once(array $credentials = [])
     {
         if ($this->validate($credentials)) {
             $this->setUser($this->lastAttempted);
@@ -115,8 +135,12 @@ class ExternalBaseSessionGuard implements StatefulGuard
 
     /**
      * Log the given user ID into the application without sessions or cookies.
+     *
+     * @param mixed $id
+     *
+     * @return \Illuminate\Contracts\Auth\Authenticatable|false
      */
-    public function onceUsingId($id): Authenticatable|false
+    public function onceUsingId($id)
     {
         if (!is_null($user = $this->provider->retrieveById($id))) {
             $this->setUser($user);
@@ -129,26 +153,38 @@ class ExternalBaseSessionGuard implements StatefulGuard
 
     /**
      * Validate a user's credentials.
+     *
+     * @param array $credentials
+     *
+     * @return bool
      */
-    public function validate(array $credentials = []): bool
+    public function validate(array $credentials = [])
     {
         return false;
     }
 
     /**
      * Attempt to authenticate a user using the given credentials.
-     * @param bool $remember
+     *
+     * @param array $credentials
+     * @param bool  $remember
+     *
+     * @return bool
      */
-    public function attempt(array $credentials = [], $remember = false): bool
+    public function attempt(array $credentials = [], $remember = false)
     {
         return false;
     }
 
     /**
      * Log the given user ID into the application.
+     *
+     * @param mixed $id
      * @param bool  $remember
+     *
+     * @return \Illuminate\Contracts\Auth\Authenticatable|false
      */
-    public function loginUsingId(mixed $id, $remember = false): Authenticatable|false
+    public function loginUsingId($id, $remember = false)
     {
         // Always return false as to disable this method,
         // Logins should route through LoginService.
@@ -158,9 +194,12 @@ class ExternalBaseSessionGuard implements StatefulGuard
     /**
      * Log a user into the application.
      *
-     * @param bool $remember
+     * @param \Illuminate\Contracts\Auth\Authenticatable $user
+     * @param bool                                       $remember
+     *
+     * @return void
      */
-    public function login(Authenticatable $user, $remember = false): void
+    public function login(AuthenticatableContract $user, $remember = false)
     {
         $this->updateSession($user->getAuthIdentifier());
 
@@ -169,8 +208,12 @@ class ExternalBaseSessionGuard implements StatefulGuard
 
     /**
      * Update the session with the given ID.
+     *
+     * @param string $id
+     *
+     * @return void
      */
-    protected function updateSession(string|int $id): void
+    protected function updateSession($id)
     {
         $this->session->put($this->getName(), $id);
 
@@ -179,8 +222,10 @@ class ExternalBaseSessionGuard implements StatefulGuard
 
     /**
      * Log the user out of the application.
+     *
+     * @return void
      */
-    public function logout(): void
+    public function logout()
     {
         $this->clearUserDataFromStorage();
 
@@ -194,48 +239,62 @@ class ExternalBaseSessionGuard implements StatefulGuard
 
     /**
      * Remove the user data from the session and cookies.
+     *
+     * @return void
      */
-    protected function clearUserDataFromStorage(): void
+    protected function clearUserDataFromStorage()
     {
         $this->session->remove($this->getName());
     }
 
     /**
      * Get the last user we attempted to authenticate.
+     *
+     * @return \Illuminate\Contracts\Auth\Authenticatable
      */
-    public function getLastAttempted(): Authenticatable
+    public function getLastAttempted()
     {
         return $this->lastAttempted;
     }
 
     /**
      * Get a unique identifier for the auth session value.
+     *
+     * @return string
      */
-    public function getName(): string
+    public function getName()
     {
         return 'login_' . $this->name . '_' . sha1(static::class);
     }
 
     /**
      * Determine if the user was authenticated via "remember me" cookie.
+     *
+     * @return bool
      */
-    public function viaRemember(): bool
+    public function viaRemember()
     {
         return false;
     }
 
     /**
      * Return the currently cached user.
+     *
+     * @return \Illuminate\Contracts\Auth\Authenticatable|null
      */
-    public function getUser(): Authenticatable|null
+    public function getUser()
     {
         return $this->user;
     }
 
     /**
      * Set the current user.
+     *
+     * @param \Illuminate\Contracts\Auth\Authenticatable $user
+     *
+     * @return $this
      */
-    public function setUser(Authenticatable $user): self
+    public function setUser(AuthenticatableContract $user)
     {
         $this->user = $user;
 

app/Access/Guards/LdapSessionGuard.php

@@ -35,9 +35,13 @@ class LdapSessionGuard extends ExternalBaseSessionGuard
     /**
      * Validate a user's credentials.
      *
+     * @param array $credentials
+     *
      * @throws LdapException
+     *
+     * @return bool
      */
-    public function validate(array $credentials = []): bool
+    public function validate(array $credentials = [])
     {
         $userDetails = $this->ldapService->getUserDetails($credentials['username']);
 
@@ -53,13 +57,16 @@ class LdapSessionGuard extends ExternalBaseSessionGuard
     /**
      * Attempt to authenticate a user using the given credentials.
      *
+     * @param array $credentials
      * @param bool  $remember
      *
-     * @throws LdapException
+     * @throws LdapException*@throws \BookStack\Exceptions\JsonDebugException
      * @throws LoginAttemptException
      * @throws JsonDebugException
+     *
+     * @return bool
      */
-    public function attempt(array $credentials = [], $remember = false): bool
+    public function attempt(array $credentials = [], $remember = false)
     {
         $username = $credentials['username'];
         $userDetails = $this->ldapService->getUserDetails($username);

app/Access/LoginService.php

@@ -9,7 +9,6 @@ use BookStack\Exceptions\LoginAttemptInvalidUserException;
 use BookStack\Exceptions\StoppedAuthenticationException;
 use BookStack\Facades\Activity;
 use BookStack\Facades\Theme;
-use BookStack\Permissions\Permission;
 use BookStack\Theming\ThemeEvents;
 use BookStack\Users\Models\User;
 use Exception;
@@ -51,7 +50,7 @@ class LoginService
         Theme::dispatch(ThemeEvents::AUTH_LOGIN, $method, $user);
 
         // Authenticate on all session guards if a likely admin
-        if ($user->can(Permission::UsersManage) && $user->can(Permission::UserRolesManage)) {
+        if ($user->can('users-manage') && $user->can('user-roles-manage')) {
             $guards = ['standard', 'ldap', 'saml2', 'oidc'];
             foreach ($guards as $guard) {
                 auth($guard)->login($user);
@@ -96,7 +95,7 @@ class LoginService
     {
         $value = session()->get(self::LAST_LOGIN_ATTEMPTED_SESSION_KEY);
         if (!$value) {
-            return ['user_id' => null, 'method' => null, 'remember' => false];
+            return ['user_id' => null, 'method' => null];
         }
 
         [$id, $method, $remember, $time] = explode(':', $value);
@@ -104,18 +103,18 @@ class LoginService
         if ($time < $hourAgo) {
             $this->clearLastLoginAttempted();
 
-            return ['user_id' => null, 'method' => null, 'remember' => false];
+            return ['user_id' => null, 'method' => null];
         }
 
         return ['user_id' => $id, 'method' => $method, 'remember' => boolval($remember)];
     }
 
     /**
-     * Set the last login-attempted user.
+     * Set the last login attempted user.
      * Must be only used when credentials are correct and a login could be
-     * achieved, but a secondary factor has stopped the login.
+     * achieved but a secondary factor has stopped the login.
      */
-    protected function setLastLoginAttemptedForUser(User $user, string $method, bool $remember): void
+    protected function setLastLoginAttemptedForUser(User $user, string $method, bool $remember)
     {
         session()->put(
             self::LAST_LOGIN_ATTEMPTED_SESSION_KEY,

app/Access/Mfa/MfaSession.php

@@ -11,6 +11,7 @@ class MfaSession
      */
     public function isRequiredForUser(User $user): bool
     {
+        // TODO - Test both these cases
         return $user->mfaValues()->exists() || $this->userRoleEnforcesMfa($user);
     }
 

app/Access/Mfa/MfaValue.php

@@ -4,7 +4,6 @@ namespace BookStack\Access\Mfa;
 
 use BookStack\Users\Models\User;
 use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 /**
@@ -17,8 +16,6 @@ use Illuminate\Database\Eloquent\Model;
  */
 class MfaValue extends Model
 {
-    use HasFactory;
-
     protected static $unguarded = true;
 
     const METHOD_TOTP = 'totp';

app/Access/Saml2Service.php

@@ -51,7 +51,7 @@ class Saml2Service
      * Returns the SAML2 request ID, and the URL to redirect the user to.
      *
      * @throws Error
-     * @return array{url: string, id: ?string}
+     * @returns array{url: string, id: ?string}
      */
     public function logout(User $user): array
     {

app/Access/SocialAccount.php

@@ -5,23 +5,18 @@ namespace BookStack\Access;
 use BookStack\Activity\Models\Loggable;
 use BookStack\App\Model;
 use BookStack\Users\Models\User;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
+ * Class SocialAccount.
+ *
  * @property string $driver
  * @property User   $user
  */
 class SocialAccount extends Model implements Loggable
 {
-    use HasFactory;
+    protected $fillable = ['user_id', 'driver', 'driver_id', 'timestamps'];
 
-    protected $fillable = ['user_id', 'driver', 'driver_id'];
-
-    /**
-     * @return BelongsTo<User, $this>
-     */
-    public function user(): BelongsTo
+    public function user()
     {
         return $this->belongsTo(User::class);
     }

app/Access/SocialDriverManager.php

@@ -55,7 +55,7 @@ class SocialDriverManager
 
     /**
      * Gets the names of the active social drivers, keyed by driver id.
-     * @return array<string, string>
+     * @returns array<string, string>
      */
     public function getActive(): array
     {

app/Activity/ActivityQueries.php

@@ -11,7 +11,6 @@ use BookStack\Entities\Tools\MixedEntityListLoader;
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\Relations\Relation;
 
 class ActivityQueries
@@ -68,7 +67,6 @@ class ActivityQueries
 
         $activity = $query->orderBy('created_at', 'desc')
             ->with(['loggable' => function (Relation $query) {
-                /** @var MorphTo<Entity, Activity> $query */
                 $query->withTrashed();
             }, 'user.avatar'])
             ->skip($count * ($page - 1))

app/Activity/CommentRepo.php

@@ -4,11 +4,10 @@ namespace BookStack\Activity;
 
 use BookStack\Activity\Models\Comment;
 use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\Page;
 use BookStack\Exceptions\NotifyException;
+use BookStack\Exceptions\PrettyException;
 use BookStack\Facades\Activity as ActivityService;
 use BookStack\Util\HtmlDescriptionFilter;
-use Illuminate\Database\Eloquent\Builder;
 
 class CommentRepo
 {
@@ -20,46 +19,11 @@ class CommentRepo
         return Comment::query()->findOrFail($id);
     }
 
-    /**
-     * Get a comment by ID, ensuring it is visible to the user based upon access to the page
-     * which the comment is attached to.
-     */
-    public function getVisibleById(int $id): Comment
-    {
-        return $this->getQueryForVisible()->findOrFail($id);
-    }
-
-    /**
-     * Start a query for comments visible to the user.
-     * @return Builder<Comment>
-     */
-    public function getQueryForVisible(): Builder
-    {
-        return Comment::query()->scopes('visible');
-    }
-
     /**
      * Create a new comment on an entity.
      */
     public function create(Entity $entity, string $html, ?int $parentId, string $contentRef): Comment
     {
-        // Prevent comments being added to draft pages
-        if ($entity instanceof Page && $entity->draft) {
-            throw new \Exception(trans('errors.cannot_add_comment_to_draft'));
-        }
-
-        // Validate parent ID
-        if ($parentId !== null) {
-            $parentCommentExists = Comment::query()
-                ->where('commentable_id', '=', $entity->id)
-                ->where('commentable_type', '=', $entity->getMorphClass())
-                ->where('local_id', '=', $parentId)
-                ->exists();
-            if (!$parentCommentExists) {
-                $parentId = null;
-            }
-        }
-
         $userId = user()->id;
         $comment = new Comment();
 
@@ -74,7 +38,6 @@ class CommentRepo
         ActivityService::add(ActivityType::COMMENT_CREATE, $comment);
         ActivityService::add(ActivityType::COMMENTED_ON, $entity);
 
-        $comment->refresh()->unsetRelations();
         return $comment;
     }
 
@@ -96,7 +59,7 @@ class CommentRepo
     /**
      * Archive an existing comment.
      */
-    public function archive(Comment $comment, bool $log = true): Comment
+    public function archive(Comment $comment): Comment
     {
         if ($comment->parent_id) {
             throw new NotifyException('Only top-level comments can be archived.', '/', 400);
@@ -105,9 +68,7 @@ class CommentRepo
         $comment->archived = true;
         $comment->save();
 
-        if ($log) {
-            ActivityService::add(ActivityType::COMMENT_UPDATE, $comment);
-        }
+        ActivityService::add(ActivityType::COMMENT_UPDATE, $comment);
 
         return $comment;
     }
@@ -115,7 +76,7 @@ class CommentRepo
     /**
      * Un-archive an existing comment.
      */
-    public function unarchive(Comment $comment, bool $log = true): Comment
+    public function unarchive(Comment $comment): Comment
     {
         if ($comment->parent_id) {
             throw new NotifyException('Only top-level comments can be un-archived.', '/', 400);
@@ -124,9 +85,7 @@ class CommentRepo
         $comment->archived = false;
         $comment->save();
 
-        if ($log) {
-            ActivityService::add(ActivityType::COMMENT_UPDATE, $comment);
-        }
+        ActivityService::add(ActivityType::COMMENT_UPDATE, $comment);
 
         return $comment;
     }

app/Activity/Controllers/AuditLogApiController.php

@@ -4,7 +4,6 @@ namespace BookStack\Activity\Controllers;
 
 use BookStack\Activity\Models\Activity;
 use BookStack\Http\ApiController;
-use BookStack\Permissions\Permission;
 
 class AuditLogApiController extends ApiController
 {
@@ -17,8 +16,8 @@ class AuditLogApiController extends ApiController
      */
     public function list()
     {
-        $this->checkPermission(Permission::SettingsManage);
-        $this->checkPermission(Permission::UsersManage);
+        $this->checkPermission('settings-manage');
+        $this->checkPermission('users-manage');
 
         $query = Activity::query()->with(['user']);
 

app/Activity/Controllers/AuditLogController.php

@@ -5,7 +5,6 @@ namespace BookStack\Activity\Controllers;
 use BookStack\Activity\ActivityType;
 use BookStack\Activity\Models\Activity;
 use BookStack\Http\Controller;
-use BookStack\Permissions\Permission;
 use BookStack\Sorting\SortUrl;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
@@ -14,8 +13,8 @@ class AuditLogController extends Controller
 {
     public function index(Request $request)
     {
-        $this->checkPermission(Permission::SettingsManage);
-        $this->checkPermission(Permission::UsersManage);
+        $this->checkPermission('settings-manage');
+        $this->checkPermission('users-manage');
 
         $sort = $request->get('sort', 'activity_date');
         $order = $request->get('order', 'desc');

app/Activity/Controllers/CommentApiController.php

@@ -1,148 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace BookStack\Activity\Controllers;
-
-use BookStack\Activity\CommentRepo;
-use BookStack\Activity\Models\Comment;
-use BookStack\Entities\Queries\PageQueries;
-use BookStack\Http\ApiController;
-use BookStack\Permissions\Permission;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-
-/**
- * The comment data model has a 'local_id' property, which is a unique integer ID
- * scoped to the page which the comment is on. The 'parent_id' is used for replies
- * and refers to the 'local_id' of the parent comment on the same page, not the main
- * globally unique 'id'.
- *
- * If you want to get all comments for a page in a tree-like structure, as reflected in
- * the UI, then that is provided on pages-read API responses.
- */
-class CommentApiController extends ApiController
-{
-    protected array $rules = [
-        'create' => [
-            'page_id' => ['required', 'integer'],
-            'reply_to' => ['nullable', 'integer'],
-            'html' => ['required', 'string'],
-            'content_ref' => ['string'],
-        ],
-        'update' => [
-            'html' => ['string'],
-            'archived' => ['boolean'],
-        ]
-    ];
-
-    public function __construct(
-        protected CommentRepo $commentRepo,
-        protected PageQueries $pageQueries,
-    ) {
-    }
-
-    /**
-     * Get a listing of comments visible to the user.
-     */
-    public function list(): JsonResponse
-    {
-        $query = $this->commentRepo->getQueryForVisible();
-
-        return $this->apiListingResponse($query, [
-            'id', 'commentable_id', 'commentable_type', 'parent_id', 'local_id', 'content_ref', 'created_by', 'updated_by', 'created_at', 'updated_at'
-        ]);
-    }
-
-    /**
-     * Create a new comment on a page.
-     * If commenting as a reply to an existing comment, the 'reply_to' parameter
-     * should be provided, set to the 'local_id' of the comment being replied to.
-     */
-    public function create(Request $request): JsonResponse
-    {
-        $this->checkPermission(Permission::CommentCreateAll);
-
-        $input = $this->validate($request, $this->rules()['create']);
-        $page = $this->pageQueries->findVisibleByIdOrFail($input['page_id']);
-
-        $comment = $this->commentRepo->create(
-            $page,
-            $input['html'],
-            $input['reply_to'] ?? null,
-            $input['content_ref'] ?? '',
-        );
-
-        return response()->json($comment);
-    }
-
-    /**
-     * Read the details of a single comment, along with its direct replies.
-     */
-    public function read(string $id): JsonResponse
-    {
-        $comment = $this->commentRepo->getVisibleById(intval($id));
-        $comment->load('createdBy', 'updatedBy');
-
-        $replies = $this->commentRepo->getQueryForVisible()
-            ->where('parent_id', '=', $comment->local_id)
-            ->where('commentable_id', '=', $comment->commentable_id)
-            ->where('commentable_type', '=', $comment->commentable_type)
-            ->get();
-
-        /** @var Comment[] $toProcess */
-        $toProcess = [$comment, ...$replies];
-        foreach ($toProcess as $commentToProcess) {
-            $commentToProcess->setAttribute('html', $commentToProcess->safeHtml());
-            $commentToProcess->makeVisible('html');
-        }
-
-        $comment->setRelation('replies', $replies);
-
-        return response()->json($comment);
-    }
-
-
-    /**
-     * Update the content or archived status of an existing comment.
-     *
-     * Only provide a new archived status if needing to actively change the archive state.
-     * Only top-level comments (non-replies) can be archived or unarchived.
-     */
-    public function update(Request $request, string $id): JsonResponse
-    {
-        $comment = $this->commentRepo->getVisibleById(intval($id));
-        $this->checkOwnablePermission(Permission::CommentUpdate, $comment);
-
-        $input = $this->validate($request, $this->rules()['update']);
-        $hasHtml = isset($input['html']);
-
-        if (isset($input['archived'])) {
-            if ($input['archived']) {
-                $this->commentRepo->archive($comment, !$hasHtml);
-            } else {
-                $this->commentRepo->unarchive($comment, !$hasHtml);
-            }
-        }
-
-        if ($hasHtml) {
-            $comment = $this->commentRepo->update($comment, $input['html']);
-        }
-
-        return response()->json($comment);
-    }
-
-    /**
-     * Delete a single comment from the system.
-     */
-    public function delete(string $id): Response
-    {
-        $comment = $this->commentRepo->getVisibleById(intval($id));
-        $this->checkOwnablePermission(Permission::CommentDelete, $comment);
-
-        $this->commentRepo->delete($comment);
-
-        return response('', 204);
-    }
-}

app/Activity/Controllers/CommentController.php

@@ -7,7 +7,6 @@ use BookStack\Activity\Tools\CommentTree;
 use BookStack\Activity\Tools\CommentTreeNode;
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Http\Controller;
-use BookStack\Permissions\Permission;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 
@@ -22,7 +21,7 @@ class CommentController extends Controller
     /**
      * Save a new comment for a Page.
      *
-     * @throws ValidationException|\Exception
+     * @throws ValidationException
      */
     public function savePageComment(Request $request, int $pageId)
     {
@@ -37,8 +36,13 @@ class CommentController extends Controller
             return response('Not found', 404);
         }
 
+        // Prevent adding comments to draft pages
+        if ($page->draft) {
+            return $this->jsonError(trans('errors.cannot_add_comment_to_draft'), 400);
+        }
+
         // Create a new comment.
-        $this->checkPermission(Permission::CommentCreateAll);
+        $this->checkPermission('comment-create-all');
         $contentRef = $input['content_ref'] ?? '';
         $comment = $this->commentRepo->create($page, $input['html'], $input['parent_id'] ?? null, $contentRef);
 
@@ -60,8 +64,8 @@ class CommentController extends Controller
         ]);
 
         $comment = $this->commentRepo->getById($commentId);
-        $this->checkOwnablePermission(Permission::PageView, $comment->entity);
-        $this->checkOwnablePermission(Permission::CommentUpdate, $comment);
+        $this->checkOwnablePermission('page-view', $comment->entity);
+        $this->checkOwnablePermission('comment-update', $comment);
 
         $comment = $this->commentRepo->update($comment, $input['html']);
 
@@ -77,8 +81,8 @@ class CommentController extends Controller
     public function archive(int $id)
     {
         $comment = $this->commentRepo->getById($id);
-        $this->checkOwnablePermission(Permission::PageView, $comment->entity);
-        if (!userCan(Permission::CommentUpdate, $comment) && !userCan(Permission::CommentDelete, $comment)) {
+        $this->checkOwnablePermission('page-view', $comment->entity);
+        if (!userCan('comment-update', $comment) && !userCan('comment-delete', $comment)) {
             $this->showPermissionError();
         }
 
@@ -97,8 +101,8 @@ class CommentController extends Controller
     public function unarchive(int $id)
     {
         $comment = $this->commentRepo->getById($id);
-        $this->checkOwnablePermission(Permission::PageView, $comment->entity);
-        if (!userCan(Permission::CommentUpdate, $comment) && !userCan(Permission::CommentDelete, $comment)) {
+        $this->checkOwnablePermission('page-view', $comment->entity);
+        if (!userCan('comment-update', $comment) && !userCan('comment-delete', $comment)) {
             $this->showPermissionError();
         }
 
@@ -117,7 +121,7 @@ class CommentController extends Controller
     public function destroy(int $id)
     {
         $comment = $this->commentRepo->getById($id);
-        $this->checkOwnablePermission(Permission::CommentDelete, $comment);
+        $this->checkOwnablePermission('comment-delete', $comment);
 
         $this->commentRepo->delete($comment);
 

app/Activity/Controllers/WatchController.php

@@ -5,14 +5,13 @@ namespace BookStack\Activity\Controllers;
 use BookStack\Activity\Tools\UserEntityWatchOptions;
 use BookStack\Entities\Tools\MixedEntityRequestHelper;
 use BookStack\Http\Controller;
-use BookStack\Permissions\Permission;
 use Illuminate\Http\Request;
 
 class WatchController extends Controller
 {
     public function update(Request $request, MixedEntityRequestHelper $entityHelper)
     {
-        $this->checkPermission(Permission::ReceiveNotifications);
+        $this->checkPermission('receive-notifications');
         $this->preventGuestAccess();
 
         $requestData = $this->validate($request, array_merge([

app/Activity/Controllers/WebhookController.php

@@ -6,7 +6,6 @@ use BookStack\Activity\ActivityType;
 use BookStack\Activity\Models\Webhook;
 use BookStack\Activity\Queries\WebhooksAllPaginatedAndSorted;
 use BookStack\Http\Controller;
-use BookStack\Permissions\Permission;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
 
@@ -15,7 +14,7 @@ class WebhookController extends Controller
     public function __construct()
     {
         $this->middleware([
-            Permission::SettingsManage->middleware()
+            'can:settings-manage',
         ]);
     }
 

app/Activity/Models/Activity.php

@@ -6,7 +6,6 @@ use BookStack\App\Model;
 use BookStack\Entities\Models\Entity;
 use BookStack\Permissions\Models\JointPermission;
 use BookStack\Users\Models\User;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
@@ -25,8 +24,6 @@ use Illuminate\Support\Str;
  */
 class Activity extends Model
 {
-    use HasFactory;
-
     /**
      * Get the loggable model related to this activity.
      * Currently only used for entities (previously entity_[id/type] columns).

app/Activity/Models/Comment.php

@@ -3,68 +3,48 @@
 namespace BookStack\Activity\Models;
 
 use BookStack\App\Model;
-use BookStack\Permissions\Models\JointPermission;
-use BookStack\Permissions\PermissionApplicator;
 use BookStack\Users\Models\HasCreatorAndUpdater;
-use BookStack\Users\Models\OwnableInterface;
 use BookStack\Util\HtmlContentFilter;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 /**
  * @property int      $id
+ * @property string   $text - Deprecated & now unused (#4821)
  * @property string   $html
  * @property int|null $parent_id  - Relates to local_id, not id
  * @property int      $local_id
- * @property string   $commentable_type
- * @property int      $commentable_id
+ * @property string   $entity_type
+ * @property int      $entity_id
+ * @property int      $created_by
+ * @property int      $updated_by
  * @property string   $content_ref
  * @property bool     $archived
  */
-class Comment extends Model implements Loggable, OwnableInterface
+class Comment extends Model implements Loggable
 {
     use HasFactory;
     use HasCreatorAndUpdater;
 
     protected $fillable = ['parent_id'];
-    protected $hidden = ['html'];
-
-    protected $casts = [
-        'archived' => 'boolean',
-    ];
 
     /**
      * Get the entity that this comment belongs to.
      */
     public function entity(): MorphTo
     {
-        // We specifically define null here to avoid the different name (commentable)
-        // being used by Laravel eager loading instead of the method name, which it was doing
-        // in some scenarios like when deserialized when going through the queue system.
-        // So we instead specify the type and id column names to use.
-        // Related to:
-        // https://github.com/laravel/framework/pull/24815
-        // https://github.com/laravel/framework/issues/27342
-        // https://github.com/laravel/framework/issues/47953
-        // (and probably more)
-
-        // Ultimately, we could just align the method name to 'commentable' but that would be a potential
-        // breaking change and not really worthwhile in a patch due to the risk of creating extra problems.
-        return $this->morphTo(null, 'commentable_type', 'commentable_id');
+        return $this->morphTo('entity');
     }
 
     /**
      * Get the parent comment this is in reply to (if existing).
-     * @return BelongsTo<Comment, $this>
      */
     public function parent(): BelongsTo
     {
         return $this->belongsTo(Comment::class, 'parent_id', 'local_id', 'parent')
-            ->where('commentable_type', '=', $this->commentable_type)
-            ->where('commentable_id', '=', $this->commentable_id);
+            ->where('entity_type', '=', $this->entity_type)
+            ->where('entity_id', '=', $this->entity_id);
     }
 
     /**
@@ -77,27 +57,11 @@ class Comment extends Model implements Loggable, OwnableInterface
 
     public function logDescriptor(): string
     {
-        return "Comment #{$this->local_id} (ID: {$this->id}) for {$this->commentable_type} (ID: {$this->commentable_id})";
+        return "Comment #{$this->local_id} (ID: {$this->id}) for {$this->entity_type} (ID: {$this->entity_id})";
     }
 
     public function safeHtml(): string
     {
         return HtmlContentFilter::removeScriptsFromHtmlString($this->html ?? '');
     }
-
-    public function jointPermissions(): HasMany
-    {
-        return $this->hasMany(JointPermission::class, 'entity_id', 'commentable_id')
-            ->whereColumn('joint_permissions.entity_type', '=', 'comments.commentable_type');
-    }
-
-    /**
-     * Scope the query to just the comments visible to the user based upon the
-     * user visibility of what has been commented on.
-     */
-    public function scopeVisible(Builder $query): Builder
-    {
-        return app()->make(PermissionApplicator::class)
-            ->restrictEntityRelationQuery($query, 'comments', 'commentable_id', 'commentable_type');
-    }
 }

app/Activity/Models/Favourite.php

@@ -4,14 +4,11 @@ namespace BookStack\Activity\Models;
 
 use BookStack\App\Model;
 use BookStack\Permissions\Models\JointPermission;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 class Favourite extends Model
 {
-    use HasFactory;
-
     protected $fillable = ['user_id'];
 
     /**

app/Activity/Models/Tag.php

@@ -12,8 +12,6 @@ use Illuminate\Database\Eloquent\Relations\MorphTo;
  * @property int    $id
  * @property string $name
  * @property string $value
- * @property int    $entity_id
- * @property string $entity_type
  * @property int    $order
  */
 class Tag extends Model

app/Activity/Models/Watch.php

@@ -5,7 +5,6 @@ namespace BookStack\Activity\Models;
 use BookStack\Activity\WatchLevels;
 use BookStack\Permissions\Models\JointPermission;
 use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
@@ -21,8 +20,6 @@ use Illuminate\Database\Eloquent\Relations\MorphTo;
  */
 class Watch extends Model
 {
-    use HasFactory;
-
     protected $guarded = [];
 
     public function watchable(): MorphTo

app/Activity/Notifications/Handlers/BaseNotificationHandler.php

@@ -5,7 +5,6 @@ namespace BookStack\Activity\Notifications\Handlers;
 use BookStack\Activity\Models\Loggable;
 use BookStack\Activity\Notifications\Messages\BaseActivityNotification;
 use BookStack\Entities\Models\Entity;
-use BookStack\Permissions\Permission;
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Users\Models\User;
 use Illuminate\Support\Facades\Log;
@@ -20,7 +19,6 @@ abstract class BaseNotificationHandler implements NotificationHandler
     {
         $users = User::query()->whereIn('id', array_unique($userIds))->get();
 
-        /** @var User $user */
         foreach ($users as $user) {
             // Prevent sending to the user that initiated the activity
             if ($user->id === $initiator->id) {
@@ -28,7 +26,7 @@ abstract class BaseNotificationHandler implements NotificationHandler
             }
 
             // Prevent sending of the user does not have notification permissions
-            if (!$user->can(Permission::ReceiveNotifications)) {
+            if (!$user->can('receive-notifications')) {
                 continue;
             }
 

app/Activity/Notifications/Handlers/CommentCreationNotificationHandler.php

@@ -27,7 +27,7 @@ class CommentCreationNotificationHandler extends BaseNotificationHandler
         $watcherIds = $watchers->getWatcherUserIds();
 
         // Page owner if user preferences allow
-        if ($page->owned_by && !$watchers->isUserIgnoring($page->owned_by) && $page->ownedBy) {
+        if (!$watchers->isUserIgnoring($page->owned_by) && $page->ownedBy) {
             $userNotificationPrefs = new UserNotificationPreferences($page->ownedBy);
             if ($userNotificationPrefs->notifyOnOwnPageComments()) {
                 $watcherIds[] = $page->owned_by;
@@ -36,7 +36,7 @@ class CommentCreationNotificationHandler extends BaseNotificationHandler
 
         // Parent comment creator if preferences allow
         $parentComment = $detail->parent()->first();
-        if ($parentComment && $parentComment->created_by && !$watchers->isUserIgnoring($parentComment->created_by) && $parentComment->createdBy) {
+        if ($parentComment && !$watchers->isUserIgnoring($parentComment->created_by) && $parentComment->createdBy) {
             $parentCommenterNotificationsPrefs = new UserNotificationPreferences($parentComment->createdBy);
             if ($parentCommenterNotificationsPrefs->notifyOnCommentReplies()) {
                 $watcherIds[] = $parentComment->created_by;

app/Activity/Notifications/Handlers/PageUpdateNotificationHandler.php

@@ -20,8 +20,7 @@ class PageUpdateNotificationHandler extends BaseNotificationHandler
             throw new \InvalidArgumentException("Detail for page update notifications must be a page");
         }
 
-        // Get the last update from activity
-        /** @var ?Activity $lastUpdate */
+        // Get last update from activity
         $lastUpdate = $detail->activity()
             ->where('type', '=', ActivityType::PAGE_UPDATE)
             ->where('id', '!=', $activity->id)
@@ -39,8 +38,8 @@ class PageUpdateNotificationHandler extends BaseNotificationHandler
         $watchers = new EntityWatchers($detail, WatchLevels::UPDATES);
         $watcherIds = $watchers->getWatcherUserIds();
 
-        // Add the page owner if preferences allow
-        if ($detail->owned_by && !$watchers->isUserIgnoring($detail->owned_by) && $detail->ownedBy) {
+        // Add page owner if preferences allow
+        if (!$watchers->isUserIgnoring($detail->owned_by) && $detail->ownedBy) {
             $userNotificationPrefs = new UserNotificationPreferences($detail->ownedBy);
             if ($userNotificationPrefs->notifyOnOwnPageChanges()) {
                 $watcherIds[] = $detail->owned_by;

app/Activity/Tools/CommentTree.php

@@ -4,7 +4,6 @@ namespace BookStack\Activity\Tools;
 
 use BookStack\Activity\Models\Comment;
 use BookStack\Entities\Models\Page;
-use BookStack\Permissions\Permission;
 
 class CommentTree
 {
@@ -13,11 +12,6 @@ class CommentTree
      * @var CommentTreeNode[]
      */
     protected array $tree;
-
-    /**
-     * A linear array of loaded comments.
-     * @var Comment[]
-     */
     protected array $comments;
 
     public function __construct(
@@ -44,7 +38,7 @@ class CommentTree
 
     public function getActive(): array
     {
-        return array_values(array_filter($this->tree, fn (CommentTreeNode $node) => !$node->comment->archived));
+        return array_filter($this->tree, fn (CommentTreeNode $node) => !$node->comment->archived);
     }
 
     public function activeThreadCount(): int
@@ -54,7 +48,7 @@ class CommentTree
 
     public function getArchived(): array
     {
-        return array_values(array_filter($this->tree, fn (CommentTreeNode $node) => $node->comment->archived));
+        return array_filter($this->tree, fn (CommentTreeNode $node) => $node->comment->archived);
     }
 
     public function archivedThreadCount(): int
@@ -76,7 +70,7 @@ class CommentTree
     public function canUpdateAny(): bool
     {
         foreach ($this->comments as $comment) {
-            if (userCan(Permission::CommentUpdate, $comment)) {
+            if (userCan('comment-update', $comment)) {
                 return true;
             }
         }
@@ -84,14 +78,6 @@ class CommentTree
         return false;
     }
 
-    public function loadVisibleHtml(): void
-    {
-        foreach ($this->comments as $comment) {
-            $comment->setAttribute('html', $comment->safeHtml());
-            $comment->makeVisible('html');
-        }
-    }
-
     /**
      * @param Comment[] $comments
      * @return CommentTreeNode[]
@@ -136,9 +122,6 @@ class CommentTree
         return new CommentTreeNode($byId[$id], $depth, $children);
     }
 
-    /**
-     * @return Comment[]
-     */
     protected function loadComments(): array
     {
         if (!$this->enabled()) {

app/Activity/Tools/TagClassGenerator.php

@@ -3,16 +3,17 @@
 namespace BookStack\Activity\Tools;
 
 use BookStack\Activity\Models\Tag;
-use BookStack\Entities\Models\BookChild;
-use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\Page;
-use BookStack\Permissions\Permission;
 
 class TagClassGenerator
 {
-    public function __construct(
-        protected Entity $entity
-    ) {
+    protected array $tags;
+
+    /**
+     * @param Tag[] $tags
+     */
+    public function __construct(array $tags)
+    {
+        $this->tags = $tags;
     }
 
     /**
@@ -21,23 +22,14 @@ class TagClassGenerator
     public function generate(): array
     {
         $classes = [];
-        $tags = $this->entity->tags->all();
 
-        foreach ($tags as $tag) {
-             array_push($classes, ...$this->generateClassesForTag($tag));
-        }
-
-        if ($this->entity instanceof BookChild && userCan(Permission::BookView, $this->entity->book)) {
-            $bookTags = $this->entity->book->tags;
-            foreach ($bookTags as $bookTag) {
-                 array_push($classes, ...$this->generateClassesForTag($bookTag, 'book-'));
-            }
-        }
-
-        if ($this->entity instanceof Page && $this->entity->chapter && userCan(Permission::ChapterView, $this->entity->chapter)) {
-            $chapterTags = $this->entity->chapter->tags;
-            foreach ($chapterTags as $chapterTag) {
-                 array_push($classes, ...$this->generateClassesForTag($chapterTag, 'chapter-'));
+        foreach ($this->tags as $tag) {
+            $name = $this->normalizeTagClassString($tag->name);
+            $value = $this->normalizeTagClassString($tag->value);
+            $classes[] = 'tag-name-' . $name;
+            if ($value) {
+                $classes[] = 'tag-value-' . $value;
+                $classes[] = 'tag-pair-' . $name . '-' . $value;
             }
         }
 
@@ -49,22 +41,6 @@ class TagClassGenerator
         return implode(' ', $this->generate());
     }
 
-    /**
-     * @return string[]
-     */
-    protected function generateClassesForTag(Tag $tag, string $prefix = ''): array
-    {
-        $classes = [];
-        $name = $this->normalizeTagClassString($tag->name);
-        $value = $this->normalizeTagClassString($tag->value);
-        $classes[] = "{$prefix}tag-name-{$name}";
-        if ($value) {
-            $classes[] = "{$prefix}tag-value-{$value}";
-            $classes[] = "{$prefix}tag-pair-{$name}-{$value}";
-        }
-        return $classes;
-    }
-
     protected function normalizeTagClassString(string $value): string
     {
         $value = str_replace(' ', '', strtolower($value));

app/Activity/Tools/UserEntityWatchOptions.php

@@ -7,7 +7,6 @@ use BookStack\Activity\WatchLevels;
 use BookStack\Entities\Models\BookChild;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
-use BookStack\Permissions\Permission;
 use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 
@@ -23,7 +22,7 @@ class UserEntityWatchOptions
 
     public function canWatch(): bool
     {
-        return $this->user->can(Permission::ReceiveNotifications) && !$this->user->isGuest();
+        return $this->user->can('receive-notifications') && !$this->user->isGuest();
     }
 
     public function getWatchLevel(): string

app/Activity/Tools/WebhookFormatter.php

@@ -50,7 +50,7 @@ class WebhookFormatter
         }
 
         if ($this->detail instanceof Model) {
-            $data['related_item'] = $this->formatModel($this->detail);
+            $data['related_item'] = $this->formatModel();
         }
 
         return $data;
@@ -83,8 +83,10 @@ class WebhookFormatter
         );
     }
 
-    protected function formatModel(Model $model): array
+    protected function formatModel(): array
     {
+        /** @var Model $model */
+        $model = $this->detail;
         $model->unsetRelations();
 
         foreach ($this->modelFormatters as $formatter) {

app/Activity/WatchLevels.php

@@ -36,7 +36,7 @@ class WatchLevels
 
     /**
      * Get all the possible values as an option_name => value array.
-     * @return array<string, int>
+     * @returns array<string, int>
      */
     public static function all(): array
     {
@@ -50,7 +50,7 @@ class WatchLevels
 
     /**
      * Get the watch options suited for the given entity.
-     * @return array<string, int>
+     * @returns array<string, int>
      */
     public static function allSuitedFor(Entity $entity): array
     {

app/Api/ApiDocsGenerator.php

@@ -83,19 +83,11 @@ class ApiDocsGenerator
     protected function loadDetailsFromControllers(Collection $routes): Collection
     {
         return $routes->map(function (array $route) {
-            $class = $this->getReflectionClass($route['controller']);
             $method = $this->getReflectionMethod($route['controller'], $route['controller_method']);
             $comment = $method->getDocComment();
-            $route['description'] = $comment ? $this->parseDescriptionFromDocBlockComment($comment) : null;
+            $route['description'] = $comment ? $this->parseDescriptionFromMethodComment($comment) : null;
             $route['body_params'] = $this->getBodyParamsFromClass($route['controller'], $route['controller_method']);
 
-            // Load class description for the model
-            // Not ideal to have it here on each route, but adding it in a more structured manner would break
-            // docs resulting JSON format and therefore be an API break.
-            // Save refactoring for a more significant set of changes.
-            $classComment = $class->getDocComment();
-            $route['model_description'] = $classComment ? $this->parseDescriptionFromDocBlockComment($classComment) : null;
-
             return $route;
         });
     }
@@ -148,7 +140,7 @@ class ApiDocsGenerator
     /**
      * Parse out the description text from a class method comment.
      */
-    protected function parseDescriptionFromDocBlockComment(string $comment): string
+    protected function parseDescriptionFromMethodComment(string $comment): string
     {
         $matches = [];
         preg_match_all('/^\s*?\*\s?($|((?![\/@\s]).*?))$/m', $comment, $matches);
@@ -163,16 +155,6 @@ class ApiDocsGenerator
      * @throws ReflectionException
      */
     protected function getReflectionMethod(string $className, string $methodName): ReflectionMethod
-    {
-        return $this->getReflectionClass($className)->getMethod($methodName);
-    }
-
-    /**
-     * Get a reflection class from the given class name.
-     *
-     * @throws ReflectionException
-     */
-    protected function getReflectionClass(string $className): ReflectionClass
     {
         $class = $this->reflectionClasses[$className] ?? null;
         if ($class === null) {
@@ -180,7 +162,7 @@ class ApiDocsGenerator
             $this->reflectionClasses[$className] = $class;
         }
 
-        return $class;
+        return $class->getMethod($methodName);
     }
 
     /**

app/Api/ApiTokenGuard.php

@@ -4,7 +4,6 @@ namespace BookStack\Api;
 
 use BookStack\Access\LoginService;
 use BookStack\Exceptions\ApiAuthException;
-use BookStack\Permissions\Permission;
 use Illuminate\Auth\GuardHelpers;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\Guard;
@@ -147,7 +146,7 @@ class ApiTokenGuard implements Guard
             throw new ApiAuthException(trans('errors.api_user_token_expired'), 403);
         }
 
-        if (!$token->user->can(Permission::AccessApi)) {
+        if (!$token->user->can('access-api')) {
             throw new ApiAuthException(trans('errors.api_user_no_api_permission'), 403);
         }
     }

app/Api/UserApiTokenController.php

@@ -4,7 +4,6 @@ namespace BookStack\Api;
 
 use BookStack\Activity\ActivityType;
 use BookStack\Http\Controller;
-use BookStack\Permissions\Permission;
 use BookStack\Users\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
@@ -17,8 +16,8 @@ class UserApiTokenController extends Controller
      */
     public function create(Request $request, int $userId)
     {
-        $this->checkPermission(Permission::AccessApi);
-        $this->checkPermissionOrCurrentUser(Permission::UsersManage, $userId);
+        $this->checkPermission('access-api');
+        $this->checkPermissionOrCurrentUser('users-manage', $userId);
         $this->updateContext($request);
 
         $user = User::query()->findOrFail($userId);
@@ -36,8 +35,8 @@ class UserApiTokenController extends Controller
      */
     public function store(Request $request, int $userId)
     {
-        $this->checkPermission(Permission::AccessApi);
-        $this->checkPermissionOrCurrentUser(Permission::UsersManage, $userId);
+        $this->checkPermission('access-api');
+        $this->checkPermissionOrCurrentUser('users-manage', $userId);
 
         $this->validate($request, [
             'name'       => ['required', 'max:250'],
@@ -144,8 +143,8 @@ class UserApiTokenController extends Controller
      */
     protected function checkPermissionAndFetchUserToken(int $userId, int $tokenId): array
     {
-        $this->checkPermissionOr(Permission::UsersManage, function () use ($userId) {
-            return $userId === user()->id && userCan(Permission::AccessApi);
+        $this->checkPermissionOr('users-manage', function () use ($userId) {
+            return $userId === user()->id && userCan('access-api');
         });
 
         $user = User::query()->findOrFail($userId);

app/App/Model.php

@@ -8,7 +8,7 @@ class Model extends EloquentModel
 {
     /**
      * Provides public access to get the raw attribute value from the model.
-     * Used in areas where no mutations are required, but performance is critical.
+     * Used in areas where no mutations are required but performance is critical.
      *
      * @return mixed
      */

app/App/Providers/AuthServiceProvider.php

@@ -59,8 +59,8 @@ class AuthServiceProvider extends ServiceProvider
      */
     public function register(): void
     {
-        Auth::provider('external-users', function () {
-            return new ExternalBaseUserProvider();
+        Auth::provider('external-users', function ($app, array $config) {
+            return new ExternalBaseUserProvider($config['model']);
         });
 
         // Bind and provide the default system user as a singleton to the app instance when needed.

app/App/Providers/EventServiceProvider.php

@@ -15,7 +15,7 @@ class EventServiceProvider extends ServiceProvider
     /**
      * The event listener mappings for the application.
      *
-     * @var array<class-string, array<int, string>>
+     * @var array<class-string, array<int, class-string>>
      */
     protected $listen = [
         SocialiteWasCalled::class => [

app/App/Providers/ViewTweaksServiceProvider.php

@@ -3,7 +3,6 @@
 namespace BookStack\App\Providers;
 
 use BookStack\Entities\BreadcrumbsViewComposer;
-use BookStack\Util\DateFormatter;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\View;
@@ -11,15 +10,6 @@ use Illuminate\Support\ServiceProvider;
 
 class ViewTweaksServiceProvider extends ServiceProvider
 {
-    public function register()
-    {
-        $this->app->singleton(DateFormatter::class, function ($app) {
-            return new DateFormatter(
-                $app['config']->get('app.display_timezone'),
-            );
-        });
-    }
-
     /**
      * Bootstrap services.
      */
@@ -31,9 +21,6 @@ class ViewTweaksServiceProvider extends ServiceProvider
         // View Composers
         View::composer('entities.breadcrumbs', BreadcrumbsViewComposer::class);
 
-        // View Globals
-        View::share('dates', $this->app->make(DateFormatter::class));
-
         // Custom blade view directives
         Blade::directive('icon', function ($expression) {
             return "<?php echo (new \BookStack\Util\SvgIcon($expression))->toHtml(); ?>";

app/App/Sluggable.php

@@ -5,8 +5,11 @@ namespace BookStack\App;
 /**
  * Assigned to models that can have slugs.
  * Must have the below properties.
+ *
+ * @property int    $id
+ * @property string $name
  */
-interface SluggableInterface
+interface Sluggable
 {
     /**
      * Regenerate the slug for this model.

app/App/helpers.php

@@ -3,7 +3,6 @@
 use BookStack\App\AppVersion;
 use BookStack\App\Model;
 use BookStack\Facades\Theme;
-use BookStack\Permissions\Permission;
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Settings\SettingService;
 use BookStack\Users\Models\User;
@@ -40,7 +39,7 @@ function user(): User
  * Check if the current user has a permission. If an ownable element
  * is passed in the jointPermissions are checked against that particular item.
  */
-function userCan(string|Permission $permission, ?Model $ownable = null): bool
+function userCan(string $permission, ?Model $ownable = null): bool
 {
     if (is_null($ownable)) {
         return user()->can($permission);
@@ -56,7 +55,7 @@ function userCan(string|Permission $permission, ?Model $ownable = null): bool
  * Check if the current user can perform the given action on any items in the system.
  * Can be provided the class name of an entity to filter ability to that specific entity type.
  */
-function userCanOnAny(string|Permission $action, string $entityClass = ''): bool
+function userCanOnAny(string $action, string $entityClass = ''): bool
 {
     $permissions = app()->make(PermissionApplicator::class);
 

app/Config/app.php

@@ -70,8 +70,8 @@ return [
     // A list of the sources/hostnames that can be reached by application SSR calls.
     // This is used wherever users can provide URLs/hosts in-platform, like for webhooks.
     // Host-specific functionality (usually controlled via other options) like auth
-    // or user avatars, for example, won't use this list.
-    // Space separated if multiple. Can use '*' as a wildcard.
+    // or user avatars for example, won't use this list.
+    // Space seperated if multiple. Can use '*' as a wildcard.
     // Values will be compared prefix-matched, case-insensitive, against called SSR urls.
     // Defaults to allow all hosts.
     'ssr_hosts' => env('ALLOWED_SSR_HOSTS', '*'),
@@ -80,10 +80,8 @@ return [
     // Integer value between 0 (IP hidden) to 4 (Full IP usage)
     'ip_address_precision' => env('IP_ADDRESS_PRECISION', 4),
 
-    // Application timezone for stored date/time values.
+    // Application timezone for back-end date functions.
     'timezone' => env('APP_TIMEZONE', 'UTC'),
-    // Application timezone for displayed date/time values in the UI.
-    'display_timezone' => env('APP_DISPLAY_TIMEZONE', env('APP_TIMEZONE', 'UTC')),
 
     // Default locale to use
     // A default variant is also stored since Laravel can overwrite

app/Config/cache.php

@@ -85,6 +85,6 @@ return [
     |
     */
 
-    'prefix' => env('CACHE_PREFIX', 'bookstack_cache_'),
+    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_cache_'),
 
 ];

app/Config/database.php

@@ -75,7 +75,7 @@ return [
             'collation'      => 'utf8mb4_unicode_ci',
             // Prefixes are only semi-supported and may be unstable
             // since they are not tested as part of our automated test suite.
-            // If used, the prefix should not be changed; otherwise you will likely receive errors.
+            // If used, the prefix should not be changed otherwise you will likely receive errors.
             'prefix'         => env('DB_TABLE_PREFIX', ''),
             'prefix_indexes' => true,
             'strict'         => false,
@@ -103,7 +103,9 @@ return [
     ],
 
     // Migration Repository Table
-    // This table keeps track of all the migrations that have already run for the application.
+    // This table keeps track of all the migrations that have already run for
+    // your application. Using this information, we can determine which of
+    // the migrations on disk haven't actually been run in the database.
     'migrations' => 'migrations',
 
     // Redis configuration to use if set

app/Config/filesystems.php

@@ -11,7 +11,7 @@
 return [
 
     // Default Filesystem Disk
-    // Options: local, local_secure, local_secure_restricted, s3
+    // Options: local, local_secure, s3
     'default' => env('STORAGE_TYPE', 'local'),
 
     // Filesystem to use specifically for image uploads.

app/Config/mail.php

@@ -11,7 +11,6 @@
 // Configured mail encryption method.
 // STARTTLS should still be attempted, but tls/ssl forces TLS usage.
 $mailEncryption = env('MAIL_ENCRYPTION', null);
-$mailPort = intval(env('MAIL_PORT', 587));
 
 return [
 
@@ -34,13 +33,13 @@ return [
             'transport' => 'smtp',
             'scheme' => null,
             'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
-            'port' => $mailPort,
+            'port' => env('MAIL_PORT', 587),
             'username' => env('MAIL_USERNAME'),
             'password' => env('MAIL_PASSWORD'),
             'verify_peer' => env('MAIL_VERIFY_SSL', true),
             'timeout' => null,
             'local_domain' => null,
-            'require_tls' => ($mailEncryption === 'tls' || $mailEncryption === 'ssl' || $mailPort === 465),
+            'tls_required' => ($mailEncryption === 'tls' || $mailEncryption === 'ssl'),
         ],
 
         'sendmail' => [

app/Console/Commands/CreateAdminCommand.php

@@ -8,6 +8,7 @@ use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
 use Illuminate\Validation\Rules\Password;
+use Illuminate\Validation\Rules\Unique;
 
 class CreateAdminCommand extends Command
 {
@@ -20,9 +21,7 @@ class CreateAdminCommand extends Command
                             {--email= : The email address for the new admin user}
                             {--name= : The name of the new admin user}
                             {--password= : The password to assign to the new admin user}
-                            {--external-auth-id= : The external authentication system id for the new admin user (SAML2/LDAP/OIDC)}
-                            {--generate-password : Generate a random password for the new admin user}
-                            {--initial : Indicate if this should set/update the details of the initial admin user}';
+                            {--external-auth-id= : The external authentication system id for the new admin user (SAML2/LDAP/OIDC)}';
 
     /**
      * The console command description.
@@ -36,12 +35,26 @@ class CreateAdminCommand extends Command
      */
     public function handle(UserRepo $userRepo): int
     {
-        $initialAdminOnly = $this->option('initial');
-        $shouldGeneratePassword = $this->option('generate-password');
-        $details = $this->gatherDetails($shouldGeneratePassword, $initialAdminOnly);
+        $details = $this->snakeCaseOptions();
+
+        if (empty($details['email'])) {
+            $details['email'] = $this->ask('Please specify an email address for the new admin user');
+        }
+
+        if (empty($details['name'])) {
+            $details['name'] = $this->ask('Please specify a name for the new admin user');
+        }
+
+        if (empty($details['password'])) {
+            if (empty($details['external_auth_id'])) {
+                $details['password'] = $this->ask('Please specify a password for the new admin user (8 characters min)');
+            } else {
+                $details['password'] = Str::random(32);
+            }
+        }
 
         $validator = Validator::make($details, [
-            'email'            => ['required', 'email', 'min:5'],
+            'email'            => ['required', 'email', 'min:5', new Unique('users', 'email')],
             'name'             => ['required', 'min:2'],
             'password'         => ['required_without:external_auth_id', Password::default()],
             'external_auth_id' => ['required_without:password'],
@@ -55,101 +68,16 @@ class CreateAdminCommand extends Command
             return 1;
         }
 
-        $adminRole = Role::getSystemRole('admin');
-
-        if ($initialAdminOnly) {
-            $handled = $this->handleInitialAdminIfExists($userRepo, $details, $shouldGeneratePassword, $adminRole);
-            if ($handled !== null) {
-                return $handled;
-            }
-        }
-
-        $emailUsed = $userRepo->getByEmail($details['email']) !== null;
-        if ($emailUsed) {
-            $this->error("Could not create admin account.");
-            $this->error("An account with the email address \"{$details['email']}\" already exists.");
-            return 1;
-        }
-
         $user = $userRepo->createWithoutActivity($validator->validated());
-        $user->attachRole($adminRole);
+        $user->attachRole(Role::getSystemRole('admin'));
         $user->email_confirmed = true;
         $user->save();
 
-        if ($shouldGeneratePassword) {
-            $this->line($details['password']);
-        } else {
-            $this->info("Admin account with email \"{$user->email}\" successfully created!");
-        }
+        $this->info("Admin account with email \"{$user->email}\" successfully created!");
 
         return 0;
     }
 
-    /**
-     * Handle updates to the original admin account if it exists.
-     * Returns an int return status if handled, otherwise returns null if not handled (new user to be created).
-     */
-    protected function handleInitialAdminIfExists(UserRepo $userRepo, array $data, bool $generatePassword, Role $adminRole): int|null
-    {
-        $defaultAdmin = $userRepo->getByEmail('admin@admin.com');
-        if ($defaultAdmin && $defaultAdmin->hasSystemRole('admin')) {
-            if ($defaultAdmin->email !== $data['email'] && $userRepo->getByEmail($data['email']) !== null) {
-                $this->error("Could not create admin account.");
-                $this->error("An account with the email address \"{$data['email']}\" already exists.");
-                return 1;
-            }
-
-            $userRepo->updateWithoutActivity($defaultAdmin, $data, true);
-            if ($generatePassword) {
-                $this->line($data['password']);
-            } else {
-                $this->info("The default admin user has been updated with the provided details!");
-            }
-
-            return 0;
-        } else if ($adminRole->users()->count() > 0) {
-            $this->warn('Non-default admin user already exists. Skipping creation of new admin user.');
-            return 2;
-        }
-
-        return null;
-    }
-
-    protected function gatherDetails(bool $generatePassword, bool $initialAdmin): array
-    {
-        $details = $this->snakeCaseOptions();
-
-        if (empty($details['email'])) {
-            if ($initialAdmin) {
-                $details['email'] = 'admin@example.com';
-            } else {
-                $details['email'] = $this->ask('Please specify an email address for the new admin user');
-            }
-        }
-
-        if (empty($details['name'])) {
-            if ($initialAdmin) {
-                $details['name'] = 'Admin';
-            } else {
-                $details['name'] = $this->ask('Please specify a name for the new admin user');
-            }
-        }
-
-        if (empty($details['password'])) {
-            if (empty($details['external_auth_id'])) {
-                if ($generatePassword) {
-                    $details['password'] = Str::random(32);
-                } else {
-                    $details['password'] = $this->ask('Please specify a password for the new admin user (8 characters min)');
-                }
-            } else {
-                $details['password'] = Str::random(32);
-            }
-        }
-
-        return $details;
-    }
-
     protected function snakeCaseOptions(): array
     {
         $returnOpts = [];

app/Console/Commands/UpdateUrlCommand.php

@@ -45,12 +45,14 @@ class UpdateUrlCommand extends Command
 
         $columnsToUpdateByTable = [
             'attachments' => ['path'],
-            'entity_page_data' => ['html', 'text', 'markdown'],
-            'entity_container_data' => ['description_html'],
+            'pages'       => ['html', 'text', 'markdown'],
+            'chapters'    => ['description_html'],
+            'books'       => ['description_html'],
+            'bookshelves' => ['description_html'],
             'page_revisions' => ['html', 'text', 'markdown'],
             'images'      => ['url'],
             'settings'    => ['value'],
-            'comments'    => ['html'],
+            'comments'    => ['html', 'text'],
         ];
 
         foreach ($columnsToUpdateByTable as $table => $columns) {

app/Entities/Controllers/BookApiController.php

@@ -11,7 +11,6 @@ use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Http\ApiController;
-use BookStack\Permissions\Permission;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 
@@ -48,7 +47,7 @@ class BookApiController extends ApiController
      */
     public function create(Request $request)
     {
-        $this->checkPermission(Permission::BookCreateAll);
+        $this->checkPermission('book-create-all');
         $requestData = $this->validate($request, $this->rules()['create']);
 
         $book = $this->bookRepo->create($requestData);
@@ -58,7 +57,7 @@ class BookApiController extends ApiController
 
     /**
      * View the details of a single book.
-     * The response data will contain a 'content' property listing the chapter and pages directly within, in
+     * The response data will contain 'content' property listing the chapter and pages directly within, in
      * the same structure as you'd see within the BookStack interface when viewing a book. Top-level
      * contents will have a 'type' property to distinguish between pages & chapters.
      */
@@ -93,7 +92,7 @@ class BookApiController extends ApiController
     public function update(Request $request, string $id)
     {
         $book = $this->queries->findVisibleByIdOrFail(intval($id));
-        $this->checkOwnablePermission(Permission::BookUpdate, $book);
+        $this->checkOwnablePermission('book-update', $book);
 
         $requestData = $this->validate($request, $this->rules()['update']);
         $book = $this->bookRepo->update($book, $requestData);
@@ -110,7 +109,7 @@ class BookApiController extends ApiController
     public function delete(string $id)
     {
         $book = $this->queries->findVisibleByIdOrFail(intval($id));
-        $this->checkOwnablePermission(Permission::BookDelete, $book);
+        $this->checkOwnablePermission('book-delete', $book);
 
         $this->bookRepo->destroy($book);
 
@@ -122,10 +121,9 @@ class BookApiController extends ApiController
         $book = clone $book;
         $book->unsetRelations()->refresh();
 
-        $book->load(['tags']);
-        $book->makeVisible(['cover', 'description_html'])
-            ->setAttribute('description_html', $book->descriptionInfo()->getHtml())
-            ->setAttribute('cover', $book->coverInfo()->getImage());
+        $book->load(['tags', 'cover']);
+        $book->makeVisible('description_html')
+            ->setAttribute('description_html', $book->descriptionHtml());
 
         return $book;
     }

app/Entities/Controllers/BookController.php

@@ -17,9 +17,7 @@ use BookStack\Exceptions\ImageUploadException;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Facades\Activity;
 use BookStack\Http\Controller;
-use BookStack\Permissions\Permission;
 use BookStack\References\ReferenceFetcher;
-use BookStack\Util\DatabaseTransaction;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
@@ -74,12 +72,12 @@ class BookController extends Controller
      */
     public function create(?string $shelfSlug = null)
     {
-        $this->checkPermission(Permission::BookCreateAll);
+        $this->checkPermission('book-create-all');
 
         $bookshelf = null;
         if ($shelfSlug !== null) {
             $bookshelf = $this->shelfQueries->findVisibleBySlugOrFail($shelfSlug);
-            $this->checkOwnablePermission(Permission::BookshelfUpdate, $bookshelf);
+            $this->checkOwnablePermission('bookshelf-update', $bookshelf);
         }
 
         $this->setPageTitle(trans('entities.books_create'));
@@ -97,7 +95,7 @@ class BookController extends Controller
      */
     public function store(Request $request, ?string $shelfSlug = null)
     {
-        $this->checkPermission(Permission::BookCreateAll);
+        $this->checkPermission('book-create-all');
         $validated = $this->validate($request, [
             'name'                => ['required', 'string', 'max:255'],
             'description_html'    => ['string', 'max:2000'],
@@ -109,7 +107,7 @@ class BookController extends Controller
         $bookshelf = null;
         if ($shelfSlug !== null) {
             $bookshelf = $this->shelfQueries->findVisibleBySlugOrFail($shelfSlug);
-            $this->checkOwnablePermission(Permission::BookshelfUpdate, $bookshelf);
+            $this->checkOwnablePermission('bookshelf-update', $bookshelf);
         }
 
         $book = $this->bookRepo->create($validated);
@@ -155,7 +153,7 @@ class BookController extends Controller
     public function edit(string $slug)
     {
         $book = $this->queries->findVisibleBySlugOrFail($slug);
-        $this->checkOwnablePermission(Permission::BookUpdate, $book);
+        $this->checkOwnablePermission('book-update', $book);
         $this->setPageTitle(trans('entities.books_edit_named', ['bookName' => $book->getShortName()]));
 
         return view('books.edit', ['book' => $book, 'current' => $book]);
@@ -171,7 +169,7 @@ class BookController extends Controller
     public function update(Request $request, string $slug)
     {
         $book = $this->queries->findVisibleBySlugOrFail($slug);
-        $this->checkOwnablePermission(Permission::BookUpdate, $book);
+        $this->checkOwnablePermission('book-update', $book);
 
         $validated = $this->validate($request, [
             'name'                => ['required', 'string', 'max:255'],
@@ -198,7 +196,7 @@ class BookController extends Controller
     public function showDelete(string $bookSlug)
     {
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
-        $this->checkOwnablePermission(Permission::BookDelete, $book);
+        $this->checkOwnablePermission('book-delete', $book);
         $this->setPageTitle(trans('entities.books_delete_named', ['bookName' => $book->getShortName()]));
 
         return view('books.delete', ['book' => $book, 'current' => $book]);
@@ -212,7 +210,7 @@ class BookController extends Controller
     public function destroy(string $bookSlug)
     {
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
-        $this->checkOwnablePermission(Permission::BookDelete, $book);
+        $this->checkOwnablePermission('book-delete', $book);
 
         $this->bookRepo->destroy($book);
 
@@ -227,7 +225,7 @@ class BookController extends Controller
     public function showCopy(string $bookSlug)
     {
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
-        $this->checkOwnablePermission(Permission::BookView, $book);
+        $this->checkOwnablePermission('book-view', $book);
 
         session()->flashInput(['name' => $book->name]);
 
@@ -244,8 +242,8 @@ class BookController extends Controller
     public function copy(Request $request, Cloner $cloner, string $bookSlug)
     {
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
-        $this->checkOwnablePermission(Permission::BookView, $book);
-        $this->checkPermission(Permission::BookCreateAll);
+        $this->checkOwnablePermission('book-view', $book);
+        $this->checkPermission('book-create-all');
 
         $newName = $request->get('name') ?: $book->name;
         $bookCopy = $cloner->cloneBook($book, $newName);
@@ -260,14 +258,12 @@ class BookController extends Controller
     public function convertToShelf(HierarchyTransformer $transformer, string $bookSlug)
     {
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
-        $this->checkOwnablePermission(Permission::BookUpdate, $book);
-        $this->checkOwnablePermission(Permission::BookDelete, $book);
-        $this->checkPermission(Permission::BookshelfCreateAll);
-        $this->checkPermission(Permission::BookCreateAll);
+        $this->checkOwnablePermission('book-update', $book);
+        $this->checkOwnablePermission('book-delete', $book);
+        $this->checkPermission('bookshelf-create-all');
+        $this->checkPermission('book-create-all');
 
-        $shelf = (new DatabaseTransaction(function () use ($book, $transformer) {
-            return $transformer->transformBookToShelf($book);
-        }))->run();
+        $shelf = $transformer->transformBookToShelf($book);
 
         return redirect($shelf->getUrl());
     }

app/Entities/Controllers/BookshelfApiController.php

@@ -6,7 +6,6 @@ use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Queries\BookshelfQueries;
 use BookStack\Entities\Repos\BookshelfRepo;
 use BookStack\Http\ApiController;
-use BookStack\Permissions\Permission;
 use Exception;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Http\Request;
@@ -46,7 +45,7 @@ class BookshelfApiController extends ApiController
      */
     public function create(Request $request)
     {
-        $this->checkPermission(Permission::BookshelfCreateAll);
+        $this->checkPermission('bookshelf-create-all');
         $requestData = $this->validate($request, $this->rules()['create']);
 
         $bookIds = $request->get('books', []);
@@ -85,7 +84,7 @@ class BookshelfApiController extends ApiController
     public function update(Request $request, string $id)
     {
         $shelf = $this->queries->findVisibleByIdOrFail(intval($id));
-        $this->checkOwnablePermission(Permission::BookshelfUpdate, $shelf);
+        $this->checkOwnablePermission('bookshelf-update', $shelf);
 
         $requestData = $this->validate($request, $this->rules()['update']);
         $bookIds = $request->get('books', null);
@@ -104,7 +103,7 @@ class BookshelfApiController extends ApiController
     public function delete(string $id)
     {
         $shelf = $this->queries->findVisibleByIdOrFail(intval($id));
-        $this->checkOwnablePermission(Permission::BookshelfDelete, $shelf);
+        $this->checkOwnablePermission('bookshelf-delete', $shelf);
 
         $this->bookshelfRepo->destroy($shelf);
 
@@ -116,10 +115,9 @@ class BookshelfApiController extends ApiController
         $shelf = clone $shelf;
         $shelf->unsetRelations()->refresh();
 
-        $shelf->load(['tags']);
-        $shelf->makeVisible(['cover', 'description_html'])
-            ->setAttribute('description_html', $shelf->descriptionInfo()->getHtml())
-            ->setAttribute('cover', $shelf->coverInfo()->getImage());
+        $shelf->load(['tags', 'cover']);
+        $shelf->makeVisible('description_html')
+            ->setAttribute('description_html', $shelf->descriptionHtml());
 
         return $shelf;
     }

app/Entities/Controllers/BookshelfController.php

@@ -11,7 +11,6 @@ use BookStack\Entities\Tools\ShelfContext;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Http\Controller;
-use BookStack\Permissions\Permission;
 use BookStack\References\ReferenceFetcher;
 use BookStack\Util\SimpleListOptions;
 use Exception;
@@ -69,7 +68,7 @@ class BookshelfController extends Controller
      */
     public function create()
     {
-        $this->checkPermission(Permission::BookshelfCreateAll);
+        $this->checkPermission('bookshelf-create-all');
         $books = $this->bookQueries->visibleForList()->orderBy('name')->get(['name', 'id', 'slug', 'created_at', 'updated_at']);
         $this->setPageTitle(trans('entities.shelves_create'));
 
@@ -84,7 +83,7 @@ class BookshelfController extends Controller
      */
     public function store(Request $request)
     {
-        $this->checkPermission(Permission::BookshelfCreateAll);
+        $this->checkPermission('bookshelf-create-all');
         $validated = $this->validate($request, [
             'name'             => ['required', 'string', 'max:255'],
             'description_html' => ['string', 'max:2000'],
@@ -106,7 +105,7 @@ class BookshelfController extends Controller
     public function show(Request $request, ActivityQueries $activities, string $slug)
     {
         $shelf = $this->queries->findVisibleBySlugOrFail($slug);
-        $this->checkOwnablePermission(Permission::BookshelfView, $shelf);
+        $this->checkOwnablePermission('bookshelf-view', $shelf);
 
         $listOptions = SimpleListOptions::fromRequest($request, 'shelf_books')->withSortOptions([
             'default' => trans('common.sort_default'),
@@ -116,7 +115,6 @@ class BookshelfController extends Controller
         ]);
 
         $sort = $listOptions->getSort();
-
         $sortedVisibleShelfBooks = $shelf->visibleBooks()
             ->reorder($sort === 'default' ? 'order' : $sort, $listOptions->getOrder())
             ->get()
@@ -145,7 +143,7 @@ class BookshelfController extends Controller
     public function edit(string $slug)
     {
         $shelf = $this->queries->findVisibleBySlugOrFail($slug);
-        $this->checkOwnablePermission(Permission::BookshelfUpdate, $shelf);
+        $this->checkOwnablePermission('bookshelf-update', $shelf);
 
         $shelfBookIds = $shelf->books()->get(['id'])->pluck('id');
         $books = $this->bookQueries->visibleForList()
@@ -171,7 +169,7 @@ class BookshelfController extends Controller
     public function update(Request $request, string $slug)
     {
         $shelf = $this->queries->findVisibleBySlugOrFail($slug);
-        $this->checkOwnablePermission(Permission::BookshelfUpdate, $shelf);
+        $this->checkOwnablePermission('bookshelf-update', $shelf);
         $validated = $this->validate($request, [
             'name'             => ['required', 'string', 'max:255'],
             'description_html' => ['string', 'max:2000'],
@@ -197,7 +195,7 @@ class BookshelfController extends Controller
     public function showDelete(string $slug)
     {
         $shelf = $this->queries->findVisibleBySlugOrFail($slug);
-        $this->checkOwnablePermission(Permission::BookshelfDelete, $shelf);
+        $this->checkOwnablePermission('bookshelf-delete', $shelf);
 
         $this->setPageTitle(trans('entities.shelves_delete_named', ['name' => $shelf->getShortName()]));
 
@@ -212,7 +210,7 @@ class BookshelfController extends Controller
     public function destroy(string $slug)
     {
         $shelf = $this->queries->findVisibleBySlugOrFail($slug);
-        $this->checkOwnablePermission(Permission::BookshelfDelete, $shelf);
+        $this->checkOwnablePermission('bookshelf-delete', $shelf);
 
         $this->shelfRepo->destroy($shelf);
 

app/Entities/Controllers/ChapterApiController.php

@@ -2,20 +2,19 @@
 
 namespace BookStack\Entities\Controllers;
 
-use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Queries\ChapterQueries;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Repos\ChapterRepo;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Http\ApiController;
-use BookStack\Permissions\Permission;
 use Exception;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Http\Request;
 
 class ChapterApiController extends ApiController
 {
-    protected array $rules = [
+    protected $rules = [
         'create' => [
             'book_id'             => ['required', 'integer'],
             'name'                => ['required', 'string', 'max:255'],
@@ -66,7 +65,7 @@ class ChapterApiController extends ApiController
 
         $bookId = $request->get('book_id');
         $book = $this->entityQueries->books->findVisibleByIdOrFail(intval($bookId));
-        $this->checkOwnablePermission(Permission::ChapterCreate, $book);
+        $this->checkOwnablePermission('chapter-create', $book);
 
         $chapter = $this->chapterRepo->create($requestData, $book);
 
@@ -102,10 +101,10 @@ class ChapterApiController extends ApiController
     {
         $requestData = $this->validate($request, $this->rules()['update']);
         $chapter = $this->queries->findVisibleByIdOrFail(intval($id));
-        $this->checkOwnablePermission(Permission::ChapterUpdate, $chapter);
+        $this->checkOwnablePermission('chapter-update', $chapter);
 
-        if ($request->has('book_id') && $chapter->book_id !== (intval($requestData['book_id']) ?: null)) {
-            $this->checkOwnablePermission(Permission::ChapterDelete, $chapter);
+        if ($request->has('book_id') && $chapter->book_id !== intval($requestData['book_id'])) {
+            $this->checkOwnablePermission('chapter-delete', $chapter);
 
             try {
                 $this->chapterRepo->move($chapter, "book:{$requestData['book_id']}");
@@ -130,7 +129,7 @@ class ChapterApiController extends ApiController
     public function delete(string $id)
     {
         $chapter = $this->queries->findVisibleByIdOrFail(intval($id));
-        $this->checkOwnablePermission(Permission::ChapterDelete, $chapter);
+        $this->checkOwnablePermission('chapter-delete', $chapter);
 
         $this->chapterRepo->destroy($chapter);
 
@@ -144,11 +143,8 @@ class ChapterApiController extends ApiController
 
         $chapter->load(['tags']);
         $chapter->makeVisible('description_html');
-        $chapter->setAttribute('description_html', $chapter->descriptionInfo()->getHtml());
-
-        /** @var Book $book */
-        $book = $chapter->book()->first();
-        $chapter->setAttribute('book_slug', $book->slug);
+        $chapter->setAttribute('description_html', $chapter->descriptionHtml());
+        $chapter->setAttribute('book_slug', $chapter->book()->first()->slug);
 
         return $chapter;
     }

app/Entities/Controllers/ChapterController.php

@@ -17,9 +17,7 @@ use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\NotifyException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Http\Controller;
-use BookStack\Permissions\Permission;
 use BookStack\References\ReferenceFetcher;
-use BookStack\Util\DatabaseTransaction;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Throwable;
@@ -40,7 +38,7 @@ class ChapterController extends Controller
     public function create(string $bookSlug)
     {
         $book = $this->entityQueries->books->findVisibleBySlugOrFail($bookSlug);
-        $this->checkOwnablePermission(Permission::ChapterCreate, $book);
+        $this->checkOwnablePermission('chapter-create', $book);
 
         $this->setPageTitle(trans('entities.chapters_create'));
 
@@ -65,7 +63,7 @@ class ChapterController extends Controller
         ]);
 
         $book = $this->entityQueries->books->findVisibleBySlugOrFail($bookSlug);
-        $this->checkOwnablePermission(Permission::ChapterCreate, $book);
+        $this->checkOwnablePermission('chapter-create', $book);
 
         $chapter = $this->chapterRepo->create($validated, $book);
 
@@ -78,6 +76,7 @@ class ChapterController extends Controller
     public function show(string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
+        $this->checkOwnablePermission('chapter-view', $chapter);
 
         $sidebarTree = (new BookContents($chapter->book))->getTree();
         $pages = $this->entityQueries->pages->visibleForChapterList($chapter->id)->get();
@@ -106,7 +105,7 @@ class ChapterController extends Controller
     public function edit(string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
-        $this->checkOwnablePermission(Permission::ChapterUpdate, $chapter);
+        $this->checkOwnablePermission('chapter-update', $chapter);
 
         $this->setPageTitle(trans('entities.chapters_edit_named', ['chapterName' => $chapter->getShortName()]));
 
@@ -128,9 +127,9 @@ class ChapterController extends Controller
         ]);
 
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
-        $this->checkOwnablePermission(Permission::ChapterUpdate, $chapter);
+        $this->checkOwnablePermission('chapter-update', $chapter);
 
-        $chapter = $this->chapterRepo->update($chapter, $validated);
+        $this->chapterRepo->update($chapter, $validated);
 
         return redirect($chapter->getUrl());
     }
@@ -143,7 +142,7 @@ class ChapterController extends Controller
     public function showDelete(string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
-        $this->checkOwnablePermission(Permission::ChapterDelete, $chapter);
+        $this->checkOwnablePermission('chapter-delete', $chapter);
 
         $this->setPageTitle(trans('entities.chapters_delete_named', ['chapterName' => $chapter->getShortName()]));
 
@@ -159,7 +158,7 @@ class ChapterController extends Controller
     public function destroy(string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
-        $this->checkOwnablePermission(Permission::ChapterDelete, $chapter);
+        $this->checkOwnablePermission('chapter-delete', $chapter);
 
         $this->chapterRepo->destroy($chapter);
 
@@ -175,8 +174,8 @@ class ChapterController extends Controller
     {
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $this->setPageTitle(trans('entities.chapters_move_named', ['chapterName' => $chapter->getShortName()]));
-        $this->checkOwnablePermission(Permission::ChapterUpdate, $chapter);
-        $this->checkOwnablePermission(Permission::ChapterDelete, $chapter);
+        $this->checkOwnablePermission('chapter-update', $chapter);
+        $this->checkOwnablePermission('chapter-delete', $chapter);
 
         return view('chapters.move', [
             'chapter' => $chapter,
@@ -192,8 +191,8 @@ class ChapterController extends Controller
     public function move(Request $request, string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
-        $this->checkOwnablePermission(Permission::ChapterUpdate, $chapter);
-        $this->checkOwnablePermission(Permission::ChapterDelete, $chapter);
+        $this->checkOwnablePermission('chapter-update', $chapter);
+        $this->checkOwnablePermission('chapter-delete', $chapter);
 
         $entitySelection = $request->get('entity_selection', null);
         if ($entitySelection === null || $entitySelection === '') {
@@ -221,6 +220,7 @@ class ChapterController extends Controller
     public function showCopy(string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
+        $this->checkOwnablePermission('chapter-view', $chapter);
 
         session()->flashInput(['name' => $chapter->name]);
 
@@ -239,6 +239,7 @@ class ChapterController extends Controller
     public function copy(Request $request, Cloner $cloner, string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
+        $this->checkOwnablePermission('chapter-view', $chapter);
 
         $entitySelection = $request->get('entity_selection') ?: null;
         $newParentBook = $entitySelection ? $this->entityQueries->findVisibleByStringIdentifier($entitySelection) : $chapter->getParent();
@@ -249,7 +250,7 @@ class ChapterController extends Controller
             return redirect($chapter->getUrl('/copy'));
         }
 
-        $this->checkOwnablePermission(Permission::ChapterCreate, $newParentBook);
+        $this->checkOwnablePermission('chapter-create', $newParentBook);
 
         $newName = $request->get('name') ?: $chapter->name;
         $chapterCopy = $cloner->cloneChapter($chapter, $newParentBook, $newName);
@@ -264,13 +265,11 @@ class ChapterController extends Controller
     public function convertToBook(HierarchyTransformer $transformer, string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
-        $this->checkOwnablePermission(Permission::ChapterUpdate, $chapter);
-        $this->checkOwnablePermission(Permission::ChapterDelete, $chapter);
-        $this->checkPermission(Permission::BookCreateAll);
+        $this->checkOwnablePermission('chapter-update', $chapter);
+        $this->checkOwnablePermission('chapter-delete', $chapter);
+        $this->checkPermission('book-create-all');
 
-        $book = (new DatabaseTransaction(function () use ($chapter, $transformer) {
-            return $transformer->transformChapterToBook($chapter);
-        }))->run();
+        $book = $transformer->transformChapterToBook($chapter);
 
         return redirect($book->getUrl());
     }

app/Entities/Controllers/PageApiController.php

@@ -2,19 +2,17 @@
 
 namespace BookStack\Entities\Controllers;
 
-use BookStack\Activity\Tools\CommentTree;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Http\ApiController;
-use BookStack\Permissions\Permission;
 use Exception;
 use Illuminate\Http\Request;
 
 class PageApiController extends ApiController
 {
-    protected array $rules = [
+    protected $rules = [
         'create' => [
             'book_id'    => ['required_without:chapter_id', 'integer'],
             'chapter_id' => ['required_without:book_id', 'integer'],
@@ -78,7 +76,7 @@ class PageApiController extends ApiController
         } else {
             $parent = $this->entityQueries->books->findVisibleByIdOrFail(intval($request->get('book_id')));
         }
-        $this->checkOwnablePermission(Permission::PageCreate, $parent);
+        $this->checkOwnablePermission('page-create', $parent);
 
         $draft = $this->pageRepo->getNewDraftPage($parent);
         $this->pageRepo->publishDraft($draft, $request->only(array_keys($this->rules['create'])));
@@ -89,32 +87,21 @@ class PageApiController extends ApiController
     /**
      * View the details of a single page.
      * Pages will always have HTML content. They may have markdown content
-     * if the Markdown editor was used to last update the page.
+     * if the markdown editor was used to last update the page.
      *
-     * The 'html' property is the fully rendered and escaped HTML content that BookStack
+     * The 'html' property is the fully rendered & escaped HTML content that BookStack
      * would show on page view, with page includes handled.
      * The 'raw_html' property is the direct database stored HTML content, which would be
      * what BookStack shows on page edit.
      *
      * See the "Content Security" section of these docs for security considerations when using
      * the page content returned from this endpoint.
-     *
-     * Comments for the page are provided in a tree-structure representing the hierarchy of top-level
-     * comments and replies, for both archived and active comments.
      */
     public function read(string $id)
     {
         $page = $this->queries->findVisibleByIdOrFail($id);
 
-        $page = $page->forJsonDisplay();
-        $commentTree = (new CommentTree($page));
-        $commentTree->loadVisibleHtml();
-        $page->setAttribute('comments', [
-            'active' => $commentTree->getActive(),
-            'archived' => $commentTree->getArchived(),
-        ]);
-
-        return response()->json($page);
+        return response()->json($page->forJsonDisplay());
     }
 
     /**
@@ -129,7 +116,7 @@ class PageApiController extends ApiController
         $requestData = $this->validate($request, $this->rules['update']);
 
         $page = $this->queries->findVisibleByIdOrFail($id);
-        $this->checkOwnablePermission(Permission::PageUpdate, $page);
+        $this->checkOwnablePermission('page-update', $page);
 
         $parent = null;
         if ($request->has('chapter_id')) {
@@ -139,7 +126,7 @@ class PageApiController extends ApiController
         }
 
         if ($parent && !$parent->matches($page->getParent())) {
-            $this->checkOwnablePermission(Permission::PageDelete, $page);
+            $this->checkOwnablePermission('page-delete', $page);
 
             try {
                 $this->pageRepo->move($page, $parent->getType() . ':' . $parent->id);
@@ -164,7 +151,7 @@ class PageApiController extends ApiController
     public function delete(string $id)
     {
         $page = $this->queries->findVisibleByIdOrFail($id);
-        $this->checkOwnablePermission(Permission::PageDelete, $page);
+        $this->checkOwnablePermission('page-delete', $page);
 
         $this->pageRepo->destroy($page);
 

app/Entities/Controllers/PageController.php

@@ -20,7 +20,6 @@ use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\NotifyException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Http\Controller;
-use BookStack\Permissions\Permission;
 use BookStack\References\ReferenceFetcher;
 use Exception;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -51,7 +50,7 @@ class PageController extends Controller
             $parent = $this->entityQueries->books->findVisibleBySlugOrFail($bookSlug);
         }
 
-        $this->checkOwnablePermission(Permission::PageCreate, $parent);
+        $this->checkOwnablePermission('page-create', $parent);
 
         // Redirect to draft edit screen if signed in
         if ($this->isSignedIn()) {
@@ -83,7 +82,7 @@ class PageController extends Controller
             $parent = $this->entityQueries->books->findVisibleBySlugOrFail($bookSlug);
         }
 
-        $this->checkOwnablePermission(Permission::PageCreate, $parent);
+        $this->checkOwnablePermission('page-create', $parent);
 
         $page = $this->pageRepo->getNewDraftPage($parent);
         $this->pageRepo->publishDraft($page, [
@@ -101,7 +100,7 @@ class PageController extends Controller
     public function editDraft(Request $request, string $bookSlug, int $pageId)
     {
         $draft = $this->queries->findVisibleByIdOrFail($pageId);
-        $this->checkOwnablePermission(Permission::PageCreate, $draft->getParent());
+        $this->checkOwnablePermission('page-create', $draft->getParent());
 
         $editorData = new PageEditorData($draft, $this->entityQueries, $request->query('editor', ''));
         $this->setPageTitle(trans('entities.pages_edit_draft'));
@@ -120,9 +119,8 @@ class PageController extends Controller
         $this->validate($request, [
             'name' => ['required', 'string', 'max:255'],
         ]);
-
         $draftPage = $this->queries->findVisibleByIdOrFail($pageId);
-        $this->checkOwnablePermission(Permission::PageCreate, $draftPage->getParent());
+        $this->checkOwnablePermission('page-create', $draftPage->getParent());
 
         $page = $this->pageRepo->publishDraft($draftPage, $request->all());
 
@@ -150,6 +148,8 @@ class PageController extends Controller
             return redirect($page->getUrl());
         }
 
+        $this->checkOwnablePermission('page-view', $page);
+
         $pageContent = (new PageContent($page));
         $page->html = $pageContent->render();
         $pageNav = $pageContent->getNavigation($page->html);
@@ -197,7 +197,7 @@ class PageController extends Controller
     public function edit(Request $request, string $bookSlug, string $pageSlug)
     {
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        $this->checkOwnablePermission(Permission::PageUpdate, $page, $page->getUrl());
+        $this->checkOwnablePermission('page-update', $page, $page->getUrl());
 
         $editorData = new PageEditorData($page, $this->entityQueries, $request->query('editor', ''));
         if ($editorData->getWarnings()) {
@@ -221,7 +221,7 @@ class PageController extends Controller
             'name' => ['required', 'string', 'max:255'],
         ]);
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        $this->checkOwnablePermission(Permission::PageUpdate, $page);
+        $this->checkOwnablePermission('page-update', $page);
 
         $this->pageRepo->update($page, $request->all());
 
@@ -236,7 +236,7 @@ class PageController extends Controller
     public function saveDraft(Request $request, int $pageId)
     {
         $page = $this->queries->findVisibleByIdOrFail($pageId);
-        $this->checkOwnablePermission(Permission::PageUpdate, $page);
+        $this->checkOwnablePermission('page-update', $page);
 
         if (!$this->isSignedIn()) {
             return $this->jsonError(trans('errors.guests_cannot_save_drafts'), 500);
@@ -273,7 +273,7 @@ class PageController extends Controller
     public function showDelete(string $bookSlug, string $pageSlug)
     {
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        $this->checkOwnablePermission(Permission::PageDelete, $page);
+        $this->checkOwnablePermission('page-delete', $page);
         $this->setPageTitle(trans('entities.pages_delete_named', ['pageName' => $page->getShortName()]));
         $usedAsTemplate =
             $this->entityQueries->books->start()->where('default_template_id', '=', $page->id)->count() > 0 ||
@@ -295,7 +295,7 @@ class PageController extends Controller
     public function showDeleteDraft(string $bookSlug, int $pageId)
     {
         $page = $this->queries->findVisibleByIdOrFail($pageId);
-        $this->checkOwnablePermission(Permission::PageUpdate, $page);
+        $this->checkOwnablePermission('page-update', $page);
         $this->setPageTitle(trans('entities.pages_delete_draft_named', ['pageName' => $page->getShortName()]));
         $usedAsTemplate =
             $this->entityQueries->books->start()->where('default_template_id', '=', $page->id)->count() > 0 ||
@@ -318,7 +318,7 @@ class PageController extends Controller
     public function destroy(string $bookSlug, string $pageSlug)
     {
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        $this->checkOwnablePermission(Permission::PageDelete, $page);
+        $this->checkOwnablePermission('page-delete', $page);
         $parent = $page->getParent();
 
         $this->pageRepo->destroy($page);
@@ -337,13 +337,13 @@ class PageController extends Controller
         $page = $this->queries->findVisibleByIdOrFail($pageId);
         $book = $page->book;
         $chapter = $page->chapter;
-        $this->checkOwnablePermission(Permission::PageUpdate, $page);
+        $this->checkOwnablePermission('page-update', $page);
 
         $this->pageRepo->destroy($page);
 
         $this->showSuccessNotification(trans('entities.pages_delete_draft_success'));
 
-        if ($chapter && userCan(Permission::ChapterView, $chapter)) {
+        if ($chapter && userCan('view', $chapter)) {
             return redirect($chapter->getUrl());
         }
 
@@ -384,8 +384,8 @@ class PageController extends Controller
     public function showMove(string $bookSlug, string $pageSlug)
     {
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        $this->checkOwnablePermission(Permission::PageUpdate, $page);
-        $this->checkOwnablePermission(Permission::PageDelete, $page);
+        $this->checkOwnablePermission('page-update', $page);
+        $this->checkOwnablePermission('page-delete', $page);
 
         return view('pages.move', [
             'book' => $page->book,
@@ -402,8 +402,8 @@ class PageController extends Controller
     public function move(Request $request, string $bookSlug, string $pageSlug)
     {
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        $this->checkOwnablePermission(Permission::PageUpdate, $page);
-        $this->checkOwnablePermission(Permission::PageDelete, $page);
+        $this->checkOwnablePermission('page-update', $page);
+        $this->checkOwnablePermission('page-delete', $page);
 
         $entitySelection = $request->get('entity_selection', null);
         if ($entitySelection === null || $entitySelection === '') {
@@ -431,6 +431,7 @@ class PageController extends Controller
     public function showCopy(string $bookSlug, string $pageSlug)
     {
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
+        $this->checkOwnablePermission('page-view', $page);
         session()->flashInput(['name' => $page->name]);
 
         return view('pages.copy', [
@@ -448,7 +449,7 @@ class PageController extends Controller
     public function copy(Request $request, Cloner $cloner, string $bookSlug, string $pageSlug)
     {
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        $this->checkOwnablePermission(Permission::PageView, $page);
+        $this->checkOwnablePermission('page-view', $page);
 
         $entitySelection = $request->get('entity_selection') ?: null;
         $newParent = $entitySelection ? $this->entityQueries->findVisibleByStringIdentifier($entitySelection) : $page->getParent();
@@ -459,7 +460,7 @@ class PageController extends Controller
             return redirect($page->getUrl('/copy'));
         }
 
-        $this->checkOwnablePermission(Permission::PageCreate, $newParent);
+        $this->checkOwnablePermission('page-create', $newParent);
 
         $newName = $request->get('name') ?: $page->name;
         $pageCopy = $cloner->clonePage($page, $newParent, $newName);

app/Entities/Controllers/PageRevisionController.php

@@ -11,7 +11,6 @@ use BookStack\Entities\Tools\PageContent;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Facades\Activity;
 use BookStack\Http\Controller;
-use BookStack\Permissions\Permission;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
 use Ssddanbrown\HtmlDiff\Diff;
@@ -99,7 +98,7 @@ class PageRevisionController extends Controller
             throw new NotFoundException();
         }
 
-        $prev = $revision->getPreviousRevision();
+        $prev = $revision->getPrevious();
         $prevContent = $prev->html ?? '';
         $diff = Diff::excecute($prevContent, $revision->html);
 
@@ -125,7 +124,7 @@ class PageRevisionController extends Controller
     public function restore(string $bookSlug, string $pageSlug, int $revisionId)
     {
         $page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        $this->checkOwnablePermission(Permission::PageUpdate, $page);
+        $this->checkOwnablePermission('page-update', $page);
 
         $page = $this->pageRepo->restoreRevision($page, $revisionId);
 
@@ -140,7 +139,7 @@ class PageRevisionController extends Controller
     public function destroy(string $bookSlug, string $pageSlug, int $revId)
     {
         $page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        $this->checkOwnablePermission(Permission::PageDelete, $page);
+        $this->checkOwnablePermission('page-delete', $page);
 
         $revision = $page->revisions()->where('id', '=', $revId)->first();
         if ($revision === null) {

app/Entities/Controllers/RecycleBinApiController.php

@@ -6,20 +6,18 @@ use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\BookChild;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Deletion;
-use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\DeletionRepo;
 use BookStack\Http\ApiController;
-use BookStack\Permissions\Permission;
+use Closure;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class RecycleBinApiController extends ApiController
 {
     public function __construct()
     {
         $this->middleware(function ($request, $next) {
-            $this->checkPermission(Permission::SettingsManage);
-            $this->checkPermission(Permission::RestrictionsManageAll);
+            $this->checkPermission('settings-manage');
+            $this->checkPermission('restrictions-manage-all');
 
             return $next($request);
         });
@@ -42,7 +40,7 @@ class RecycleBinApiController extends ApiController
             'updated_at',
             'deletable_type',
             'deletable_id',
-        ], [$this->listFormatter(...)]);
+        ], [Closure::fromCallable([$this, 'listFormatter'])]);
     }
 
     /**
@@ -71,9 +69,10 @@ class RecycleBinApiController extends ApiController
     /**
      * Load some related details for the deletion listing.
      */
-    protected function listFormatter(Deletion $deletion): void
+    protected function listFormatter(Deletion $deletion)
     {
         $deletable = $deletion->deletable;
+        $withTrashedQuery = fn (Builder $query) => $query->withTrashed();
 
         if ($deletable instanceof BookChild) {
             $parent = $deletable->getParent();
@@ -82,19 +81,11 @@ class RecycleBinApiController extends ApiController
         }
 
         if ($deletable instanceof Book || $deletable instanceof Chapter) {
-            $countsToLoad = ['pages' => static::withTrashedQuery(...)];
+            $countsToLoad = ['pages' => $withTrashedQuery];
             if ($deletable instanceof Book) {
-                $countsToLoad['chapters'] = static::withTrashedQuery(...);
+                $countsToLoad['chapters'] = $withTrashedQuery;
             }
             $deletable->loadCount($countsToLoad);
         }
     }
-
-    /**
-     * @param Builder<Chapter|Page> $query
-     */
-    protected static function withTrashedQuery(Builder $query): void
-    {
-        $query->withTrashed();
-    }
 }

app/Entities/Controllers/RecycleBinController.php

@@ -8,7 +8,6 @@ use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Repos\DeletionRepo;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Http\Controller;
-use BookStack\Permissions\Permission;
 
 class RecycleBinController extends Controller
 {
@@ -21,8 +20,8 @@ class RecycleBinController extends Controller
     public function __construct()
     {
         $this->middleware(function ($request, $next) {
-            $this->checkPermission(Permission::SettingsManage);
-            $this->checkPermission(Permission::RestrictionsManageAll);
+            $this->checkPermission('settings-manage');
+            $this->checkPermission('restrictions-manage-all');
 
             return $next($request);
         });

app/Entities/EntityExistsRule.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace BookStack\Entities;
-
-use Illuminate\Validation\Rules\Exists;
-
-class EntityExistsRule implements \Stringable
-{
-    public function __construct(
-        protected string $type,
-    ) {
-    }
-
-    public function __toString()
-    {
-        $existsRule = (new Exists('entities', 'id'))
-            ->where('type', $this->type);
-        return $existsRule->__toString();
-    }
-}

app/Entities/Models/Book.php

@@ -2,10 +2,9 @@
 
 namespace BookStack\Entities\Models;
 
-use BookStack\Entities\Tools\EntityCover;
-use BookStack\Entities\Tools\EntityDefaultTemplate;
 use BookStack\Sorting\SortRule;
 use BookStack\Uploads\Image;
+use Exception;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
@@ -16,25 +15,26 @@ use Illuminate\Support\Collection;
  * Class Book.
  *
  * @property string                                   $description
- * @property string                                   $description_html
  * @property int                                      $image_id
  * @property ?int                                     $default_template_id
  * @property ?int                                     $sort_rule_id
+ * @property Image|null                               $cover
  * @property \Illuminate\Database\Eloquent\Collection $chapters
  * @property \Illuminate\Database\Eloquent\Collection $pages
  * @property \Illuminate\Database\Eloquent\Collection $directPages
  * @property \Illuminate\Database\Eloquent\Collection $shelves
- * @property ?SortRule                                $sortRule
+ * @property ?Page                                    $defaultTemplate
+ * @property ?SortRule                                 $sortRule
  */
-class Book extends Entity implements HasDescriptionInterface, HasCoverInterface, HasDefaultTemplateInterface
+class Book extends Entity implements HasCoverImage
 {
     use HasFactory;
-    use ContainerTrait;
+    use HasHtmlDescription;
 
     public float $searchFactor = 1.2;
 
-    protected $hidden = ['pivot', 'deleted_at', 'description_html', 'entity_id', 'entity_type', 'chapter_id', 'book_id', 'priority'];
     protected $fillable = ['name'];
+    protected $hidden = ['pivot', 'image_id', 'deleted_at', 'description_html'];
 
     /**
      * Get the url for this book.
@@ -44,9 +44,57 @@ class Book extends Entity implements HasDescriptionInterface, HasCoverInterface,
         return url('/books/' . implode('/', [urlencode($this->slug), trim($path, '/')]));
     }
 
+    /**
+     * Returns book cover image, if book cover not exists return default cover image.
+     */
+    public function getBookCover(int $width = 440, int $height = 250): string
+    {
+        $default = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==';
+        if (!$this->image_id || !$this->cover) {
+            return $default;
+        }
+
+        try {
+            return $this->cover->getThumb($width, $height, false) ?? $default;
+        } catch (Exception $err) {
+            return $default;
+        }
+    }
+
+    /**
+     * Get the cover image of the book.
+     */
+    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_book';
+    }
+
+    /**
+     * Get the Page that is used as default template for newly created pages within this Book.
+     */
+    public function defaultTemplate(): BelongsTo
+    {
+        return $this->belongsTo(Page::class, 'default_template_id');
+    }
+
+    /**
+     * Get the sort set assigned to this book, if existing.
+     */
+    public function sortRule(): BelongsTo
+    {
+        return $this->belongsTo(SortRule::class);
+    }
+
     /**
      * Get all pages within this book.
-     * @return HasMany<Page, $this>
      */
     public function pages(): HasMany
     {
@@ -58,12 +106,11 @@ class Book extends Entity implements HasDescriptionInterface, HasCoverInterface,
      */
     public function directPages(): HasMany
     {
-        return $this->pages()->whereNull('chapter_id');
+        return $this->pages()->where('chapter_id', '=', '0');
     }
 
     /**
      * Get all chapters within this book.
-     * @return HasMany<Chapter, $this>
      */
     public function chapters(): HasMany
     {
@@ -88,27 +135,4 @@ class Book extends Entity implements HasDescriptionInterface, HasCoverInterface,
 
         return $pages->concat($chapters)->sortBy('priority')->sortByDesc('draft');
     }
-
-    public function defaultTemplate(): EntityDefaultTemplate
-    {
-        return new EntityDefaultTemplate($this);
-    }
-
-    public function cover(): BelongsTo
-    {
-        return $this->belongsTo(Image::class, 'image_id');
-    }
-
-    public function coverInfo(): EntityCover
-    {
-        return new EntityCover($this);
-    }
-
-    /**
-     * Get the sort rule assigned to this container, if existing.
-     */
-    public function sortRule(): BelongsTo
-    {
-        return $this->belongsTo(SortRule::class);
-    }
 }

app/Entities/Models/BookChild.php

@@ -3,6 +3,7 @@
 namespace BookStack\Entities\Models;
 
 use BookStack\References\ReferenceUpdater;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
@@ -26,13 +27,13 @@ abstract class BookChild extends Entity
     /**
      * Change the book that this entity belongs to.
      */
-    public function changeBook(int $newBookId): self
+    public function changeBook(int $newBookId): Entity
     {
         $oldUrl = $this->getUrl();
         $this->book_id = $newBookId;
-        $this->unsetRelation('book');
         $this->refreshSlug();
         $this->save();
+        $this->refresh();
 
         if ($oldUrl !== $this->getUrl()) {
             app()->make(ReferenceUpdater::class)->updateEntityReferences($this, $oldUrl);

app/Entities/Models/Bookshelf.php

@@ -2,34 +2,34 @@
 
 namespace BookStack\Entities\Models;
 
-use BookStack\Entities\Tools\EntityCover;
 use BookStack\Uploads\Image;
+use Exception;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
-/**
- * @property string $description
- * @property string $description_html
- */
-class Bookshelf extends Entity implements HasDescriptionInterface, HasCoverInterface
+class Bookshelf extends Entity implements HasCoverImage
 {
     use HasFactory;
-    use ContainerTrait;
+    use HasHtmlDescription;
+
+    protected $table = 'bookshelves';
 
     public float $searchFactor = 1.2;
 
-    protected $hidden = ['image_id', 'deleted_at', 'description_html', 'priority', 'default_template_id', 'sort_rule_id', 'entity_id', 'entity_type', 'chapter_id', 'book_id'];
-    protected $fillable = ['name'];
+    protected $fillable = ['name', 'description', 'image_id'];
+
+    protected $hidden = ['image_id', 'deleted_at', 'description_html'];
 
     /**
      * Get the books in this shelf.
-     * Should not be used directly since it does not take into account permissions.
+     * Should not be used directly since does not take into account permissions.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
-    public function books(): BelongsToMany
+    public function books()
     {
         return $this->belongsToMany(Book::class, 'bookshelves_books', 'bookshelf_id', 'book_id')
-            ->select(['entities.*', 'entity_container_data.*'])
             ->withPivot('order')
             ->orderBy('order', 'asc');
     }
@@ -50,6 +50,40 @@ class Bookshelf extends Entity implements HasDescriptionInterface, HasCoverInter
         return url('/shelves/' . implode('/', [urlencode($this->slug), trim($path, '/')]));
     }
 
+    /**
+     * Returns shelf cover image, if cover not exists return default cover image.
+     */
+    public function getBookCover(int $width = 440, int $height = 250): string
+    {
+        // TODO - Make generic, focused on books right now, Perhaps set-up a better image
+        $default = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==';
+        if (!$this->image_id || !$this->cover) {
+            return $default;
+        }
+
+        try {
+            return $this->cover->getThumb($width, $height, false) ?? $default;
+        } catch (Exception $err) {
+            return $default;
+        }
+    }
+
+    /**
+     * Get the cover image of the shelf.
+     */
+    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_bookshelf';
+    }
+
     /**
      * Check if this shelf contains the given book.
      */
@@ -61,7 +95,7 @@ class Bookshelf extends Entity implements HasDescriptionInterface, HasCoverInter
     /**
      * Add a book to the end of this shelf.
      */
-    public function appendBook(Book $book): void
+    public function appendBook(Book $book)
     {
         if ($this->contains($book)) {
             return;
@@ -71,13 +105,12 @@ class Bookshelf extends Entity implements HasDescriptionInterface, HasCoverInter
         $this->books()->attach($book->id, ['order' => $maxOrder + 1]);
     }
 
-    public function coverInfo(): EntityCover
+    /**
+     * Get a visible shelf by its slug.
+     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
+     */
+    public static function getBySlug(string $slug): self
     {
-        return new EntityCover($this);
-    }
-
-    public function cover(): BelongsTo
-    {
-        return $this->belongsTo(Image::class, 'image_id');
+        return static::visible()->where('slug', '=', $slug)->firstOrFail();
     }
 }

app/Entities/Models/Chapter.php

@@ -2,30 +2,32 @@
 
 namespace BookStack\Entities\Models;
 
-use BookStack\Entities\Tools\EntityDefaultTemplate;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Collection;
 
 /**
+ * Class Chapter.
+ *
  * @property Collection<Page> $pages
  * @property ?int             $default_template_id
- * @property string           $description
- * @property string           $description_html
+ * @property ?Page            $defaultTemplate
  */
-class Chapter extends BookChild implements HasDescriptionInterface, HasDefaultTemplateInterface
+class Chapter extends BookChild
 {
     use HasFactory;
-    use ContainerTrait;
+    use HasHtmlDescription;
 
     public float $searchFactor = 1.2;
-    protected $hidden = ['pivot', 'deleted_at', 'description_html', 'sort_rule_id', 'image_id', 'entity_id', 'entity_type', 'chapter_id'];
-    protected $fillable = ['name', 'priority'];
+
+    protected $fillable = ['name', 'description', 'priority'];
+    protected $hidden = ['pivot', 'deleted_at', 'description_html'];
 
     /**
      * Get the pages that this chapter contains.
      *
-     * @return HasMany<Page, $this>
+     * @return HasMany<Page>
      */
     public function pages(string $dir = 'ASC'): HasMany
     {
@@ -48,9 +50,17 @@ class Chapter extends BookChild implements HasDescriptionInterface, HasDefaultTe
         return url('/' . implode('/', $parts));
     }
 
+    /**
+     * Get the Page that is used as default template for newly created pages within this Chapter.
+     */
+    public function defaultTemplate(): BelongsTo
+    {
+        return $this->belongsTo(Page::class, 'default_template_id');
+    }
+
     /**
      * Get the visible pages in this chapter.
-     * @return Collection<Page>
+     * @returns Collection<Page>
      */
     public function getVisiblePages(): Collection
     {
@@ -60,9 +70,4 @@ class Chapter extends BookChild implements HasDescriptionInterface, HasDefaultTe
         ->orderBy('priority', 'asc')
         ->get();
     }
-
-    public function defaultTemplate(): EntityDefaultTemplate
-    {
-        return new EntityDefaultTemplate($this);
-    }
 }

app/Entities/Models/ContainerTrait.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Models;
-
-use BookStack\Entities\Tools\EntityHtmlDescription;
-use Illuminate\Database\Eloquent\Relations\HasOne;
-
-/**
- * @mixin Entity
- */
-trait ContainerTrait
-{
-    public function descriptionInfo(): EntityHtmlDescription
-    {
-        return new EntityHtmlDescription($this);
-    }
-
-    /**
-     * @return HasOne<EntityContainerData, $this>
-     */
-    public function relatedData(): HasOne
-    {
-        return $this->hasOne(EntityContainerData::class, 'entity_id', 'id')
-            ->where('entity_type', '=', $this->getMorphClass());
-    }
-}

app/Entities/Models/Deletable.php

@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
  * A model that can be deleted in a manner that deletions
  * are tracked to be part of the recycle bin system.
  */
-interface DeletableInterface
+interface Deletable
 {
     public function deletions(): MorphMany;
 }

app/Entities/Models/Deletion.php

@@ -4,7 +4,6 @@ namespace BookStack\Entities\Models;
 
 use BookStack\Activity\Models\Loggable;
 use BookStack\Users\Models\User;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
@@ -14,12 +13,10 @@ use Illuminate\Database\Eloquent\Relations\MorphTo;
  * @property int       $deleted_by
  * @property string    $deletable_type
  * @property int       $deletable_id
- * @property DeletableInterface $deletable
+ * @property Deletable $deletable
  */
 class Deletion extends Model implements Loggable
 {
-    use HasFactory;
-
     protected $hidden = [];
 
     /**

app/Entities/Models/Entity.php

@@ -12,7 +12,7 @@ use BookStack\Activity\Models\View;
 use BookStack\Activity\Models\Viewable;
 use BookStack\Activity\Models\Watch;
 use BookStack\App\Model;
-use BookStack\App\SluggableInterface;
+use BookStack\App\Sluggable;
 use BookStack\Entities\Tools\SlugGenerator;
 use BookStack\Permissions\JointPermissionBuilder;
 use BookStack\Permissions\Models\EntityPermission;
@@ -22,47 +22,37 @@ use BookStack\References\Reference;
 use BookStack\Search\SearchIndex;
 use BookStack\Search\SearchTerm;
 use BookStack\Users\Models\HasCreatorAndUpdater;
-use BookStack\Users\Models\OwnableInterface;
-use BookStack\Users\Models\User;
+use BookStack\Users\Models\HasOwner;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * Class Entity
- * The base class for book-like items such as pages, chapters and books.
+ * 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     $type
  * @property string     $name
  * @property string     $slug
  * @property Carbon     $created_at
  * @property Carbon     $updated_at
  * @property Carbon     $deleted_at
- * @property int|null   $created_by
- * @property int|null   $updated_by
- * @property int|null   $owned_by
+ * @property int        $created_by
+ * @property int        $updated_by
  * @property Collection $tags
  *
  * @method static Entity|Builder visible()
  * @method static Builder withLastView()
  * @method static Builder withViewCount()
  */
-abstract class Entity extends Model implements
-    SluggableInterface,
-    Favouritable,
-    Viewable,
-    DeletableInterface,
-    OwnableInterface,
-    Loggable
+abstract class Entity extends Model implements Sluggable, Favouritable, Viewable, Deletable, Loggable
 {
     use SoftDeletes;
     use HasCreatorAndUpdater;
+    use HasOwner;
 
     /**
      * @var string - Name of property where the main text content is found
@@ -79,72 +69,6 @@ abstract class Entity extends Model implements
      */
     public float $searchFactor = 1.0;
 
-    /**
-     * Set the table to be that used by all entities.
-     */
-    protected $table = 'entities';
-
-    /**
-     * Set a custom query builder for entities.
-     */
-    protected static string $builder = EntityQueryBuilder::class;
-
-    public static array $commonFields = [
-        'id',
-        'type',
-        'name',
-        'slug',
-        'book_id',
-        'chapter_id',
-        'priority',
-        'created_at',
-        'updated_at',
-        'deleted_at',
-        'created_by',
-        'updated_by',
-        'owned_by',
-    ];
-
-    /**
-     * Override the save method to also save the contents for convenience.
-     */
-    public function save(array $options = []): bool
-    {
-        /** @var EntityPageData|EntityContainerData $contents */
-        $contents = $this->relatedData()->firstOrNew();
-        $contentFields = $this->getContentsAttributes();
-
-        foreach ($contentFields as $key => $value) {
-            $contents->setAttribute($key, $value);
-            unset($this->attributes[$key]);
-        }
-
-        $this->setAttribute('type', $this->getMorphClass());
-        $result = parent::save($options);
-        $contentsResult = true;
-
-        if ($result && $contents->isDirty()) {
-            $contentsFillData = $contents instanceof EntityPageData ? ['page_id' => $this->id] : ['entity_id' => $this->id, 'entity_type' => $this->getMorphClass()];
-            $contents->forceFill($contentsFillData);
-            $contentsResult = $contents->save();
-            $this->touch();
-        }
-
-        $this->forceFill($contentFields);
-
-        return $result && $contentsResult;
-    }
-
-    /**
-     * Check if this item is a container item.
-     */
-    public function isContainer(): bool
-    {
-        return $this instanceof Bookshelf ||
-            $this instanceof Book ||
-            $this instanceof Chapter;
-    }
-
     /**
      * Get the entities that are visible to the current user.
      */
@@ -159,8 +83,8 @@ abstract class Entity extends Model implements
     public function scopeWithLastView(Builder $query)
     {
         $viewedAtQuery = View::query()->select('updated_at')
-            ->whereColumn('viewable_id', '=', 'entities.id')
-            ->whereColumn('viewable_type', '=', 'entities.type')
+            ->whereColumn('viewable_id', '=', $this->getTable() . '.id')
+            ->where('viewable_type', '=', $this->getMorphClass())
             ->where('user_id', '=', user()->id)
             ->take(1);
 
@@ -170,12 +94,11 @@ abstract class Entity extends Model implements
     /**
      * Query scope to get the total view count of the entities.
      */
-    public function scopeWithViewCount(Builder $query): void
+    public function scopeWithViewCount(Builder $query)
     {
         $viewCountQuery = View::query()->selectRaw('SUM(views) as view_count')
-            ->whereColumn('viewable_id', '=', 'entities.id')
-            ->whereColumn('viewable_type', '=', 'entities.type')
-            ->take(1);
+            ->whereColumn('viewable_id', '=', $this->getTable() . '.id')
+            ->where('viewable_type', '=', $this->getMorphClass())->take(1);
 
         $query->addSelect(['view_count' => $viewCountQuery]);
     }
@@ -231,17 +154,15 @@ abstract class Entity extends Model implements
      */
     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.
-     * @return MorphMany<Comment, $this>
      */
     public function comments(bool $orderByCreated = true): MorphMany
     {
-        $query = $this->morphMany(Comment::class, 'commentable');
+        $query = $this->morphMany(Comment::class, 'entity');
 
         return $orderByCreated ? $query->orderBy('created_at', 'asc') : $query;
     }
@@ -255,7 +176,7 @@ abstract class Entity extends Model implements
     }
 
     /**
-     * Get this entities assigned permissions.
+     * Get this entities restrictions.
      */
     public function permissions(): MorphMany
     {
@@ -278,20 +199,6 @@ abstract class Entity extends Model implements
         return $this->morphMany(JointPermission::class, 'entity');
     }
 
-    /**
-     * Get the user who owns this entity.
-     * @return BelongsTo<User, $this>
-     */
-    public function ownedBy(): BelongsTo
-    {
-        return $this->belongsTo(User::class, 'owned_by');
-    }
-
-    public function getOwnerFieldName(): string
-    {
-        return 'owned_by';
-    }
-
     /**
      * Get the related delete records for this entity.
      */
@@ -338,7 +245,7 @@ abstract class Entity extends Model implements
     }
 
     /**
-     * Gets a limited-length version of the entity name.
+     * Gets a limited-length version of the entities name.
      */
     public function getShortName(int $length = 25): string
     {
@@ -376,14 +283,10 @@ abstract class Entity extends Model implements
     public function getParent(): ?self
     {
         if ($this instanceof Page) {
-            /** @var BelongsTo<Chapter|Book, Page>  $builder */
-            $builder = $this->chapter_id ? $this->chapter() : $this->book();
-            return $builder->withTrashed()->first();
+            return $this->chapter_id ? $this->chapter()->withTrashed()->first() : $this->book()->withTrashed()->first();
         }
         if ($this instanceof Chapter) {
-            /** @var BelongsTo<Book, Page>  $builder */
-            $builder = $this->book();
-            return $builder->withTrashed()->first();
+            return $this->book()->withTrashed()->first();
         }
 
         return null;
@@ -392,7 +295,7 @@ abstract class Entity extends Model implements
     /**
      * Rebuild the permissions for this entity.
      */
-    public function rebuildPermissions(): void
+    public function rebuildPermissions()
     {
         app()->make(JointPermissionBuilder::class)->rebuildForEntity(clone $this);
     }
@@ -400,7 +303,7 @@ abstract class Entity extends Model implements
     /**
      * Index the current entity for search.
      */
-    public function indexForSearch(): void
+    public function indexForSearch()
     {
         app()->make(SearchIndex::class)->indexEntity(clone $this);
     }
@@ -410,7 +313,7 @@ abstract class Entity extends Model implements
      */
     public function refreshSlug(): string
     {
-        $this->slug = app()->make(SlugGenerator::class)->generate($this, $this->name);
+        $this->slug = app()->make(SlugGenerator::class)->generate($this);
 
         return $this->slug;
     }
@@ -448,40 +351,4 @@ abstract class Entity extends Model implements
     {
         return "({$this->id}) {$this->name}";
     }
-
-    /**
-     * @return HasOne<covariant (EntityContainerData|EntityPageData), $this>
-     */
-    abstract public function relatedData(): HasOne;
-
-    /**
-     * Get the attributes that are intended for the related contents model.
-     * @return array<string, mixed>
-     */
-    protected function getContentsAttributes(): array
-    {
-        $contentFields = [];
-        $contentModel = $this instanceof Page ? EntityPageData::class : EntityContainerData::class;
-
-        foreach ($this->attributes as $key => $value) {
-            if (in_array($key, $contentModel::$fields)) {
-                $contentFields[$key] = $value;
-            }
-        }
-
-        return $contentFields;
-    }
-
-    /**
-     * Create a new instance for the given entity type.
-     */
-    public static function instanceFromType(string $type): self
-    {
-        return match ($type) {
-            'page' => new Page(),
-            'chapter' => new Chapter(),
-            'book' => new Book(),
-            'bookshelf' => new Bookshelf(),
-        };
-    }
 }

app/Entities/Models/EntityContainerData.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Models;
-
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * @property int     $entity_id
- * @property string  $entity_type
- * @property string  $description
- * @property string  $description_html
- * @property ?int    $default_template_id
- * @property ?int    $image_id
- * @property ?int    $sort_rule_id
- */
-class EntityContainerData extends Model
-{
-    public $timestamps = false;
-    protected $primaryKey = 'entity_id';
-    public $incrementing = false;
-
-    public static array $fields = [
-        'description',
-        'description_html',
-        'default_template_id',
-        'image_id',
-        'sort_rule_id',
-    ];
-
-    /**
-     * Override the default set keys for save query method to make it work with composite keys.
-     */
-    public function setKeysForSaveQuery($query): Builder
-    {
-        $query->where($this->getKeyName(), '=', $this->getKeyForSaveQuery())
-            ->where('entity_type', '=', $this->entity_type);
-
-        return $query;
-    }
-
-    /**
-     * Override the default set keys for a select query method to make it work with composite keys.
-     */
-    protected function setKeysForSelectQuery($query): Builder
-    {
-        $query->where($this->getKeyName(), '=', $this->getKeyForSelectQuery())
-            ->where('entity_type', '=', $this->entity_type);
-
-        return $query;
-    }
-}

app/Entities/Models/EntityPageData.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * @property int    $page_id
- */
-class EntityPageData extends Model
-{
-    public $timestamps = false;
-    protected $primaryKey = 'page_id';
-    public $incrementing = false;
-
-    public static array $fields = [
-        'draft',
-        'template',
-        'revision_count',
-        'editor',
-        'html',
-        'text',
-        'markdown',
-    ];
-}

app/Entities/Models/EntityQueryBuilder.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Models;
-
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Query\Builder as QueryBuilder;
-
-class EntityQueryBuilder extends Builder
-{
-    /**
-     * Create a new Eloquent query builder instance.
-     */
-    public function __construct(QueryBuilder $query)
-    {
-        parent::__construct($query);
-
-        $this->withGlobalScope('entity', new EntityScope());
-    }
-
-    public function withoutGlobalScope($scope): static
-    {
-        // Prevent removal of the entity scope
-        if ($scope === 'entity') {
-            return $this;
-        }
-
-        return parent::withoutGlobalScope($scope);
-    }
-
-    /**
-     * Override the default forceDelete method to add type filter onto the query
-     * since it specifically ignores scopes by default.
-     */
-    public function forceDelete()
-    {
-        return $this->query->where('type', '=', $this->model->getMorphClass())->delete();
-    }
-}

app/Entities/Models/EntityScope.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Models;
-
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Scope;
-use Illuminate\Database\Query\JoinClause;
-
-class EntityScope implements Scope
-{
-    /**
-     * Apply the scope to a given Eloquent query builder.
-     */
-    public function apply(Builder $builder, Model $model): void
-    {
-        $builder = $builder->where('type', '=', $model->getMorphClass());
-        $table = $model->getTable();
-        if ($model instanceof Page) {
-            $builder->leftJoin('entity_page_data', 'entity_page_data.page_id', '=', "{$table}.id");
-        } else {
-            $builder->leftJoin('entity_container_data', function (JoinClause $join) use ($model, $table) {
-                $join->on('entity_container_data.entity_id', '=', "{$table}.id")
-                    ->where('entity_container_data.entity_type', '=', $model->getMorphClass());
-            });
-        }
-    }
-}

app/Entities/Models/EntityTable.php

@@ -1,69 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Models;
-
-use BookStack\Activity\Models\Tag;
-use BookStack\Activity\Models\View;
-use BookStack\App\Model;
-use BookStack\Permissions\Models\EntityPermission;
-use BookStack\Permissions\Models\JointPermission;
-use BookStack\Permissions\PermissionApplicator;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\Relations\MorphMany;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-/**
- * This is a simplistic model interpretation of a generic Entity used to query and represent
- * that database abstractly. Generally, this should rarely be used outside queries.
- */
-class EntityTable extends Model
-{
-    use SoftDeletes;
-
-    protected $table = 'entities';
-
-    /**
-     * Get the entities that are visible to the current user.
-     */
-    public function scopeVisible(Builder $query): Builder
-    {
-        return app()->make(PermissionApplicator::class)->restrictEntityQuery($query);
-    }
-
-    /**
-     * Get the entity jointPermissions this is connected to.
-     */
-    public function jointPermissions(): HasMany
-    {
-        return $this->hasMany(JointPermission::class, 'entity_id')
-            ->whereColumn('entity_type', '=', 'entities.type');
-    }
-
-    /**
-     * Get the Tags that have been assigned to entities.
-     */
-    public function tags(): HasMany
-    {
-        return $this->hasMany(Tag::class, 'entity_id')
-            ->whereColumn('entity_type', '=', 'entities.type');
-    }
-
-    /**
-     * Get the assigned permissions.
-     */
-    public function permissions(): HasMany
-    {
-        return $this->hasMany(EntityPermission::class, 'entity_id')
-            ->whereColumn('entity_type', '=', 'entities.type');
-    }
-
-    /**
-     * Get View objects for this entity.
-     */
-    public function views(): HasMany
-    {
-        return $this->hasMany(View::class, 'viewable_id')
-            ->whereColumn('viewable_type', '=', 'entities.type');
-    }
-}

app/Entities/Models/HasCoverImage.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace BookStack\Entities\Models;
+
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+interface HasCoverImage
+{
+    /**
+     * Get the cover image for this item.
+     */
+    public function cover(): BelongsTo;
+
+    /**
+     * Get the type of the image model that is used when storing a cover image.
+     */
+    public function coverImageTypeKey(): string;
+}

app/Entities/Models/HasCoverInterface.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Models;
-
-use BookStack\Entities\Tools\EntityCover;
-use BookStack\Uploads\Image;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-
-interface HasCoverInterface
-{
-    public function coverInfo(): EntityCover;
-
-    /**
-     * The cover image of this entity.
-     * @return BelongsTo<Image, covariant Entity>
-     */
-    public function cover(): BelongsTo;
-}

app/Entities/Models/HasDefaultTemplateInterface.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Models;
-
-use BookStack\Entities\Tools\EntityDefaultTemplate;
-
-interface HasDefaultTemplateInterface
-{
-    public function defaultTemplate(): EntityDefaultTemplate;
-}

app/Entities/Models/HasDescriptionInterface.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Models;
-
-use BookStack\Entities\Tools\EntityHtmlDescription;
-
-interface HasDescriptionInterface
-{
-    public function descriptionInfo(): EntityHtmlDescription;
-}

app/Entities/Models/HasHtmlDescription.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace BookStack\Entities\Models;
+
+use BookStack\Util\HtmlContentFilter;
+
+/**
+ * @property string $description
+ * @property string $description_html
+ */
+trait HasHtmlDescription
+{
+    /**
+     * Get the HTML description for this book.
+     */
+    public function descriptionHtml(): string
+    {
+        $html = $this->description_html ?: '<p>' . nl2br(e($this->description)) . '</p>';
+        return HtmlContentFilter::removeScriptsFromHtmlString($html);
+    }
+}

app/Entities/Models/Page.php

@@ -3,6 +3,7 @@
 namespace BookStack\Entities\Models;
 
 use BookStack\Entities\Tools\PageContent;
+use BookStack\Entities\Tools\PageEditorType;
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Uploads\Attachment;
 use Illuminate\Database\Eloquent\Builder;
@@ -14,7 +15,7 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
 
 /**
  * Class Page.
- * @property EntityPageData $pageData
+ *
  * @property int          $chapter_id
  * @property string       $html
  * @property string       $markdown
@@ -32,10 +33,12 @@ class Page extends BookChild
 {
     use HasFactory;
 
+    protected $fillable = ['name', 'priority'];
+
     public string $textField = 'text';
     public string $htmlField = 'html';
-    protected $hidden = ['html', 'markdown', 'text', 'pivot', 'deleted_at',  'entity_id', 'entity_type'];
-    protected $fillable = ['name', 'priority'];
+
+    protected $hidden = ['html', 'markdown', 'text', 'pivot', 'deleted_at'];
 
     protected $casts = [
         'draft'    => 'boolean',
@@ -54,8 +57,10 @@ class Page extends BookChild
 
     /**
      * Get the chapter that this page is in, If applicable.
+     *
+     * @return BelongsTo
      */
-    public function chapter(): BelongsTo
+    public function chapter()
     {
         return $this->belongsTo(Chapter::class);
     }
@@ -102,8 +107,10 @@ class Page extends BookChild
 
     /**
      * Get the attachments assigned to this page.
+     *
+     * @return HasMany
      */
-    public function attachments(): HasMany
+    public function attachments()
     {
         return $this->hasMany(Attachment::class, 'uploaded_to')->orderBy('order', 'asc');
     }
@@ -132,16 +139,8 @@ class Page extends BookChild
         $refreshed = $this->refresh()->unsetRelations()->load(['tags', 'createdBy', 'updatedBy', 'ownedBy']);
         $refreshed->setHidden(array_diff($refreshed->getHidden(), ['html', 'markdown']));
         $refreshed->setAttribute('raw_html', $refreshed->html);
-        $refreshed->setAttribute('html', (new PageContent($refreshed))->render());
+        $refreshed->html = (new PageContent($refreshed))->render();
 
         return $refreshed;
     }
-
-    /**
-     * @return HasOne<EntityPageData, $this>
-     */
-    public function relatedData(): HasOne
-    {
-        return $this->hasOne(EntityPageData::class, 'page_id', 'id');
-    }
 }

app/Entities/Models/PageRevision.php

@@ -6,7 +6,6 @@ use BookStack\Activity\Models\Loggable;
 use BookStack\App\Model;
 use BookStack\Users\Models\User;
 use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
@@ -31,8 +30,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
  */
 class PageRevision extends Model implements Loggable
 {
-    use HasFactory;
-
     protected $fillable = ['name', 'text', 'summary'];
     protected $hidden = ['html', 'markdown', 'text'];
 
@@ -63,7 +60,7 @@ class PageRevision extends Model implements Loggable
     /**
      * Get the previous revision for the same page if existing.
      */
-    public function getPreviousRevision(): ?PageRevision
+    public function getPrevious(): ?PageRevision
     {
         $id = static::newQuery()->where('page_id', '=', $this->page_id)
             ->where('id', '<', $this->id)

app/Entities/Queries/BookQueries.php

@@ -6,9 +6,6 @@ use BookStack\Entities\Models\Book;
 use BookStack\Exceptions\NotFoundException;
 use Illuminate\Database\Eloquent\Builder;
 
-/**
- * @implements ProvidesEntityQueries<Book>
- */
 class BookQueries implements ProvidesEntityQueries
 {
     protected static array $listAttributes = [
@@ -16,9 +13,6 @@ class BookQueries implements ProvidesEntityQueries
         'created_at', 'updated_at', 'image_id', 'owned_by',
     ];
 
-    /**
-     * @return Builder<Book>
-     */
     public function start(): Builder
     {
         return Book::query();
@@ -55,11 +49,6 @@ class BookQueries implements ProvidesEntityQueries
             ->select(static::$listAttributes);
     }
 
-    public function visibleForContent(): Builder
-    {
-        return $this->start()->scopes('visible');
-    }
-
     public function visibleForListWithCover(): Builder
     {
         return $this->visibleForList()->with('cover');

app/Entities/Queries/BookshelfQueries.php

@@ -6,9 +6,6 @@ use BookStack\Entities\Models\Bookshelf;
 use BookStack\Exceptions\NotFoundException;
 use Illuminate\Database\Eloquent\Builder;
 
-/**
- * @implements ProvidesEntityQueries<Bookshelf>
- */
 class BookshelfQueries implements ProvidesEntityQueries
 {
     protected static array $listAttributes = [
@@ -16,9 +13,6 @@ class BookshelfQueries implements ProvidesEntityQueries
         'created_at', 'updated_at', 'image_id', 'owned_by',
     ];
 
-    /**
-     * @return Builder<Bookshelf>
-     */
     public function start(): Builder
     {
         return Bookshelf::query();
@@ -60,11 +54,6 @@ class BookshelfQueries implements ProvidesEntityQueries
         return $this->start()->scopes('visible')->select(static::$listAttributes);
     }
 
-    public function visibleForContent(): Builder
-    {
-        return $this->start()->scopes('visible');
-    }
-
     public function visibleForListWithCover(): Builder
     {
         return $this->visibleForList()->with('cover');

app/Entities/Queries/ChapterQueries.php

@@ -6,9 +6,6 @@ use BookStack\Entities\Models\Chapter;
 use BookStack\Exceptions\NotFoundException;
 use Illuminate\Database\Eloquent\Builder;
 
-/**
- * @implements ProvidesEntityQueries<Chapter>
- */
 class ChapterQueries implements ProvidesEntityQueries
 {
     protected static array $listAttributes = [
@@ -65,14 +62,8 @@ class ChapterQueries implements ProvidesEntityQueries
             ->scopes('visible')
             ->select(array_merge(static::$listAttributes, ['book_slug' => function ($builder) {
                 $builder->select('slug')
-                    ->from('entities as books')
-                    ->where('type', '=', 'book')
-                    ->whereColumn('books.id', '=', 'entities.book_id');
+                    ->from('books')
+                    ->whereColumn('books.id', '=', 'chapters.book_id');
             }]));
     }
-
-    public function visibleForContent(): Builder
-    {
-        return $this->start()->scopes('visible');
-    }
 }

app/Entities/Queries/EntityQueries.php

@@ -3,11 +3,7 @@
 namespace BookStack\Entities\Queries;
 
 use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\EntityTable;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Query\Builder as QueryBuilder;
-use Illuminate\Database\Query\JoinClause;
-use Illuminate\Support\Facades\DB;
 use InvalidArgumentException;
 
 class EntityQueries
@@ -36,55 +32,19 @@ class EntityQueries
         return $queries->findVisibleById($entityId);
     }
 
-    /**
-     * Start a query across all entity types.
-     * Combines the description/text fields into a single 'description' field.
-     * @return Builder<EntityTable>
-     */
-    public function visibleForList(): Builder
-    {
-        $rawDescriptionField = DB::raw('COALESCE(description, text) as description');
-        $bookSlugSelect = function (QueryBuilder $query) {
-            return $query->select('slug')->from('entities as books')
-                ->whereColumn('books.id', '=', 'entities.book_id')
-                ->where('type', '=', 'book');
-        };
-
-        return EntityTable::query()->scopes('visible')
-            ->select(['id', 'type', 'name', 'slug', 'book_id', 'chapter_id', 'created_at', 'updated_at', 'draft', 'book_slug' => $bookSlugSelect, $rawDescriptionField])
-            ->leftJoin('entity_container_data', function (JoinClause $join) {
-                $join->on('entity_container_data.entity_id', '=', 'entities.id')
-                    ->on('entity_container_data.entity_type', '=', 'entities.type');
-            })->leftJoin('entity_page_data', function (JoinClause $join) {
-                $join->on('entity_page_data.page_id', '=', 'entities.id')
-                    ->where('entities.type', '=', 'page');
-            });
-    }
-
     /**
      * Start a query of visible entities of the given type,
      * suitable for listing display.
-     * @return Builder<Entity>
      */
-    public function visibleForListForType(string $entityType): Builder
+    public function visibleForList(string $entityType): Builder
     {
         $queries = $this->getQueriesForType($entityType);
         return $queries->visibleForList();
     }
 
-    /**
-     * Start a query of visible entities of the given type,
-     * suitable for using the contents of the items.
-     * @return Builder<Entity>
-     */
-    public function visibleForContentForType(string $entityType): Builder
-    {
-        $queries = $this->getQueriesForType($entityType);
-        return $queries->visibleForContent();
-    }
-
     protected function getQueriesForType(string $type): ProvidesEntityQueries
     {
+        /** @var ?ProvidesEntityQueries $queries */
         $queries = match ($type) {
             'page' => $this->pages,
             'chapter' => $this->chapters,

app/Entities/Queries/PageQueries.php

@@ -6,14 +6,11 @@ use BookStack\Entities\Models\Page;
 use BookStack\Exceptions\NotFoundException;
 use Illuminate\Database\Eloquent\Builder;
 
-/**
- * @implements ProvidesEntityQueries<Page>
- */
 class PageQueries implements ProvidesEntityQueries
 {
     protected static array $contentAttributes = [
         'name', 'id', 'slug', 'book_id', 'chapter_id', 'draft',
-        'template', 'html', 'markdown', 'text', 'created_at', 'updated_at', 'priority',
+        'template', 'html', 'text', 'created_at', 'updated_at', 'priority',
         'created_by', 'updated_by', 'owned_by',
     ];
     protected static array $listAttributes = [
@@ -21,9 +18,6 @@ class PageQueries implements ProvidesEntityQueries
         'template', 'text', 'created_at', 'updated_at', 'priority', 'owned_by',
     ];
 
-    /**
-     * @return Builder<Page>
-     */
     public function start(): Builder
     {
         return Page::query();
@@ -72,9 +66,6 @@ class PageQueries implements ProvidesEntityQueries
             });
     }
 
-    /**
-     * @return Builder<Page>
-     */
     public function visibleForList(): Builder
     {
         return $this->start()
@@ -82,14 +73,6 @@ class PageQueries implements ProvidesEntityQueries
             ->select($this->mergeBookSlugForSelect(static::$listAttributes));
     }
 
-    /**
-     * @return Builder<Page>
-     */
-    public function visibleForContent(): Builder
-    {
-        return $this->start()->scopes('visible');
-    }
-
     public function visibleForChapterList(int $chapterId): Builder
     {
         return $this->visibleForList()
@@ -112,19 +95,18 @@ class PageQueries implements ProvidesEntityQueries
             ->where('created_by', '=', user()->id);
     }
 
-    public function visibleTemplates(bool $includeContents = false): Builder
+    public function visibleTemplates(): Builder
     {
-        $base = $includeContents ? $this->visibleWithContents() : $this->visibleForList();
-        return $base->where('template', '=', true);
+        return $this->visibleForList()
+            ->where('template', '=', true);
     }
 
     protected function mergeBookSlugForSelect(array $columns): array
     {
         return array_merge($columns, ['book_slug' => function ($builder) {
             $builder->select('slug')
-                ->from('entities as books')
-                ->where('type', '=', 'book')
-                ->whereColumn('books.id', '=', 'entities.book_id');
+                ->from('books')
+                ->whereColumn('books.id', '=', 'pages.book_id');
         }]);
     }
 }

app/Entities/Queries/ProvidesEntityQueries.php

@@ -7,39 +7,28 @@ use Illuminate\Database\Eloquent\Builder;
 
 /**
  * Interface for our classes which provide common queries for our
- * entity objects. Ideally, all queries for entities should run through
+ * entity objects. Ideally all queries for entities should run through
  * these classes.
  * Any added methods should return a builder instances to allow extension
  * via building on the query, unless the method starts with 'find'
  * in which case an entity object should be returned.
  * (nullable unless it's a *OrFail method).
- *
- * @template TModel of Entity
  */
 interface ProvidesEntityQueries
 {
     /**
      * Start a new query for this entity type.
-     * @return Builder<TModel>
      */
     public function start(): Builder;
 
     /**
-     * Find the entity of the given ID or return null if not found.
+     * Find the entity of the given ID, or return null if not found.
      */
     public function findVisibleById(int $id): ?Entity;
 
     /**
      * Start a query for items that are visible, with selection
      * configured for list display of this item.
-     * @return Builder<TModel>
      */
     public function visibleForList(): Builder;
-
-    /**
-     * Start a query for items that are visible, with selection
-     * configured for using the content of the items found.
-     * @return Builder<TModel>
-     */
-    public function visibleForContent(): Builder;
 }

app/Entities/Repos/BaseRepo.php

@@ -3,10 +3,12 @@
 namespace BookStack\Entities\Repos;
 
 use BookStack\Activity\TagRepo;
+use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\BookChild;
-use BookStack\Entities\Models\HasCoverInterface;
-use BookStack\Entities\Models\HasDescriptionInterface;
+use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Models\HasCoverImage;
+use BookStack\Entities\Models\HasHtmlDescription;
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\References\ReferenceStore;
@@ -30,25 +32,17 @@ class BaseRepo
 
     /**
      * Create a new entity in the system.
-     * @template T of Entity
-     * @param T $entity
-     * @return T
      */
-    public function create(Entity $entity, array $input): Entity
+    public function create(Entity $entity, array $input)
     {
-        $entity = (clone $entity)->refresh();
         $entity->fill($input);
+        $this->updateDescription($entity, $input);
         $entity->forceFill([
             'created_by' => user()->id,
             'updated_by' => user()->id,
             'owned_by'   => user()->id,
         ]);
         $entity->refreshSlug();
-
-        if ($entity instanceof HasDescriptionInterface) {
-            $this->updateDescription($entity, $input);
-        }
-
         $entity->save();
 
         if (isset($input['tags'])) {
@@ -58,33 +52,24 @@ class BaseRepo
         $entity->refresh();
         $entity->rebuildPermissions();
         $entity->indexForSearch();
-
         $this->referenceStore->updateForEntity($entity);
-
-        return $entity;
     }
 
     /**
      * Update the given entity.
-     * @template T of Entity
-     * @param T $entity
-     * @return T
      */
-    public function update(Entity $entity, array $input): Entity
+    public function update(Entity $entity, array $input)
     {
         $oldUrl = $entity->getUrl();
 
         $entity->fill($input);
+        $this->updateDescription($entity, $input);
         $entity->updated_by = user()->id;
 
         if ($entity->isDirty('name') || empty($entity->slug)) {
             $entity->refreshSlug();
         }
 
-        if ($entity instanceof HasDescriptionInterface) {
-            $this->updateDescription($entity, $input);
-        }
-
         $entity->save();
 
         if (isset($input['tags'])) {
@@ -92,42 +77,69 @@ class BaseRepo
             $entity->touch();
         }
 
+        $entity->rebuildPermissions();
         $entity->indexForSearch();
         $this->referenceStore->updateForEntity($entity);
 
         if ($oldUrl !== $entity->getUrl()) {
             $this->referenceUpdater->updateEntityReferences($entity, $oldUrl);
         }
-
-        return $entity;
     }
 
     /**
-     * Update the given items' cover image or clear it.
+     * Update the given items' cover image, or clear it.
+     *
+     * @param Entity&HasCoverImage $entity
      *
      * @throws ImageUploadException
      * @throws \Exception
      */
-    public function updateCoverImage(Entity&HasCoverInterface $entity, ?UploadedFile $coverImage, bool $removeImage = false): void
+    public function updateCoverImage($entity, ?UploadedFile $coverImage, bool $removeImage = false)
     {
         if ($coverImage) {
-            $imageType = 'cover_' . $entity->type;
-            $this->imageRepo->destroyImage($entity->coverInfo()->getImage());
+            $imageType = $entity->coverImageTypeKey();
+            $this->imageRepo->destroyImage($entity->cover()->first());
             $image = $this->imageRepo->saveNew($coverImage, $imageType, $entity->id, 512, 512, true);
-            $entity->coverInfo()->setImage($image);
+            $entity->cover()->associate($image);
             $entity->save();
         }
 
         if ($removeImage) {
-            $this->imageRepo->destroyImage($entity->coverInfo()->getImage());
-            $entity->coverInfo()->setImage(null);
+            $this->imageRepo->destroyImage($entity->cover()->first());
+            $entity->image_id = 0;
             $entity->save();
         }
     }
 
     /**
-     * Sort the parent of the given entity if any auto sort actions are set for it.
-     * Typically ran during create/update/insert events.
+     * Update the default page template used for this item.
+     * Checks that, if changing, the provided value is a valid template and the user
+     * has visibility of the provided page template id.
+     */
+    public function updateDefaultTemplate(Book|Chapter $entity, int $templateId): void
+    {
+        $changing = $templateId !== intval($entity->default_template_id);
+        if (!$changing) {
+            return;
+        }
+
+        if ($templateId === 0) {
+            $entity->default_template_id = null;
+            $entity->save();
+            return;
+        }
+
+        $templateExists = $this->pageQueries->visibleTemplates()
+            ->where('id', '=', $templateId)
+            ->exists();
+
+        $entity->default_template_id = $templateExists ? $templateId : null;
+        $entity->save();
+    }
+
+    /**
+     * Sort the parent of the given entity, if any auto sort actions are set for it.
+     * Typical ran during create/update/insert events.
      */
     public function sortParent(Entity $entity): void
     {
@@ -137,22 +149,20 @@ class BaseRepo
         }
     }
 
-    /**
-     * Update the description of the given entity from input data.
-     */
     protected function updateDescription(Entity $entity, array $input): void
     {
-        if (!$entity instanceof HasDescriptionInterface) {
+        if (!in_array(HasHtmlDescription::class, class_uses($entity))) {
             return;
         }
 
+        /** @var HasHtmlDescription $entity */
         if (isset($input['description_html'])) {
-            $entity->descriptionInfo()->set(
-                HtmlDescriptionFilter::filterFromString($input['description_html']),
-                html_entity_decode(strip_tags($input['description_html']))
-            );
+            $entity->description_html = HtmlDescriptionFilter::filterFromString($input['description_html']);
+            $entity->description = html_entity_decode(strip_tags($input['description_html']));
         } else if (isset($input['description'])) {
-            $entity->descriptionInfo()->set('', $input['description']);
+            $entity->description = $input['description'];
+            $entity->description_html = '';
+            $entity->description_html = $entity->descriptionHtml();
         }
     }
 }

app/Entities/Repos/BookRepo.php

@@ -10,7 +10,6 @@ use BookStack\Exceptions\ImageUploadException;
 use BookStack\Facades\Activity;
 use BookStack\Sorting\SortRule;
 use BookStack\Uploads\ImageRepo;
-use BookStack\Util\DatabaseTransaction;
 use Exception;
 use Illuminate\Http\UploadedFile;
 
@@ -29,21 +28,19 @@ class BookRepo
      */
     public function create(array $input): Book
     {
-        return (new DatabaseTransaction(function () use ($input) {
-            $book = $this->baseRepo->create(new Book(), $input);
-            $this->baseRepo->updateCoverImage($book, $input['image'] ?? null);
-            $book->defaultTemplate()->setFromId(intval($input['default_template_id'] ?? null));
-            Activity::add(ActivityType::BOOK_CREATE, $book);
-
-            $defaultBookSortSetting = intval(setting('sorting-book-default', '0'));
-            if ($defaultBookSortSetting && SortRule::query()->find($defaultBookSortSetting)) {
-                $book->sort_rule_id = $defaultBookSortSetting;
-            }
+        $book = new Book();
+        $this->baseRepo->create($book, $input);
+        $this->baseRepo->updateCoverImage($book, $input['image'] ?? null);
+        $this->baseRepo->updateDefaultTemplate($book, intval($input['default_template_id'] ?? null));
+        Activity::add(ActivityType::BOOK_CREATE, $book);
 
+        $defaultBookSortSetting = intval(setting('sorting-book-default', '0'));
+        if ($defaultBookSortSetting && SortRule::query()->find($defaultBookSortSetting)) {
+            $book->sort_rule_id = $defaultBookSortSetting;
             $book->save();
+        }
 
-            return $book;
-        }))->run();
+        return $book;
     }
 
     /**
@@ -51,29 +48,28 @@ class BookRepo
      */
     public function update(Book $book, array $input): Book
     {
-        $book = $this->baseRepo->update($book, $input);
+        $this->baseRepo->update($book, $input);
 
         if (array_key_exists('default_template_id', $input)) {
-            $book->defaultTemplate()->setFromId(intval($input['default_template_id']));
+            $this->baseRepo->updateDefaultTemplate($book, intval($input['default_template_id']));
         }
 
         if (array_key_exists('image', $input)) {
             $this->baseRepo->updateCoverImage($book, $input['image'], $input['image'] === null);
         }
 
-        $book->save();
         Activity::add(ActivityType::BOOK_UPDATE, $book);
 
         return $book;
     }
 
     /**
-     * Update the given book's cover image or clear it.
+     * Update the given book's cover image, or clear it.
      *
      * @throws ImageUploadException
      * @throws Exception
      */
-    public function updateCoverImage(Book $book, ?UploadedFile $coverImage, bool $removeImage = false): void
+    public function updateCoverImage(Book $book, ?UploadedFile $coverImage, bool $removeImage = false)
     {
         $this->baseRepo->updateCoverImage($book, $coverImage, $removeImage);
     }
@@ -83,7 +79,7 @@ class BookRepo
      *
      * @throws Exception
      */
-    public function destroy(Book $book): void
+    public function destroy(Book $book)
     {
         $this->trashCan->softDestroyBook($book);
         Activity::add(ActivityType::BOOK_DELETE, $book);

app/Entities/Repos/BookshelfRepo.php

@@ -7,7 +7,6 @@ use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Queries\BookQueries;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Facades\Activity;
-use BookStack\Util\DatabaseTransaction;
 use Exception;
 
 class BookshelfRepo
@@ -24,13 +23,13 @@ class BookshelfRepo
      */
     public function create(array $input, array $bookIds): Bookshelf
     {
-        return (new DatabaseTransaction(function () use ($input, $bookIds) {
-            $shelf = $this->baseRepo->create(new Bookshelf(), $input);
-            $this->baseRepo->updateCoverImage($shelf, $input['image'] ?? null);
-            $this->updateBooks($shelf, $bookIds);
-            Activity::add(ActivityType::BOOKSHELF_CREATE, $shelf);
-            return $shelf;
-        }))->run();
+        $shelf = new Bookshelf();
+        $this->baseRepo->create($shelf, $input);
+        $this->baseRepo->updateCoverImage($shelf, $input['image'] ?? null);
+        $this->updateBooks($shelf, $bookIds);
+        Activity::add(ActivityType::BOOKSHELF_CREATE, $shelf);
+
+        return $shelf;
     }
 
     /**
@@ -38,7 +37,7 @@ class BookshelfRepo
      */
     public function update(Bookshelf $shelf, array $input, ?array $bookIds): Bookshelf
     {
-        $shelf = $this->baseRepo->update($shelf, $input);
+        $this->baseRepo->update($shelf, $input);
 
         if (!is_null($bookIds)) {
             $this->updateBooks($shelf, $bookIds);
@@ -55,37 +54,20 @@ class BookshelfRepo
 
     /**
      * Update which books are assigned to this shelf by syncing the given book ids.
-     * Function ensures the managed books are visible to the current user and existing,
-     * and that the user does not alter the assignment of books that are not visible to them.
+     * Function ensures the books are visible to the current user and existing.
      */
-    protected function updateBooks(Bookshelf $shelf, array $bookIds): void
+    protected function updateBooks(Bookshelf $shelf, array $bookIds)
     {
         $numericIDs = collect($bookIds)->map(function ($id) {
             return intval($id);
         });
 
-        $existingBookIds = $shelf->books()->pluck('id')->toArray();
-        $visibleExistingBookIds = $this->bookQueries->visibleForList()
-            ->whereIn('id', $existingBookIds)
-            ->pluck('id')
-            ->toArray();
-        $nonVisibleExistingBookIds = array_values(array_diff($existingBookIds, $visibleExistingBookIds));
-
-        $newIdsToAssign = $this->bookQueries->visibleForList()
+        $syncData = $this->bookQueries->visibleForList()
             ->whereIn('id', $bookIds)
             ->pluck('id')
-            ->toArray();
-
-        $maxNewIndex = max($numericIDs->keys()->toArray() ?: [0]);
-
-        $syncData = [];
-        foreach ($newIdsToAssign as $id) {
-            $syncData[$id] = ['order' => $numericIDs->search($id)];
-        }
-
-        foreach ($nonVisibleExistingBookIds as $index => $id) {
-            $syncData[$id] = ['order' => $maxNewIndex + ($index + 1)];
-        }
+            ->mapWithKeys(function ($bookId) use ($numericIDs) {
+                return [$bookId => ['order' => $numericIDs->search($bookId)]];
+            });
 
         $shelf->books()->sync($syncData);
     }
@@ -95,7 +77,7 @@ class BookshelfRepo
      *
      * @throws Exception
      */
-    public function destroy(Bookshelf $shelf): void
+    public function destroy(Bookshelf $shelf)
     {
         $this->trashCan->softDestroyShelf($shelf);
         Activity::add(ActivityType::BOOKSHELF_DELETE, $shelf);

app/Entities/Repos/ChapterRepo.php

@@ -11,8 +11,6 @@ use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Facades\Activity;
-use BookStack\Permissions\Permission;
-use BookStack\Util\DatabaseTransaction;
 use Exception;
 
 class ChapterRepo
@@ -29,21 +27,16 @@ class ChapterRepo
      */
     public function create(array $input, Book $parentBook): Chapter
     {
-        return (new DatabaseTransaction(function () use ($input, $parentBook) {
-            $chapter = new Chapter();
-            $chapter->book_id = $parentBook->id;
-            $chapter->priority = (new BookContents($parentBook))->getLastPriority() + 1;
+        $chapter = new Chapter();
+        $chapter->book_id = $parentBook->id;
+        $chapter->priority = (new BookContents($parentBook))->getLastPriority() + 1;
+        $this->baseRepo->create($chapter, $input);
+        $this->baseRepo->updateDefaultTemplate($chapter, intval($input['default_template_id'] ?? null));
+        Activity::add(ActivityType::CHAPTER_CREATE, $chapter);
 
-            $chapter = $this->baseRepo->create($chapter, $input);
-            $chapter->defaultTemplate()->setFromId(intval($input['default_template_id'] ?? null));
+        $this->baseRepo->sortParent($chapter);
 
-            $chapter->save();
-            Activity::add(ActivityType::CHAPTER_CREATE, $chapter);
-
-            $this->baseRepo->sortParent($chapter);
-
-            return $chapter;
-        }))->run();
+        return $chapter;
     }
 
     /**
@@ -51,13 +44,12 @@ class ChapterRepo
      */
     public function update(Chapter $chapter, array $input): Chapter
     {
-        $chapter = $this->baseRepo->update($chapter, $input);
+        $this->baseRepo->update($chapter, $input);
 
         if (array_key_exists('default_template_id', $input)) {
-            $chapter->defaultTemplate()->setFromId(intval($input['default_template_id']));
+            $this->baseRepo->updateDefaultTemplate($chapter, intval($input['default_template_id']));
         }
 
-        $chapter->save();
         Activity::add(ActivityType::CHAPTER_UPDATE, $chapter);
 
         $this->baseRepo->sortParent($chapter);
@@ -70,7 +62,7 @@ class ChapterRepo
      *
      * @throws Exception
      */
-    public function destroy(Chapter $chapter): void
+    public function destroy(Chapter $chapter)
     {
         $this->trashCan->softDestroyChapter($chapter);
         Activity::add(ActivityType::CHAPTER_DELETE, $chapter);
@@ -92,18 +84,16 @@ class ChapterRepo
             throw new MoveOperationException('Book to move chapter into not found');
         }
 
-        if (!userCan(Permission::ChapterCreate, $parent)) {
+        if (!userCan('chapter-create', $parent)) {
             throw new PermissionsException('User does not have permission to create a chapter within the chosen book');
         }
 
-        return (new DatabaseTransaction(function () use ($chapter, $parent) {
-            $chapter = $chapter->changeBook($parent->id);
-            $chapter->rebuildPermissions();
-            Activity::add(ActivityType::CHAPTER_MOVE, $chapter);
+        $chapter->changeBook($parent->id);
+        $chapter->rebuildPermissions();
+        Activity::add(ActivityType::CHAPTER_MOVE, $chapter);
 
-            $this->baseRepo->sortParent($chapter);
+        $this->baseRepo->sortParent($chapter);
 
-            return $parent;
-        }))->run();
+        return $parent;
     }
 }

app/Entities/Repos/DeletionRepo.php

@@ -9,9 +9,11 @@ use BookStack\Facades\Activity;
 
 class DeletionRepo
 {
-    public function __construct(
-        protected TrashCan $trashCan
-    ) {
+    private TrashCan $trashCan;
+
+    public function __construct(TrashCan $trashCan)
+    {
+        $this->trashCan = $trashCan;
     }
 
     public function restore(int $id): int

app/Entities/Repos/PageRepo.php

@@ -16,10 +16,8 @@ use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Facades\Activity;
-use BookStack\Permissions\Permission;
 use BookStack\References\ReferenceStore;
 use BookStack\References\ReferenceUpdater;
-use BookStack\Util\DatabaseTransaction;
 use Exception;
 
 class PageRepo
@@ -37,7 +35,7 @@ class PageRepo
     /**
      * Get a new draft page belonging to the given parent entity.
      */
-    public function getNewDraftPage(Entity $parent): Page
+    public function getNewDraftPage(Entity $parent)
     {
         $page = (new Page())->forceFill([
             'name'       => trans('entities.pages_initial_name'),
@@ -46,9 +44,6 @@ class PageRepo
             'updated_by' => user()->id,
             'draft'      => true,
             'editor'     => PageEditorType::getSystemDefault()->value,
-            'html'       => '',
-            'markdown'   => '',
-            'text'       => '',
         ]);
 
         if ($parent instanceof Chapter) {
@@ -58,19 +53,16 @@ class PageRepo
             $page->book_id = $parent->id;
         }
 
-        $defaultTemplate = $page->chapter?->defaultTemplate()->get() ?? $page->book?->defaultTemplate()->get();
-        if ($defaultTemplate) {
+        $defaultTemplate = $page->chapter->defaultTemplate ?? $page->book->defaultTemplate;
+        if ($defaultTemplate && userCan('view', $defaultTemplate)) {
             $page->forceFill([
                 'html'  => $defaultTemplate->html,
                 'markdown' => $defaultTemplate->markdown,
             ]);
-            $page->text = (new PageContent($page))->toPlainText();
         }
 
-        (new DatabaseTransaction(function () use ($page) {
-            $page->save();
-            $page->rebuildPermissions();
-        }))->run();
+        $page->save();
+        $page->refresh()->rebuildPermissions();
 
         return $page;
     }
@@ -80,30 +72,26 @@ class PageRepo
      */
     public function publishDraft(Page $draft, array $input): Page
     {
-        return (new DatabaseTransaction(function () use ($draft, $input) {
-            $draft->draft = false;
-            $draft->revision_count = 1;
-            $draft->priority = $this->getNewPriority($draft);
-            $this->updateTemplateStatusAndContentFromInput($draft, $input);
+        $draft->draft = false;
+        $draft->revision_count = 1;
+        $draft->priority = $this->getNewPriority($draft);
+        $this->updateTemplateStatusAndContentFromInput($draft, $input);
+        $this->baseRepo->update($draft, $input);
 
-            $draft = $this->baseRepo->update($draft, $input);
-            $draft->rebuildPermissions();
+        $summary = trim($input['summary'] ?? '') ?: trans('entities.pages_initial_revision');
+        $this->revisionRepo->storeNewForPage($draft, $summary);
+        $draft->refresh();
 
-            $summary = trim($input['summary'] ?? '') ?: trans('entities.pages_initial_revision');
-            $this->revisionRepo->storeNewForPage($draft, $summary);
-            $draft->refresh();
+        Activity::add(ActivityType::PAGE_CREATE, $draft);
+        $this->baseRepo->sortParent($draft);
 
-            Activity::add(ActivityType::PAGE_CREATE, $draft);
-            $this->baseRepo->sortParent($draft);
-
-            return $draft;
-        }))->run();
+        return $draft;
     }
 
     /**
      * Directly update the content for the given page from the provided input.
      * Used for direct content access in a way that performs required changes
-     * (Search index and reference regen) without performing an official update.
+     * (Search index & reference regen) without performing an official update.
      */
     public function setContentFromInput(Page $page, array $input): void
     {
@@ -117,18 +105,18 @@ class PageRepo
     public function update(Page $page, array $input): Page
     {
         // Hold the old details to compare later
-        $oldName = $page->name;
         $oldHtml = $page->html;
+        $oldName = $page->name;
         $oldMarkdown = $page->markdown;
 
         $this->updateTemplateStatusAndContentFromInput($page, $input);
-        $page = $this->baseRepo->update($page, $input);
+        $this->baseRepo->update($page, $input);
 
         // Update with new details
         $page->revision_count++;
         $page->save();
 
-        // Remove all update drafts for this user and page.
+        // Remove all update drafts for this user & page.
         $this->revisionRepo->deleteDraftsForCurrentUser($page);
 
         // Save a revision after updating
@@ -148,7 +136,7 @@ class PageRepo
 
     protected function updateTemplateStatusAndContentFromInput(Page $page, array $input): void
     {
-        if (isset($input['template']) && userCan(Permission::TemplatesManage)) {
+        if (isset($input['template']) && userCan('templates-manage')) {
             $page->template = ($input['template'] === 'true');
         }
 
@@ -171,7 +159,7 @@ class PageRepo
             $pageContent->setNewHTML($input['html'], user());
         }
 
-        if (($newEditor !== $currentEditor || empty($page->editor)) && userCan(Permission::EditorChange)) {
+        if (($newEditor !== $currentEditor || empty($page->editor)) && userCan('editor-change')) {
             $page->editor = $newEditor->value;
         } elseif (empty($page->editor)) {
             $page->editor = $defaultEditor->value;
@@ -181,12 +169,12 @@ class PageRepo
     /**
      * Save a page update draft.
      */
-    public function updatePageDraft(Page $page, array $input): Page|PageRevision
+    public function updatePageDraft(Page $page, array $input)
     {
-        // If the page itself is a draft, simply update that
+        // If the page itself is a draft simply update that
         if ($page->draft) {
             $this->updateTemplateStatusAndContentFromInput($page, $input);
-            $page->forceFill(array_intersect_key($input, array_flip(['name'])))->save();
+            $page->fill($input);
             $page->save();
 
             return $page;
@@ -214,7 +202,7 @@ class PageRepo
      *
      * @throws Exception
      */
-    public function destroy(Page $page): void
+    public function destroy(Page $page)
     {
         $this->trashCan->softDestroyPage($page);
         Activity::add(ActivityType::PAGE_DELETE, $page);
@@ -277,22 +265,20 @@ class PageRepo
             throw new MoveOperationException('Book or chapter to move page into not found');
         }
 
-        if (!userCan(Permission::PageCreate, $parent)) {
+        if (!userCan('page-create', $parent)) {
             throw new PermissionsException('User does not have permission to create a page within the new parent');
         }
 
-        return (new DatabaseTransaction(function () use ($page, $parent) {
-            $page->chapter_id = ($parent instanceof Chapter) ? $parent->id : null;
-            $newBookId = ($parent instanceof Chapter) ? $parent->book->id : $parent->id;
-            $page = $page->changeBook($newBookId);
-            $page->rebuildPermissions();
+        $page->chapter_id = ($parent instanceof Chapter) ? $parent->id : null;
+        $newBookId = ($parent instanceof Chapter) ? $parent->book->id : $parent->id;
+        $page->changeBook($newBookId);
+        $page->rebuildPermissions();
 
-            Activity::add(ActivityType::PAGE_MOVE, $page);
+        Activity::add(ActivityType::PAGE_MOVE, $page);
 
-            $this->baseRepo->sortParent($page);
+        $this->baseRepo->sortParent($page);
 
-            return $parent;
-        }))->run();
+        return $parent;
     }
 
     /**

app/Entities/Repos/RevisionRepo.php

@@ -23,7 +23,7 @@ class RevisionRepo
 
     /**
      * Get a user update_draft page revision to update for the given page.
-     * Checks for an existing revision before providing a fresh one.
+     * Checks for an existing revisions before providing a fresh one.
      */
     public function getNewDraftForCurrentUser(Page $page): PageRevision
     {
@@ -72,7 +72,7 @@ class RevisionRepo
     /**
      * Delete old revisions, for the given page, from the system.
      */
-    protected function deleteOldRevisions(Page $page): void
+    protected function deleteOldRevisions(Page $page)
     {
         $revisionLimit = config('app.revision_limit');
         if ($revisionLimit === false) {

app/Entities/Tools/BookContents.php

@@ -3,10 +3,13 @@
 namespace BookStack\Entities\Tools;
 
 use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\BookChild;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\EntityQueries;
+use BookStack\Sorting\BookSortMap;
+use BookStack\Sorting\BookSortMapItem;
 use Illuminate\Support\Collection;
 
 class BookContents
@@ -26,7 +29,7 @@ class BookContents
     {
         $maxPage = $this->book->pages()
             ->where('draft', '=', false)
-            ->whereDoesntHave('chapter')
+            ->where('chapter_id', '=', 0)
             ->max('priority');
 
         $maxChapter = $this->book->chapters()
@@ -77,11 +80,11 @@ class BookContents
     protected function bookChildSortFunc(): callable
     {
         return function (Entity $entity) {
-            if ($entity->getAttribute('draft') ?? false) {
+            if (isset($entity['draft']) && $entity['draft']) {
                 return -100;
             }
 
-            return $entity->getAttribute('priority') ?? 0;
+            return $entity['priority'] ?? 0;
         };
     }
 

app/Entities/Tools/Cloner.php

@@ -6,13 +6,12 @@ use BookStack\Activity\Models\Tag;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\HasCoverInterface;
 use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Models\HasCoverImage;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Repos\ChapterRepo;
 use BookStack\Entities\Repos\PageRepo;
-use BookStack\Permissions\Permission;
 use BookStack\Uploads\Image;
 use BookStack\Uploads\ImageService;
 use Illuminate\Http\UploadedFile;
@@ -50,7 +49,7 @@ class Cloner
 
         $copyChapter = $this->chapterRepo->create($chapterDetails, $parent);
 
-        if (userCan(Permission::PageCreate, $copyChapter)) {
+        if (userCan('page-create', $copyChapter)) {
             /** @var Page $page */
             foreach ($original->getVisiblePages() as $page) {
                 $this->clonePage($page, $copyChapter, $page->name);
@@ -62,7 +61,7 @@ class Cloner
 
     /**
      * Clone the given book.
-     * Clones all child chapters and pages.
+     * Clones all child chapters & pages.
      */
     public function cloneBook(Book $original, string $newName): Book
     {
@@ -75,11 +74,11 @@ class Cloner
         // Clone contents
         $directChildren = $original->getDirectVisibleChildren();
         foreach ($directChildren as $child) {
-            if ($child instanceof Chapter && userCan(Permission::ChapterCreate, $copyBook)) {
+            if ($child instanceof Chapter && userCan('chapter-create', $copyBook)) {
                 $this->cloneChapter($child, $copyBook, $child->name);
             }
 
-            if ($child instanceof Page && !$child->draft && userCan(Permission::PageCreate, $copyBook)) {
+            if ($child instanceof Page && !$child->draft && userCan('page-create', $copyBook)) {
                 $this->clonePage($child, $copyBook, $child->name);
             }
         }
@@ -87,7 +86,7 @@ class Cloner
         // Clone bookshelf relationships
         /** @var Bookshelf $shelf */
         foreach ($original->shelves as $shelf) {
-            if (userCan(Permission::BookshelfUpdate, $shelf)) {
+            if (userCan('bookshelf-update', $shelf)) {
                 $shelf->appendBook($copyBook);
             }
         }
@@ -106,8 +105,8 @@ class Cloner
         $inputData['tags'] = $this->entityTagsToInputArray($entity);
 
         // Add a cover to the data if existing on the original entity
-        if ($entity instanceof HasCoverInterface) {
-            $cover = $entity->coverInfo()->getImage();
+        if ($entity instanceof HasCoverImage) {
+            $cover = $entity->cover()->first();
             if ($cover) {
                 $inputData['image'] = $this->imageToUploadedFile($cover);
             }