From 28bf8649b371a91ef37bdddeecf3b5510d1b14d1 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 4 Apr 2023 02:35:37 -0600
Subject: [PATCH] Update Profile model, fix avatar url path generation. Fixes
 #4041, Fixes #4031, Fixes #3523

---
 app/Profile.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/Profile.php b/app/Profile.php
index 450520880..0baa33bf6 100644
--- a/app/Profile.php
+++ b/app/Profile.php
@@ -178,13 +178,21 @@ class Profile extends Model
 				return url('/storage/avatars/default.jpg');
 			}
 
+			if($path === 'public/avatars/default.jpg') {
+				return url('/storage/avatars/default.jpg');
+			}
+
 			if(substr($path, 0, 6) !== 'public') {
 				return url('/storage/avatars/default.jpg');
 			}
 
+			if(config('filesystems.default') !== 'local') {
+				return Storage::url($path);
+			}
+
 			$path = "{$path}?v={$avatar->change_count}";
 
-			return config('app.url') . Storage::url($path);
+			return url(Storage::url($path));
 		});
 
 		return $url;