UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-29 17:53:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update MediaStorageService

Browse source
This commit is contained in:
Daniel Supernault 2023-06-06 05:54:49 -06:00
parent ab9a8ba314
commit d6374cfe70
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Jobs/AvatarPipeline/RemoteAvatarFetchFromUrl.php
View file

@ -84,7 +84,7 @@ class RemoteAvatarFetchFromUrl implements ShouldQueue
$avatar->save(); $avatar->save();
} }
MediaStorageService::avatar($avatar, boolval(config_cache('pixelfed.cloud_storage')) == false); MediaStorageService::avatar($avatar, boolval(config_cache('pixelfed.cloud_storage')) == false, true);
return 1; return 1;
} }

4
app/Services/MediaStorageService.php
View file

@ -191,7 +191,7 @@ class MediaStorageService {
unlink($tmpName); unlink($tmpName);
} }
protected function fetchAvatar($avatar, $local = false) protected function fetchAvatar($avatar, $local = false, $skipRecentCheck = false)
{ {
$url = $avatar->remote_url; $url = $avatar->remote_url;
$driver = $local ? 'local' : config('filesystems.cloud'); $driver = $local ? 'local' : config('filesystems.cloud');
@ -215,9 +215,11 @@ class MediaStorageService {
$mime = $head['mime']; $mime = $head['mime'];
$max_size = (int) config('pixelfed.max_avatar_size') * 1000; $max_size = (int) config('pixelfed.max_avatar_size') * 1000;
if(!$skipRecentCheck) {
if($avatar->last_fetched_at && $avatar->last_fetched_at->gt(now()->subDay())) { if($avatar->last_fetched_at && $avatar->last_fetched_at->gt(now()->subDay())) {
return; return;
} }
}
// handle pleroma edge case // handle pleroma edge case
if(Str::endsWith($mime, '; charset=utf-8')) { if(Str::endsWith($mime, '; charset=utf-8')) {