mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-23 02:09:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fixed exception if user avatar file somehow got deleted.

Browse source 
Now we just show the default avatar instead of the non-existing attachment file
This commit is contained in:
Jan Böhmer 2023-10-23 22:24:46 +02:00
parent 3f36972764
commit 9fd3012c27
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/Services/UserSystem/UserAvatarHelper.php
View file

@ -36,6 +36,8 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
class UserAvatarHelper class UserAvatarHelper
{ {
public const IMG_DEFAULT_AVATAR_PATH = '/img/default_avatar.png';
public function __construct(private readonly bool $use_gravatar, private readonly Packages $packages, private readonly AttachmentURLGenerator $attachmentURLGenerator, private readonly FilterService $filterService, private readonly EntityManagerInterface $entityManager, private readonly AttachmentSubmitHandler $submitHandler) public function __construct(private readonly bool $use_gravatar, private readonly Packages $packages, private readonly AttachmentURLGenerator $attachmentURLGenerator, private readonly FilterService $filterService, private readonly EntityManagerInterface $entityManager, private readonly AttachmentSubmitHandler $submitHandler)
{ {
} }
@ -51,7 +53,7 @@ class UserAvatarHelper
//Check if the user has a master attachment defined (meaning he has explicitly defined a profile picture) //Check if the user has a master attachment defined (meaning he has explicitly defined a profile picture)
if ($user->getMasterPictureAttachment() instanceof Attachment) { if ($user->getMasterPictureAttachment() instanceof Attachment) {
return $this->attachmentURLGenerator->getThumbnailURL($user->getMasterPictureAttachment(), 'thumbnail_md') return $this->attachmentURLGenerator->getThumbnailURL($user->getMasterPictureAttachment(), 'thumbnail_md')
?? throw new RuntimeException('Could not generate thumbnail URL'); ?? $this->packages->getUrl(self::IMG_DEFAULT_AVATAR_PATH);
} }
//If not check if gravatar is enabled (then use gravatar URL) //If not check if gravatar is enabled (then use gravatar URL)
@ -60,7 +62,7 @@ class UserAvatarHelper
} }
//Fallback to the default avatar picture //Fallback to the default avatar picture
return $this->packages->getUrl('/img/default_avatar.png'); return $this->packages->getUrl(self::IMG_DEFAULT_AVATAR_PATH);
} }
public function getAvatarSmURL(User $user): string public function getAvatarSmURL(User $user): string
@ -68,7 +70,7 @@ class UserAvatarHelper
//Check if the user has a master attachment defined (meaning he has explicitly defined a profile picture) //Check if the user has a master attachment defined (meaning he has explicitly defined a profile picture)
if ($user->getMasterPictureAttachment() instanceof Attachment) { if ($user->getMasterPictureAttachment() instanceof Attachment) {
return $this->attachmentURLGenerator->getThumbnailURL($user->getMasterPictureAttachment(), 'thumbnail_xs') return $this->attachmentURLGenerator->getThumbnailURL($user->getMasterPictureAttachment(), 'thumbnail_xs')
?? throw new RuntimeException('Could not generate thumbnail URL');; ?? $this->packages->getUrl(self::IMG_DEFAULT_AVATAR_PATH);
} }
//If not check if gravatar is enabled (then use gravatar URL) //If not check if gravatar is enabled (then use gravatar URL)
@ -78,10 +80,10 @@ class UserAvatarHelper
try { try {
//Otherwise we can serve the relative path via Asset component //Otherwise we can serve the relative path via Asset component
return $this->filterService->getUrlOfFilteredImage('/img/default_avatar.png', 'thumbnail_xs'); return $this->filterService->getUrlOfFilteredImage(self::IMG_DEFAULT_AVATAR_PATH, 'thumbnail_xs');
} catch (RuntimeException) { } catch (RuntimeException) {
//If the filter fails, we can not serve the thumbnail and fall back to the original image and log an warning //If the filter fails, we can not serve the thumbnail and fall back to the original image and log an warning
return $this->packages->getUrl('/img/default_avatar.png'); return $this->packages->getUrl(self::IMG_DEFAULT_AVATAR_PATH);
} }
} }
@ -90,7 +92,7 @@ class UserAvatarHelper
//Check if the user has a master attachment defined (meaning he has explicitly defined a profile picture) //Check if the user has a master attachment defined (meaning he has explicitly defined a profile picture)
if ($user->getMasterPictureAttachment() instanceof Attachment) { if ($user->getMasterPictureAttachment() instanceof Attachment) {
return $this->attachmentURLGenerator->getThumbnailURL($user->getMasterPictureAttachment(), 'thumbnail_sm') return $this->attachmentURLGenerator->getThumbnailURL($user->getMasterPictureAttachment(), 'thumbnail_sm')
?? throw new RuntimeException('Could not generate thumbnail URL'); ?? $this->packages->getUrl(self::IMG_DEFAULT_AVATAR_PATH);
} }
//If not check if gravatar is enabled (then use gravatar URL) //If not check if gravatar is enabled (then use gravatar URL)
@ -100,10 +102,10 @@ class UserAvatarHelper
try { try {
//Otherwise we can serve the relative path via Asset component //Otherwise we can serve the relative path via Asset component
return $this->filterService->getUrlOfFilteredImage('/img/default_avatar.png', 'thumbnail_xs'); return $this->filterService->getUrlOfFilteredImage(self::IMG_DEFAULT_AVATAR_PATH, 'thumbnail_xs');
} catch (RuntimeException) { } catch (RuntimeException) {
//If the filter fails, we can not serve the thumbnail and fall back to the original image and log an warning //If the filter fails, we can not serve the thumbnail and fall back to the original image and log an warning
return $this->packages->getUrl('/img/default_avatar.png'); return $this->packages->getUrl(self::IMG_DEFAULT_AVATAR_PATH);
} }
} }