fixes 1608 (#1609)

LycheeOrg · Nov 28, 2022 · a328ccd · a328ccd
1 parent 7b8eaed
commit a328ccd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/app/Models/Extensions/Thumb.php b/app/Models/Extensions/Thumb.php
@@ -59,7 +59,7 @@ public static function createFromQueryable(Relation|Builder $photoQueryable, Sor
 		try {
 			/** @var Photo|null $cover */
 			$cover = $photoQueryable
-				->withOnly(['size_variants' => fn (HasMany $r) => self::sizeVariantsFilter($r)])
+				->withOnly(['size_variants' => (fn (HasMany $r) => self::sizeVariantsFilter($r))])
 				->orderBy('photos.' . PhotoSortingCriterion::COLUMN_IS_STARRED, SortingCriterion::DESC)
 				->orderBy('photos.' . $sorting->column, $sorting->order)
 				->select(['photos.id', 'photos.type'])

diff --git a/app/Models/Photo.php b/app/Models/Photo.php
@@ -139,6 +139,13 @@ class Photo extends Model implements HasRandomID
 		'is_share_button_visible',
 	];
 
+	/**
+	 * @var array<int,string> By default preload all the size_variants
+	 */
+	protected $with = [
+		'size_variants',
+	];
+
 	/**
 	 * Creates a new instance of {@link LinkedPhotoCollection}.
 	 *

diff --git a/app/Relations/HasAlbumThumb.php b/app/Relations/HasAlbumThumb.php
@@ -39,7 +39,7 @@ public function __construct(Album $parent)
 		$this->photoQueryPolicy = resolve(PhotoQueryPolicy::class);
 		$this->sorting = PhotoSortingCriterion::createDefault();
 		parent::__construct(
-			Photo::query()->with(['size_variants' => fn (HasMany $r) => Thumb::sizeVariantsFilter($r)]),
+			Photo::query()->with(['size_variants' => (fn (HasMany $r) => Thumb::sizeVariantsFilter($r))]),
 			$parent
 		);
 	}