From 672f7c8ce082ac82c01ce4ce59d8e4777dffdcdf Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 16 Jul 2022 02:47:05 -0600
Subject: [PATCH] Fix remote avatar urls when not using cloud storage

---
 app/Profile.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Profile.php b/app/Profile.php
index dedc2739..49160603 100644
--- a/app/Profile.php
+++ b/app/Profile.php
@@ -157,15 +157,19 @@ class Profile extends Model
 
 	public function avatarUrl()
 	{
-		$url = Cache::remember('avatar:'.$this->id, now()->addYears(1), function () {
+		$url = Cache::remember('avatar:'.$this->id, 1209600, function () {
 			$avatar = $this->avatar;
 
 			if($avatar->cdn_url) {
-				return $avatar->cdn_url ?? url('/storage/avatars/default.jpg');
+				if(substr($avatar->cdn_url, 0, 8) === 'https://') {
+					return $avatar->cdn_url;
+				} else {
+					return url($avatar->cdn_url);
+				}
 			}
 
 			if($avatar->is_remote) {
-				return $avatar->cdn_url ?? url('/storage/avatars/default.jpg');
+				return url('/storage/avatars/default.jpg');
 			}
 			
 			$path = $avatar->media_path;