UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 14:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update RemotAvatarFetch, only dispatch jobs if cloud storage is enabled

Browse source
This commit is contained in:
Daniel Supernault 2021-01-30 09:47:02 -07:00
parent 5a116c7ae0
commit 4f40f6f5a1
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,6 +51,10 @@ class RemoteAvatarFetch implements ShouldQueue
{ {
$profile = $this->profile; $profile = $this->profile;
if(config('pixelfed.cloud_storage') !== true) {
return 1;
}
if($profile->domain == null || $profile->private_key) { if($profile->domain == null || $profile->private_key) {
return 1; return 1;
} }

4
app/Util/ActivityPub/Helpers.php
View file

@ -474,7 +474,9 @@ class Helpers {
$profile->webfinger = strtolower(Purify::clean($webfinger)); $profile->webfinger = strtolower(Purify::clean($webfinger));
$profile->last_fetched_at = now(); $profile->last_fetched_at = now();
$profile->save(); $profile->save();
if(config('pixelfed.cloud_storage') == true) {
RemoteAvatarFetch::dispatch($profile); RemoteAvatarFetch::dispatch($profile);
}
return $profile; return $profile;
}); });
} else { } else {
@ -488,8 +490,10 @@ class Helpers {
$profile->sharedInbox = isset($res['endpoints']) && isset($res['endpoints']['sharedInbox']) && Helpers::validateUrl($res['endpoints']['sharedInbox']) ? $res['endpoints']['sharedInbox'] : null; $profile->sharedInbox = isset($res['endpoints']) && isset($res['endpoints']['sharedInbox']) && Helpers::validateUrl($res['endpoints']['sharedInbox']) ? $res['endpoints']['sharedInbox'] : null;
$profile->save(); $profile->save();
} }
if(config('pixelfed.cloud_storage') == true) {
RemoteAvatarFetch::dispatch($profile); RemoteAvatarFetch::dispatch($profile);
} }
}
return $profile; return $profile;
}); });
return $profile; return $profile;