diff --git a/app/Jobs/MovePipeline/CleanupLegacyAccountMovePipeline.php b/app/Jobs/MovePipeline/CleanupLegacyAccountMovePipeline.php index cdc7bda88..cd794245f 100644 --- a/app/Jobs/MovePipeline/CleanupLegacyAccountMovePipeline.php +++ b/app/Jobs/MovePipeline/CleanupLegacyAccountMovePipeline.php @@ -59,7 +59,7 @@ class CleanupLegacyAccountMovePipeline implements ShouldQueue */ public function retryUntil(): DateTime { - return now()->addMinutes(15); + return now()->addMinutes(5); } /** diff --git a/app/Jobs/MovePipeline/MoveMigrateFollowersPipeline.php b/app/Jobs/MovePipeline/MoveMigrateFollowersPipeline.php index d6f34a917..b342fdbc0 100644 --- a/app/Jobs/MovePipeline/MoveMigrateFollowersPipeline.php +++ b/app/Jobs/MovePipeline/MoveMigrateFollowersPipeline.php @@ -63,7 +63,7 @@ class MoveMigrateFollowersPipeline implements ShouldQueue */ public function retryUntil(): DateTime { - return now()->addMinutes(15); + return now()->addMinutes(5); } /** diff --git a/app/Jobs/MovePipeline/ProcessMovePipeline.php b/app/Jobs/MovePipeline/ProcessMovePipeline.php index 164557025..9a62022fb 100644 --- a/app/Jobs/MovePipeline/ProcessMovePipeline.php +++ b/app/Jobs/MovePipeline/ProcessMovePipeline.php @@ -61,7 +61,7 @@ class ProcessMovePipeline implements ShouldQueue */ public function retryUntil(): DateTime { - return now()->addMinutes(15); + return now()->addMinutes(5); } /** @@ -80,7 +80,7 @@ class ProcessMovePipeline implements ShouldQueue if (! self::checkActor()) { throw new Exception('Invalid actor'); } - + return; } protected function checkTarget() @@ -101,7 +101,7 @@ class ProcessMovePipeline implements ShouldQueue } if (is_string($res['alsoKnownAs'])) { - return self::lowerTrim($res['alsoKnownAs']) === self::lowerTrim($this->actor); + return self::lowerTrim($res['alsoKnownAs']) === self::lowerTrim($this->activity); } if (is_array($res['alsoKnownAs'])) { @@ -109,7 +109,7 @@ class ProcessMovePipeline implements ShouldQueue return trim(strtolower($value)); }); - $res = in_array($this->actor, $map); + $res = in_array($this->activity, $map); $debugMessage = $res ? '[AP][INBOX][MOVE] aka target is valid' : '[AP][INBOX][MOVE] aka target is invalid'; Log::info($debugMessage); @@ -122,7 +122,7 @@ class ProcessMovePipeline implements ShouldQueue protected function checkActor() { - $res = ActivityPubFetchService::fetchRequest($this->actor, true); + $res = ActivityPubFetchService::fetchRequest($this->activity, true); if (! $res || ! isset($res['movedTo'])) { Log::info('[AP][INBOX][MOVE] actor_movedTo failure'); @@ -130,7 +130,7 @@ class ProcessMovePipeline implements ShouldQueue return false; } - $res = Helpers::profileFetch($this->actor); + $res = Helpers::profileFetch($this->activity); if (! $res) { Log::info('[AP][INBOX][MOVE] actor fetch failure'); diff --git a/app/Jobs/MovePipeline/UnfollowLegacyAccountMovePipeline.php b/app/Jobs/MovePipeline/UnfollowLegacyAccountMovePipeline.php index 66e10ac23..f7d5d79dd 100644 --- a/app/Jobs/MovePipeline/UnfollowLegacyAccountMovePipeline.php +++ b/app/Jobs/MovePipeline/UnfollowLegacyAccountMovePipeline.php @@ -62,7 +62,7 @@ class UnfollowLegacyAccountMovePipeline implements ShouldQueue */ public function retryUntil(): DateTime { - return now()->addMinutes(15); + return now()->addMinutes(5); } /**