From d6374cfe707246c2524c9d400ee3a9070a788b00 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 6 Jun 2023 05:54:49 -0600 Subject: [PATCH] Update MediaStorageService --- app/Jobs/AvatarPipeline/RemoteAvatarFetchFromUrl.php | 2 +- app/Services/MediaStorageService.php | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Jobs/AvatarPipeline/RemoteAvatarFetchFromUrl.php b/app/Jobs/AvatarPipeline/RemoteAvatarFetchFromUrl.php index cee52f6ea..a3f88f009 100644 --- a/app/Jobs/AvatarPipeline/RemoteAvatarFetchFromUrl.php +++ b/app/Jobs/AvatarPipeline/RemoteAvatarFetchFromUrl.php @@ -84,7 +84,7 @@ class RemoteAvatarFetchFromUrl implements ShouldQueue $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; } diff --git a/app/Services/MediaStorageService.php b/app/Services/MediaStorageService.php index a2a2c5058..60b194879 100644 --- a/app/Services/MediaStorageService.php +++ b/app/Services/MediaStorageService.php @@ -191,7 +191,7 @@ class MediaStorageService { unlink($tmpName); } - protected function fetchAvatar($avatar, $local = false) + protected function fetchAvatar($avatar, $local = false, $skipRecentCheck = false) { $url = $avatar->remote_url; $driver = $local ? 'local' : config('filesystems.cloud'); @@ -215,8 +215,10 @@ class MediaStorageService { $mime = $head['mime']; $max_size = (int) config('pixelfed.max_avatar_size') * 1000; - if($avatar->last_fetched_at && $avatar->last_fetched_at->gt(now()->subDay())) { - return; + if(!$skipRecentCheck) { + if($avatar->last_fetched_at && $avatar->last_fetched_at->gt(now()->subDay())) { + return; + } } // handle pleroma edge case