X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/a6633642232efd164d4708967ab59e498fbff896..refs/pull/5280/head:/app/Uploads/Image.php diff --git a/app/Uploads/Image.php b/app/Uploads/Image.php index dc26af002..0a267a644 100644 --- a/app/Uploads/Image.php +++ b/app/Uploads/Image.php @@ -1,36 +1,65 @@ -hasMany(JointPermission::class, 'entity_id', 'uploaded_to') + ->where('joint_permissions.entity_type', '=', 'page'); + } + + /** + * Scope the query to just the images visible to the user based upon the + * user visibility of the uploaded_to page. + */ + public function scopeVisible(Builder $query): Builder + { + return app()->make(PermissionApplicator::class)->restrictPageRelationQuery($query, 'images', 'uploaded_to'); + } + /** - * Get a thumbnail for this image. - * @param int $width - * @param int $height - * @param bool|false $keepRatio - * @return string + * Get a thumbnail URL for this image. + * Attempts to generate the thumbnail if not already existing. + * * @throws \Exception */ - public function getThumb($width, $height, $keepRatio = false) + public function getThumb(?int $width, ?int $height, bool $keepRatio = false): ?string { - return Images::getThumbnail($this, $width, $height, $keepRatio); + return app()->make(ImageResizer::class)->resizeToThumbnailUrl($this, $width, $height, $keepRatio, false); } /** * Get the page this image has been uploaded to. * Only applicable to gallery or drawio image types. - * @return Page|null */ - public function getPage() + public function getPage(): ?Page { return $this->belongsTo(Page::class, 'uploaded_to')->first(); }