done

Author: ildyria

app/Actions/Photo/Delete.php

@@ -134,7 +134,6 @@ public function do(array $photo_ids, string|null $from_id, array $album_ids = []
 	private function validateArguments(array $photo_ids, string|null $from_id, array $album_ids): void
 	{
 		match (true) {
-			count($photo_ids) === 0 && count($album_ids) === 0 => throw new LycheeLogicException('At least one of the arguments [$photo_ids, $album_ids] must be set.'),
 			count($photo_ids) !== 0 && count($album_ids) !== 0 => throw new LycheeLogicException('Only one of the arguments [$photo_ids, $album_ids] must be set.'),
 			count($photo_ids) !== 0 && $from_id === null => throw new LycheeLogicException('The $from_id must be provided with the $photo_ids.'),
 			count($album_ids) !== 0 && $from_id !== null => throw new LycheeLogicException('The $from_id must not be provided with the $album_ids.'),

app/Actions/Photo/Pipes/Shared/NotifyAlbums.php

@@ -24,6 +24,7 @@ public function handle(PhotoDTO $state, \Closure $next): PhotoDTO
 		$count_albums = DB::table(PA::PHOTO_ALBUM)
 			->where('photo_id', $state->getPhoto()->id)
 			->count();
+
 		if ($count_albums > 0) {
 			$notify = new Notify();
 			$notify->do($state->getPhoto());

app/Actions/User/Notify.php

@@ -8,8 +8,11 @@
 
 namespace App\Actions\User;
 
+use App\Constants\AccessPermissionConstants as APC;
+use App\Constants\PhotoAlbum as PA;
 use App\Exceptions\ConfigurationKeyMissingException;
 use App\Exceptions\Internal\QueryBuilderException;
+use App\Models\Album;
 use App\Models\Configs;
 use App\Models\Photo;
 use App\Models\User;
@@ -42,10 +45,16 @@ public function do(Photo $photo): void
 		// Admin user is always notified
 		$users = User::query()->where('may_administrate', '=', true)->get();
 
-		$album = $photo->album;
-		if ($album !== null) {
-			$users = $users->concat($album->shared_with);
-			$users->push($album->owner);
+		$albums = Album::query()->without(['thumbs', 'statistics', 'cover'])->join(PA::PHOTO_ALBUM, PA::ALBUM_ID, '=', 'album.id')
+			->where(PA::PHOTO_ID, '=', $photo->id)
+			->get();
+
+		if ($albums->count() > 0) {
+			$shared_with = User::query()->join(APC::ACCESS_PERMISSIONS, APC::USER_ID, '=', 'user.id')
+				->whereIn(APC::BASE_ALBUM_ID, $albums->pluck('id'))
+				->get();
+			$users->push(...$shared_with->all());
+			$users->push(...$albums->map(fn ($a) => $a->owner)->all());
 		}
 
 		$users = $users

app/Console/Commands/PhotosAddedNotification.php

@@ -8,7 +8,9 @@
 
 namespace App\Console\Commands;
 
+use App\Constants\PhotoAlbum as PA;
 use App\Mail\PhotosAdded;
+use App\Models\BaseAlbumImpl;
 use App\Models\Configs;
 use App\Models\Photo;
 use App\Models\User;
@@ -54,13 +56,6 @@ public function handle(): int
 					->find($notification->data['id']);
 
 				if ($photo !== null) {
-					if (!isset($photos[$photo->album_id])) {
-						$photos[$photo->album_id] = [
-							'name' => $photo->album->title,
-							'photos' => [],
-						];
-					}
-
 					$thumb_url = $photo->size_variants->getThumb()?->url;
 
 					// Mail clients do not like relative paths.
@@ -69,19 +64,26 @@ public function handle(): int
 						$thumb_url = URL::asset($thumb_url);
 					}
 
-					// If the url config doesn't contain a trailing slash then add it
-					if (str_ends_with(config('app.url'), '/')) {
-						$trailing_slash = '';
-					} else {
-						$trailing_slash = '/';
-					}
+					BaseAlbumImpl::query()->join(PA::PHOTO_ALBUM, PA::ALBUM_ID, '=', 'base_albums.id')
+						->where(PA::PHOTO_ID, '=', $photo->id)
+						->get()
+						->each(function (BaseAlbumImpl $album) use (&$photos, $photo, $thumb_url): void {
+							$album_id = $album->id;
+							$title = $album->title;
+
+							if (!isset($photos[$album_id])) {
+								$photos[$album_id] = [
+									'name' => $title,
+									'photos' => [],
+								];
+							}
 
-					$photos[$photo->album_id]['photos'][$photo->id] = [
-						'title' => $photo->title,
-						'thumb' => $thumb_url,
-						// TODO: Clean this up. There should be a better way to get the URL of a photo than constructing it manually
-						'link' => config('app.url') . $trailing_slash . 'r/' . $photo->album_id . '/' . $photo->id,
-					];
+							$photos[$album_id]['photos'][$photo->id] = [
+								'title' => $photo->title,
+								'thumb' => $thumb_url,
+								'link' => route('gallery', ['albumId' => $album_id, 'photoId' => $photo->id]),
+							];
+						});
 				}
 			}
 
@@ -93,4 +95,4 @@ public function handle(): int
 
 		return 0;
 	}
-}
+}