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

Update Inbox, add delay to move handler to allow for remote cache invalidation

This commit is contained in:
Daniel Supernault 2024-09-09 02:17:30 -06:00
parent 12a0d2e8bf
commit 8a362c12a9
No known key found for this signature in database
GPG Key ID: 23740873EE6F76A1
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Util/ActivityPub/Inbox.php
View File

@ -42,9 +42,11 @@ use App\Util\ActivityPub\Validator\MoveValidator;
use App\Util\ActivityPub\Validator\UpdatePersonValidator; use App\Util\ActivityPub\Validator\UpdatePersonValidator;
use Cache; use Cache;
use Illuminate\Support\Facades\Bus; use Illuminate\Support\Facades\Bus;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Purify; use Purify;
use Storage; use Storage;
use Throwable;
class Inbox class Inbox
{ {
@ -144,7 +146,8 @@ class Inbox
case 'Move': case 'Move':
if (MoveValidator::validate($this->payload) == false) { if (MoveValidator::validate($this->payload) == false) {
\Log::info('[AP][INBOX][MOVE] VALIDATE_FAILURE '.json_encode($this->payload)); Log::info('[AP][INBOX][MOVE] VALIDATE_FAILURE '.json_encode($this->payload));
return; return;
} }
$this->handleMoveActivity(); $this->handleMoveActivity();
@ -1366,7 +1369,8 @@ class Inbox
! Helpers::validateUrl($activity) || ! Helpers::validateUrl($activity) ||
! Helpers::validateUrl($target) ! Helpers::validateUrl($target)
) { ) {
\Log::info('[AP][INBOX][MOVE] validateUrl fail'); Log::info('[AP][INBOX][MOVE] validateUrl fail');
return; return;
} }
@ -1375,6 +1379,12 @@ class Inbox
new MoveMigrateFollowersPipeline($target, $activity), new MoveMigrateFollowersPipeline($target, $activity),
new UnfollowLegacyAccountMovePipeline($target, $activity), new UnfollowLegacyAccountMovePipeline($target, $activity),
new CleanupLegacyAccountMovePipeline($target, $activity), new CleanupLegacyAccountMovePipeline($target, $activity),
])->onQueue('move')->dispatch(); ])
->catch(function (Throwable $e) {
Log::error($e);
})
->onQueue('move')
->dispatch()
->delay(now()->addMinutes(random_int(5, 9)));
} }
} }