Merge branch 'master' into webshop/backend-more

Author: ildyria

app/Http/Resources/Traits/HasHeaderUrl.php

@@ -54,24 +54,30 @@ private function getByQuery(AbstractAlbum $album): ?string
 			return $header_size_variant->url;
 		}
 
-		$query_ratio = SizeVariant::query()->select('photo_id');
-
 		/** @var Collection<int,Photo>|LengthAwarePaginator<int,Photo> $photos */
 		$photos = $album->get_photos();
-		if ($photos instanceof LengthAwarePaginator) {
-			$photo_ids = collect($photos->items())->pluck('id')->all();
-			$query_ratio = $query_ratio->whereIn('photo_id', $photo_ids);
-		} else {
-			$query_ratio = $query_ratio->whereBelongsTo($photos);
-		}
-		$query_ratio = $query_ratio->where('ratio', '>', 1)->whereIn('type', [SizeVariantType::MEDIUM, SizeVariantType::SMALL2X, SizeVariantType::SMALL]);
+		$query_ratio = SizeVariant::query()->select('photo_id')
+			->when($photos instanceof LengthAwarePaginator, function ($query) use ($photos): void {
+				$photo_ids = collect($photos->items())->pluck('id')->all();
+				$query->whereIn('photo_id', $photo_ids);
+			})
+			->when($photos instanceof Collection, function ($query) use ($photos): void {
+				$query->whereBelongsTo($photos);
+			})
+			->where('ratio', '>', 1)->whereIn('type', [SizeVariantType::MEDIUM, SizeVariantType::SMALL2X, SizeVariantType::SMALL]);
 		$num = $query_ratio->count() - 1;
 		$photo = $num >= 0 ? $query_ratio->skip(rand(0, $num))->first() : null;
 
 		if ($photo === null) {
 			$query = SizeVariant::query()
 				->select('photo_id')
-				->whereBelongsTo($album->get_photos())
+				->when($photos instanceof LengthAwarePaginator, function ($query) use ($photos): void {
+					$photo_ids = collect($photos->items())->pluck('id')->all();
+					$query->whereIn('photo_id', $photo_ids);
+				})
+				->when($photos instanceof Collection, function ($query) use ($photos): void {
+					$query->whereBelongsTo($photos);
+				})
 				->whereIn('type', [SizeVariantType::MEDIUM, SizeVariantType::SMALL2X, SizeVariantType::SMALL]);
 			$num = $query->count() - 1;
 			$photo = $query->skip(rand(0, $num))->first();

database/migrations/2025_11_17_182225_bump_version061002.php

@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * SPDX-License-Identifier: MIT
+ * Copyright (c) 2017-2018 Tobias Reich
+ * Copyright (c) 2018-2025 LycheeOrg.
+ */
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\DB;
+use Symfony\Component\Console\Output\ConsoleOutput;
+use Symfony\Component\Console\Output\ConsoleSectionOutput;
+
+return new class() extends Migration {
+	private ConsoleOutput $output;
+	private ConsoleSectionOutput $msg_section;
+
+	public function __construct()
+	{
+		$this->output = new ConsoleOutput();
+		$this->msg_section = $this->output->section();
+	}
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up(): void
+	{
+		DB::table('configs')->where('key', 'version')->update(['value' => '061002']);
+		try {
+			Artisan::call('cache:clear');
+		} catch (\Throwable $e) {
+			$this->msg_section->writeln('<error>Warning:</error> Failed to clear cache for version 6.10.2');
+
+			return;
+		}
+		$this->msg_section->writeln('<info>Info:</info> Cleared cache for version 6.10.2');
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down(): void
+	{
+		DB::table('configs')->where('key', 'version')->update(['value' => '061001']);
+	}
+};