mirror/pixelfed
1
0
Fork 1
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-23 08:14:10 +00:00
Code Issues Releases Wiki Activity

Update Profile, fix avatarUrl paths. Fixes #3559 #3634

Browse source
This commit is contained in:
Daniel Supernault 2022-11-18 02:26:18 -07:00
parent fadd0534a4
commit 989e42497a
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Profile.php
View file

@ -164,15 +164,16 @@ class Profile extends Model
if(substr($avatar->cdn_url, 0, 8) === 'https://') { if(substr($avatar->cdn_url, 0, 8) === 'https://') {
return $avatar->cdn_url; return $avatar->cdn_url;
} else { } else {
return url($avatar->cdn_url);
}
}
if($avatar->is_remote) {
return url('/storage/avatars/default.jpg'); return url('/storage/avatars/default.jpg');
} }
}
$path = $avatar->media_path; $path = $avatar->media_path;
if(substr($path, 0, 6) !== 'public') {
return url('/storage/avatars/default.jpg');
}
$path = "{$path}?v={$avatar->change_count}"; $path = "{$path}?v={$avatar->change_count}";
return config('app.url') . Storage::url($path); return config('app.url') . Storage::url($path);

2
app/Services/MediaStorageService.php
View file

@ -246,7 +246,7 @@ class MediaStorageService {
$file = $disk->putFileAs($base, new File($tmpName), $path, 'public'); $file = $disk->putFileAs($base, new File($tmpName), $path, 'public');
$permalink = $disk->url($file); $permalink = $disk->url($file);
$avatar->media_path = $base . $path; $avatar->media_path = $base . '/' . $path;
$avatar->is_remote = true; $avatar->is_remote = true;
$avatar->cdn_url = $local ? config('app.url') . $permalink : $permalink; $avatar->cdn_url = $local ? config('app.url') . $permalink : $permalink;
$avatar->size = $head['length']; $avatar->size = $head['length'];