From 8afb4c28ce1a42467dfd58b8d5740b199febda7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mir=C3=B3=20Sorja?= <ping@mirosorja.com>
Date: Sat, 25 Jan 2025 10:46:20 +0200
Subject: [PATCH] 4258 - Fix default (fallback) profile picture (#4261)

Co-authored-by: Heroku-Deploy <>
---
 src/server/controller/user/getProfilePicture.ts        | 3 ++-
 src/server/repository/public/user/getProfilePicture.ts | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/server/controller/user/getProfilePicture.ts b/src/server/controller/user/getProfilePicture.ts
index a4a3d566d1..94b1d4cffd 100644
--- a/src/server/controller/user/getProfilePicture.ts
+++ b/src/server/controller/user/getProfilePicture.ts
@@ -12,7 +12,8 @@ export const getProfilePicture = async (
 ): Promise<UserProfilePicture> => {
   const { id } = props
   const userProfilePicture = await UserRepository.getProfilePicture({ id }, client)
-  const key = userProfilePicture.uuid
+  const key = userProfilePicture?.uuid
+  if (!key) return null
   const data = await FileStorage.getFile({ key })
   return {
     ...userProfilePicture,
diff --git a/src/server/repository/public/user/getProfilePicture.ts b/src/server/repository/public/user/getProfilePicture.ts
index 12a94eb3d7..71ee72b496 100644
--- a/src/server/repository/public/user/getProfilePicture.ts
+++ b/src/server/repository/public/user/getProfilePicture.ts
@@ -26,7 +26,7 @@ export const getProfilePicture = async (
     `
         select f.uuid, f.name
         from public.users u
-            left join file f on u.profile_picture_file_uuid = f.uuid
+            join file f on u.profile_picture_file_uuid = f.uuid
         ${where}
     `,
     [value]