From 989e42497aec88ce9f738fdc45acc4f00028c94b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 18 Nov 2022 02:26:18 -0700 Subject: [PATCH 1/2] Update Profile, fix avatarUrl paths. Fixes #3559 #3634 --- app/Profile.php | 9 +++++---- app/Services/MediaStorageService.php | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/Profile.php b/app/Profile.php index 491606031..f02144f09 100644 --- a/app/Profile.php +++ b/app/Profile.php @@ -164,15 +164,16 @@ class Profile extends Model if(substr($avatar->cdn_url, 0, 8) === 'https://') { return $avatar->cdn_url; } else { - return url($avatar->cdn_url); + return url('/storage/avatars/default.jpg'); } } - if($avatar->is_remote) { + $path = $avatar->media_path; + + if(substr($path, 0, 6) !== 'public') { return url('/storage/avatars/default.jpg'); } - - $path = $avatar->media_path; + $path = "{$path}?v={$avatar->change_count}"; return config('app.url') . Storage::url($path); diff --git a/app/Services/MediaStorageService.php b/app/Services/MediaStorageService.php index eac7da1a7..1c3272ec1 100644 --- a/app/Services/MediaStorageService.php +++ b/app/Services/MediaStorageService.php @@ -246,7 +246,7 @@ class MediaStorageService { $file = $disk->putFileAs($base, new File($tmpName), $path, 'public'); $permalink = $disk->url($file); - $avatar->media_path = $base . $path; + $avatar->media_path = $base . '/' . $path; $avatar->is_remote = true; $avatar->cdn_url = $local ? config('app.url') . $permalink : $permalink; $avatar->size = $head['length']; From c1dc72d97077828f8e15f5db74232a8ce58e01dc Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 18 Nov 2022 02:26:49 -0700 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 449667a84..00ddf1f15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ - Update ProfileController, cache actor object and atom feed ([8665eab1](https://github.com/pixelfed/pixelfed/commit/8665eab1)) - Update NotificationTransformer, fix mediaTag and modLog types ([b6c06c4b](https://github.com/pixelfed/pixelfed/commit/b6c06c4b)) - Update landing view, add `app.name` and `app.short_description` for better customizability ([bda9d16b](https://github.com/pixelfed/pixelfed/commit/bda9d16b)) +- Update Profile, fix avatarUrl paths. Fixes #3559 #3634 ([989e4249](https://github.com/pixelfed/pixelfed/commit/989e4249)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)