mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Update DeleteWorker, remove cache lock

This commit is contained in:
Daniel Supernault 2022-08-31 20:57:20 -06:00
parent 61f230aa9e
commit 6d6a033a54
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7
1 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app/Jobs/InboxPipeline/DeleteWorker.php
View File

@ -72,39 +72,31 @@ class DeleteWorker implements ShouldQueue
'b:' . base64_encode($actor) : 'b:' . base64_encode($actor) :
'h:' . hash('sha256', $actor); 'h:' . hash('sha256', $actor);
$lockKey = 'ap:inbox:actor-delete-exists:lock:' . $hash; $key = 'ap:inbox:actor-delete-exists:' . $hash;
Cache::lock($lockKey, 30)->block(15, function () use( $actorDelete = Cache::remember($key, now()->addMinutes(15), function() use($actor) {
$headers, return Profile::whereRemoteUrl($actor)
$payload, ->whereNotNull('domain')
$actor, ->exists();
$hash });
) { if($actorDelete) {
$key = 'ap:inbox:actor-delete-exists:' . $hash; if($this->verifySignature($headers, $payload) == true) {
$actorDelete = Cache::remember($key, now()->addMinutes(15), function() use($actor) { Cache::set($key, false);
return Profile::whereRemoteUrl($actor) $profile = Profile::whereNotNull('domain')
->whereNotNull('domain') ->whereNull('status')
->exists(); ->whereRemoteUrl($actor)
}); ->first();
if($actorDelete) { if($profile) {
if($this->verifySignature($headers, $payload) == true) { DeleteRemoteProfilePipeline::dispatch($profile)->onQueue('delete');
Cache::set($key, false);
$profile = Profile::whereNotNull('domain')
->whereNull('status')
->whereRemoteUrl($actor)
->first();
if($profile) {
DeleteRemoteProfilePipeline::dispatch($profile)->onQueue('delete');
}
return 1;
} else {
// Signature verification failed, exit.
return 1;
} }
return 1;
} else { } else {
// Remote user doesn't exist, exit early. // Signature verification failed, exit.
return 1; return 1;
} }
}); } else {
// Remote user doesn't exist, exit early.
return 1;
}
return 1; return 1;
} }