UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-23 15:01:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3579 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2022-07-16 02:49:02 -06:00 committed by GitHub
commit 783884c682
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -40,6 +40,7 @@
- Improve inbox status deletion cache invalidation ([1eba7f81](https://github.com/pixelfed/pixelfed/commit/1eba7f81)) - 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)) - 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 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/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3) ## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3)

10
app/Profile.php
View file

@ -157,15 +157,19 @@ class Profile extends Model
public function avatarUrl() public function avatarUrl()
{ {
$url = Cache::remember('avatar:'.$this->id, now()->addYears(1), function () { $url = Cache::remember('avatar:'.$this->id, 1209600, function () {
$avatar = $this->avatar; $avatar = $this->avatar;
if($avatar->cdn_url) { 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) { if($avatar->is_remote) {
return $avatar->cdn_url ?? url('/storage/avatars/default.jpg'); return url('/storage/avatars/default.jpg');
} }
$path = $avatar->media_path; $path = $avatar->media_path;