mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-22 14:31:26 +00:00
Update RemoteAvatarFetch job
This commit is contained in:
parent
59ffa22e08
commit
92bc28456d
2 changed files with 15 additions and 5 deletions
|
@ -51,7 +51,7 @@ class RemoteAvatarFetch implements ShouldQueue
|
|||
{
|
||||
$profile = $this->profile;
|
||||
|
||||
if(config_cache('pixelfed.cloud_storage') !== true) {
|
||||
if(config_cache('pixelfed.cloud_storage') == false && config_cache('federation.avatars.store_local') == false) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -59,9 +59,13 @@ class RemoteAvatarFetch implements ShouldQueue
|
|||
return 1;
|
||||
}
|
||||
|
||||
$avatar = Avatar::firstOrCreate([
|
||||
'profile_id' => $profile->id
|
||||
]);
|
||||
$avatar = Avatar::whereProfileId($profile->id)->first();
|
||||
|
||||
if(!$avatar) {
|
||||
$avatar = new Avatar;
|
||||
$avatar->profile_id = $profile->id;
|
||||
$avatar->save();
|
||||
}
|
||||
|
||||
if($avatar->media_path == null && $avatar->remote_url == null) {
|
||||
$avatar->media_path = 'public/avatars/default.jpg';
|
||||
|
@ -95,7 +99,9 @@ class RemoteAvatarFetch implements ShouldQueue
|
|||
$avatar->remote_url = $icon['url'];
|
||||
$avatar->save();
|
||||
|
||||
MediaStorageService::avatar($avatar);
|
||||
if(config_cache('pixelfed.cloud_storage')) {
|
||||
MediaStorageService::avatar($avatar);
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
|
|
@ -32,6 +32,10 @@ return [
|
|||
'enabled' => env('ATOM_FEEDS', true),
|
||||
],
|
||||
|
||||
'avatars' => [
|
||||
'store_local' => false
|
||||
],
|
||||
|
||||
'nodeinfo' => [
|
||||
'enabled' => env('NODEINFO', true),
|
||||
],
|
||||
|
|
Loading…
Reference in a new issue