diff --git a/CHANGELOG.md b/CHANGELOG.md index cb491c95..0edab964 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,7 @@ - Improve inbox status deletion cache invalidation ([1eba7f81](https://github.com/pixelfed/pixelfed/commit/1eba7f81)) - Update MediaDeletePipeline, fix async media deletion ([bb1cccbe](https://github.com/pixelfed/pixelfed/commit/bb1cccbe)) - Fix timeline infinite scroll ([03a85460](https://github.com/pixelfed/pixelfed/commit/03a85460)) +- Fix remote avatar urls when not using cloud storage ([672f7c8c](https://github.com/pixelfed/pixelfed/commit/672f7c8c)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3) 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;