Add option to make the smart albums only consider photos of the user (#3879)

Author: ildyria

app/SmartAlbums/BaseSmartAlbum.php

@@ -30,6 +30,7 @@
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Facades\Auth;
 
 /**
  * Class BaseSmartAlbum.
@@ -107,6 +108,10 @@ public function photos(): Builder
 		if (!Configs::getValueAsBool('SA_override_visibility')) {
 			return $this->photo_query_policy
 				->applySearchabilityFilter(query: $base_query, origin: null, include_nsfw: !Configs::getValueAsBool('hide_nsfw_in_smart_albums'))
+				->when(
+					Configs::getValueAsBool('enable_smart_album_per_owner') && Auth::check(),
+					fn (Builder $query) => $query->where('photos.owner_id', '=', Auth::id())
+				)
 				->where($this->smart_photo_condition);
 		}
 

app/SmartAlbums/UnsortedAlbum.php

@@ -12,8 +12,10 @@
 use App\Enum\SmartAlbumType;
 use App\Exceptions\ConfigurationKeyMissingException;
 use App\Exceptions\Internal\FrameworkException;
+use App\Models\Configs;
 use App\Models\Photo;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\Auth;
 
 class UnsortedAlbum extends BaseSmartAlbum
 {
@@ -45,7 +47,7 @@ public static function getInstance(): self
 	 */
 	public function photos(): Builder
 	{
-		if ($this->public_permissions !== null) {
+		if ($this->public_permissions !== null && (!Auth::check() || !Configs::getValueAsBool('enable_smart_album_per_owner'))) {
 			return Photo::query()->leftJoin(PA::PHOTO_ALBUM, 'photos.id', '=', PA::PHOTO_ID)->with(['size_variants', 'statistics', 'palette', 'tags'])
 			->where($this->smart_photo_condition);
 		}

database/migrations/2025_12_19_161600_star_album_option.php

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * SPDX-License-Identifier: MIT
+ * Copyright (c) 2017-2018 Tobias Reich
+ * Copyright (c) 2018-2025 LycheeOrg.
+ */
+
+use App\Models\Extensions\BaseConfigMigration;
+
+return new class() extends BaseConfigMigration {
+	public const MOD_GALLERY = 'Smart Albums';
+
+	/**
+	 * @return array<int,array{key:string,value:string,is_secret:bool,cat:string,type_range:string,description:string,order?:int,not_on_docker?:bool,is_expert?:bool}>
+	 */
+	public function getConfigs(): array
+	{
+		return [
+			[
+				'key' => 'enable_smart_album_per_owner',
+				'value' => '0',
+				'cat' => self::MOD_GALLERY,
+				'type_range' => self::BOOL,
+				'description' => 'Only display pictures owned by the user in smart albums.',
+				'details' => 'This setting is only applied to logged-in users.',
+				'is_secret' => false,
+				'is_expert' => false,
+				'order' => 12,
+				'not_on_docker' => false,
+				'level' => 0,
+			],
+		];
+	}
+};

lang/ar/all_settings.php

@@ -302,6 +302,7 @@
         'deduplicate_pinned_albums' => 'Deduplicate featured albums.',
         'desktop_dock_full_transparency_enabled' => 'Enable dock full transparency for desktop.',
         'mobile_dock_full_transparency_enabled' => 'Enable dock transparency for mobile,',
+        'enable_smart_album_per_owner' => 'Only display pictures owned by the user in smart albums.',
     ],
     'details' => [
         'version' => '',
@@ -598,5 +599,6 @@
         'deduplicate_pinned_albums' => 'Featured albums will only appear once on the main gallery page.',
         'desktop_dock_full_transparency_enabled' => 'On the photo view, actions on top of the page are slightly transparent. Enable this to have them fully transparent and only appear on hover.',
         'mobile_dock_full_transparency_enabled' => '<span class="pi pi-exclamation-triangle text-orange-500"></span> This will impact usability on mobile. On the photo view, actions on top of the page are slightly transparent. Enable this to have them fully transparent and only appear on tap.',
+        'enable_smart_album_per_owner' => 'This setting is only applied to logged-in users. "Smart album visibility overrides" must be disabled for this to take effect.',
     ],
 ];

lang/cz/all_settings.php

@@ -302,6 +302,7 @@
         'deduplicate_pinned_albums' => 'Deduplicate featured albums.',
         'desktop_dock_full_transparency_enabled' => 'Enable dock full transparency for desktop.',
         'mobile_dock_full_transparency_enabled' => 'Enable dock transparency for mobile,',
+        'enable_smart_album_per_owner' => 'Only display pictures owned by the user in smart albums.',
     ],
     'details' => [
         'version' => '',
@@ -598,5 +599,6 @@
         'deduplicate_pinned_albums' => 'Featured albums will only appear once on the main gallery page.',
         'desktop_dock_full_transparency_enabled' => 'On the photo view, actions on top of the page are slightly transparent. Enable this to have them fully transparent and only appear on hover.',
         'mobile_dock_full_transparency_enabled' => '<span class="pi pi-exclamation-triangle text-orange-500"></span> This will impact usability on mobile. On the photo view, actions on top of the page are slightly transparent. Enable this to have them fully transparent and only appear on tap.',
+        'enable_smart_album_per_owner' => 'This setting is only applied to logged-in users. "Smart album visibility overrides" must be disabled for this to take effect.',
     ],
 ];

lang/de/all_settings.php

@@ -300,6 +300,7 @@
         'deduplicate_pinned_albums' => 'Deduplicate featured albums.',
         'desktop_dock_full_transparency_enabled' => 'Enable dock full transparency for desktop.',
         'mobile_dock_full_transparency_enabled' => 'Enable dock transparency for mobile,',
+        'enable_smart_album_per_owner' => 'Only display pictures owned by the user in smart albums.',
     ],
     'details' => [
         'version' => '',
@@ -596,5 +597,6 @@
         'deduplicate_pinned_albums' => 'Featured albums will only appear once on the main gallery page.',
         'desktop_dock_full_transparency_enabled' => 'On the photo view, actions on top of the page are slightly transparent. Enable this to have them fully transparent and only appear on hover.',
         'mobile_dock_full_transparency_enabled' => '<span class="pi pi-exclamation-triangle text-orange-500"></span> This will impact usability on mobile. On the photo view, actions on top of the page are slightly transparent. Enable this to have them fully transparent and only appear on tap.',
+        'enable_smart_album_per_owner' => 'This setting is only applied to logged-in users. "Smart album visibility overrides" must be disabled for this to take effect.',
     ],
 ];

lang/el/all_settings.php

@@ -302,6 +302,7 @@
         'deduplicate_pinned_albums' => 'Deduplicate featured albums.',
         'desktop_dock_full_transparency_enabled' => 'Enable dock full transparency for desktop.',
         'mobile_dock_full_transparency_enabled' => 'Enable dock transparency for mobile,',
+        'enable_smart_album_per_owner' => 'Only display pictures owned by the user in smart albums.',
     ],
     'details' => [
         'version' => '',
@@ -598,5 +599,6 @@
         'deduplicate_pinned_albums' => 'Featured albums will only appear once on the main gallery page.',
         'desktop_dock_full_transparency_enabled' => 'On the photo view, actions on top of the page are slightly transparent. Enable this to have them fully transparent and only appear on hover.',
         'mobile_dock_full_transparency_enabled' => '<span class="pi pi-exclamation-triangle text-orange-500"></span> This will impact usability on mobile. On the photo view, actions on top of the page are slightly transparent. Enable this to have them fully transparent and only appear on tap.',
+        'enable_smart_album_per_owner' => 'This setting is only applied to logged-in users. "Smart album visibility overrides" must be disabled for this to take effect.',
     ],
 ];

lang/en/all_settings.php

@@ -302,6 +302,7 @@
         'deduplicate_pinned_albums' => 'Deduplicate featured albums.',
         'desktop_dock_full_transparency_enabled' => 'Enable dock full transparency for desktop.',
         'mobile_dock_full_transparency_enabled' => 'Enable dock transparency for mobile,',
+        'enable_smart_album_per_owner' => 'Only display pictures owned by the user in smart albums.',
     ],
     'details' => [
         'version' => '',
@@ -598,5 +599,6 @@
         'deduplicate_pinned_albums' => 'Featured albums will only appear once on the main gallery page.',
         'desktop_dock_full_transparency_enabled' => 'On the photo view, actions on top of the page are slightly transparent. Enable this to have them fully transparent and only appear on hover.',
         'mobile_dock_full_transparency_enabled' => '<span class="pi pi-exclamation-triangle text-orange-500"></span> This will impact usability on mobile. On the photo view, actions on top of the page are slightly transparent. Enable this to have them fully transparent and only appear on tap.',
+        'enable_smart_album_per_owner' => 'This setting is only applied to logged-in users. "Smart album visibility overrides" must be disabled for this to take effect.',
     ],
 ];

lang/es/all_settings.php

@@ -302,6 +302,7 @@
         'deduplicate_pinned_albums' => 'Deduplicate featured albums.',
         'desktop_dock_full_transparency_enabled' => 'Enable dock full transparency for desktop.',
         'mobile_dock_full_transparency_enabled' => 'Enable dock transparency for mobile,',
+        'enable_smart_album_per_owner' => 'Only display pictures owned by the user in smart albums.',
     ],
     'details' => [
         'version' => '',
@@ -598,5 +599,6 @@
         'deduplicate_pinned_albums' => 'Featured albums will only appear once on the main gallery page.',
         'desktop_dock_full_transparency_enabled' => 'On the photo view, actions on top of the page are slightly transparent. Enable this to have them fully transparent and only appear on hover.',
         'mobile_dock_full_transparency_enabled' => '<span class="pi pi-exclamation-triangle text-orange-500"></span> This will impact usability on mobile. On the photo view, actions on top of the page are slightly transparent. Enable this to have them fully transparent and only appear on tap.',
+        'enable_smart_album_per_owner' => 'This setting is only applied to logged-in users. "Smart album visibility overrides" must be disabled for this to take effect.',
     ],
 ];

lang/fa/all_settings.php

@@ -302,6 +302,7 @@
         'deduplicate_pinned_albums' => 'Deduplicate featured albums.',
         'desktop_dock_full_transparency_enabled' => 'Enable dock full transparency for desktop.',
         'mobile_dock_full_transparency_enabled' => 'Enable dock transparency for mobile,',
+        'enable_smart_album_per_owner' => 'Only display pictures owned by the user in smart albums.',
     ],
     'details' => [
         'version' => '',
@@ -598,5 +599,6 @@
         'deduplicate_pinned_albums' => 'Featured albums will only appear once on the main gallery page.',
         'desktop_dock_full_transparency_enabled' => 'On the photo view, actions on top of the page are slightly transparent. Enable this to have them fully transparent and only appear on hover.',
         'mobile_dock_full_transparency_enabled' => '<span class="pi pi-exclamation-triangle text-orange-500"></span> This will impact usability on mobile. On the photo view, actions on top of the page are slightly transparent. Enable this to have them fully transparent and only appear on tap.',
+        'enable_smart_album_per_owner' => 'This setting is only applied to logged-in users. "Smart album visibility overrides" must be disabled for this to take effect.',
     ],
 ];