chris/pixelfed
1
0
Fork 0
forked from mirror/pixelfed
Code Pull requests Activity

Update profile model, improve avatarUrl fallback

Browse source
This commit is contained in:
Daniel Supernault 2023-02-08 01:27:32 -07:00
parent f6a588f9cf
commit 620ee826d1
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Profile.php
View file

@ -160,6 +160,10 @@ class Profile extends Model
$url = Cache::remember('avatar:'.$this->id, 1209600, function () { $url = Cache::remember('avatar:'.$this->id, 1209600, function () {
$avatar = $this->avatar; $avatar = $this->avatar;
if(!$avatar) {
return url('/storage/avatars/default.jpg');
}
if($avatar->cdn_url) { if($avatar->cdn_url) {
if(substr($avatar->cdn_url, 0, 8) === 'https://') { if(substr($avatar->cdn_url, 0, 8) === 'https://') {
return $avatar->cdn_url; return $avatar->cdn_url;
@ -170,6 +174,10 @@ class Profile extends Model
$path = $avatar->media_path; $path = $avatar->media_path;
if(!$path) {
return url('/storage/avatars/default.jpg');
}
if(substr($path, 0, 6) !== 'public') { if(substr($path, 0, 6) !== 'public') {
return url('/storage/avatars/default.jpg'); return url('/storage/avatars/default.jpg');
} }