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

Merge pull request #3365 from pixelfed/staging

Browse source 
Update AP helpers
This commit is contained in:
daniel 2022-04-06 01:43:59 -06:00 committed by GitHub
commit c62bfdba47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -667,7 +667,7 @@ class Helpers {
}
$hash = base64_encode($url);
$key = 'ap:profile:by_url:' . $hash;
$ttl = now()->addMinutes(5);
$ttl = now()->addSeconds(60);
$profile = Cache::remember($key, $ttl, function() use($url, $runJobs) {
$host = parse_url($url, PHP_URL_HOST);
$local = config('pixelfed.domain.app') == $host ? true : false;
@ -706,9 +706,7 @@ class Helpers {
if($instance->wasRecentlyCreated == true) {
\App\Jobs\InstancePipeline\FetchNodeinfoPipeline::dispatch($instance)->onQueue('low');
}
$profileLockKey = 'helpers:profile-lock:' . hash('sha256', $res['id']);
$profile = Cache::lock($profileLockKey)->get(function () use($domain, $webfinger, $res, $runJobs) {
return DB::transaction(function() use($domain, $webfinger, $res, $runJobs) {
$profile = DB::transaction(function() use($domain, $webfinger, $res, $runJobs) {
$profile = new Profile();
$profile->domain = strtolower($domain);
$profile->username = Purify::clean($webfinger);
@ -726,7 +724,6 @@ class Helpers {
RemoteAvatarFetch::dispatch($profile);
return $profile;
});
});
} else {
// Update info after 24 hours
if($profile->last_fetched_at == null ||