Public photos hidden

app/Actions/Photo/Prepare.php

@@ -43,6 +43,9 @@ public function do(Photo $photo): array
 				$return['share_button_visible'] = Configs::get_value('share_button_visible', '0');
 			}
 		} else {
+			if ($photo->album_id != null && $photo->album->is_public()) {
+				$return['public'] = '2';
+			}
 			$return['downloadable'] = '1';
 			$return['share_button_visible'] = '1';
 		}

app/Actions/Search/PhotoSearch.php

@@ -5,6 +5,7 @@
 use AccessControl;
 use App\Actions\Albums\Extensions\PublicIds;
 use App\ModelFunctions\SymLinkFunctions;
+use App\Models\Configs;
 use App\Models\Photo;
 use Illuminate\Database\Eloquent\Builder;
 
@@ -24,27 +25,29 @@ public function __construct(
 		$this->symLinkFunctions = $symLinkFunctions;
 	}
 
-	private function unsorted(Builder $query)
+	private function unsorted_or_public(Builder $query)
 	{
-		if (!AccessControl::is_logged_in()) {
-			return $query;
-		}
-
 		if (AccessControl::is_admin()) {
 			return $query->orWhere('album_id', '=', null);
 		}
 
 		if (AccessControl::can_upload()) {
-			return $query->orWhere(fn ($q) => $q->where('album_id', '=', null)->where('owner_id', '=', AccessControl::id()));
+			$query = $query->orWhere(fn ($q) => $q->where('album_id', '=', null)->where('owner_id', '=', AccessControl::id()));
 		}
+
+		if (Configs::get_value('public_photos_hidden', '1') === '0') {
+			$query = $query->orWhere('public', '=', 1);
+		}
+
+		return $query;
 	}
 
 	public function query(array $terms)
 	{
 		$albumIDs = resolve(PublicIds::class)->getPublicAlbumsId();
 
 		$query = Photo::with('album')
-			->where(fn ($q) => $this->unsorted($q->whereIn('album_id', $albumIDs)));
+			->where(fn ($q) => $this->unsorted_or_public($q->whereIn('album_id', $albumIDs)));
 
 		foreach ($terms as $escaped_term) {
 			$query->where(

app/SmartAlbums/BareSmartAlbum.php

@@ -4,6 +4,7 @@
 
 use AccessControl;
 use App\Models\Album;
+use App\Models\Configs;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection as BaseCollection;
 
@@ -55,6 +56,10 @@ public function filter($query)
 			$query = $query->whereIn('album_id', $this->albumIds);
 		}
 
+		if (Configs::get_value('public_photos_hidden', '1') === '0') {
+			$query = $query->orWhere('public', '=', 1);
+		}
+
 		return $query;
 	}
 

database/migrations/2021_02_18_232639_config_public_photos_hidden.php

@@ -0,0 +1,38 @@
+<?php
+
+use App\Models\Configs;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+class ConfigPublicPhotosHidden extends Migration
+{
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		defined('BOOL') or define('BOOL', '0|1');
+
+		DB::table('configs')->insert([
+			[
+				'key' => 'public_photos_hidden',
+				'value' => '1',
+				'confidentiality' => 2,
+				'cat' => 'config',
+				'type_range' => BOOL,
+			],
+		]);
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Configs::where('key', '=', 'public_photos_hidden')->delete();
+	}
+}