chris/pixelfed
1
0
Fork 0
forked from mirror/pixelfed
Code Pull requests Activity

Merge pull request #3108 from pixelfed/staging

Browse source 
Update RemoteAvatarFetch job
This commit is contained in:
daniel 2021-12-30 21:06:24 -07:00 committed by GitHub
commit 8957e6e3c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/Jobs/AvatarPipeline/RemoteAvatarFetch.php
View file

@ -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;
}

4
config/federation.php
View file

@ -32,6 +32,10 @@ return [
'enabled' => env('ATOM_FEEDS', true),
],
'avatars' => [
'store_local' => false
],
'nodeinfo' => [
'enabled' => env('NODEINFO', true),
],