From 15a4e5338299459b313ae6d99f86798bfe74d9eb Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Mon, 9 Sep 2024 04:14:46 -0600
Subject: [PATCH] Update MovePipeline

---
 .../MovePipeline/MoveMigrateFollowersPipeline.php   | 13 ++++++++-----
 .../UnfollowLegacyAccountMovePipeline.php           | 10 ++++++----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/Jobs/MovePipeline/MoveMigrateFollowersPipeline.php b/app/Jobs/MovePipeline/MoveMigrateFollowersPipeline.php
index 99e03989a..14722e092 100644
--- a/app/Jobs/MovePipeline/MoveMigrateFollowersPipeline.php
+++ b/app/Jobs/MovePipeline/MoveMigrateFollowersPipeline.php
@@ -10,22 +10,25 @@ use DB;
 use Exception;
 use GuzzleHttp\Client;
 use GuzzleHttp\Pool;
+use GuzzleHttp\Psr7\Request;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;
 use Illuminate\Queue\Middleware\ThrottlesExceptionsWithRedis;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Support\Facades\Log;
-use GuzzleHttp\Psr7\Request;
 
 class MoveMigrateFollowersPipeline implements ShouldQueue
 {
     use Queueable;
 
     public string $target;
+
     public string $activity;
 
     public int $tries = 15;
+
     public int $maxExceptions = 5;
+
     public int $timeout = 900;
 
     public function __construct(string $target, string $activity)
@@ -55,7 +58,7 @@ class MoveMigrateFollowersPipeline implements ShouldQueue
             $targetAccount = $this->fetchProfile($this->target);
             $actorAccount = $this->fetchProfile($this->activity);
 
-            if (!$targetAccount || !$actorAccount) {
+            if (! $targetAccount || ! $actorAccount) {
                 throw new Exception('Invalid move accounts');
             }
 
@@ -76,7 +79,7 @@ class MoveMigrateFollowersPipeline implements ShouldQueue
             Log::error('MoveMigrateFollowersPipeline failed', [
                 'target' => $this->target,
                 'activity' => $this->activity,
-                'error' => $e->getMessage()
+                'error' => $e->getMessage(),
             ]);
             throw $e;
         }
@@ -84,7 +87,7 @@ class MoveMigrateFollowersPipeline implements ShouldQueue
 
     private function validateEnvironment(): void
     {
-        if (config('app.env') !== 'production' || !(bool)config('federation.activitypub.enabled')) {
+        if (config('app.env') !== 'production' || ! (bool) config('federation.activitypub.enabled')) {
             throw new Exception('ActivityPub not enabled');
         }
     }
@@ -121,7 +124,7 @@ class MoveMigrateFollowersPipeline implements ShouldQueue
     private function generateRequests($followers, string $targetInbox, int $targetPid): \Generator
     {
         foreach ($followers as $follower) {
-            if (!$this->isValidFollower($follower)) {
+            if (! $this->isValidFollower($follower)) {
                 continue;
             }
 
diff --git a/app/Jobs/MovePipeline/UnfollowLegacyAccountMovePipeline.php b/app/Jobs/MovePipeline/UnfollowLegacyAccountMovePipeline.php
index e7b303763..2637f9fed 100644
--- a/app/Jobs/MovePipeline/UnfollowLegacyAccountMovePipeline.php
+++ b/app/Jobs/MovePipeline/UnfollowLegacyAccountMovePipeline.php
@@ -21,9 +21,11 @@ class UnfollowLegacyAccountMovePipeline implements ShouldQueue
     use Queueable;
 
     public string $target;
+
     public string $activity;
 
     public int $tries = 6;
+
     public int $maxExceptions = 3;
 
     public function __construct(string $target, string $activity)
@@ -53,7 +55,7 @@ class UnfollowLegacyAccountMovePipeline implements ShouldQueue
             $targetAccount = $this->fetchProfile($this->target);
             $actorAccount = $this->fetchProfile($this->activity);
 
-            if (!$targetAccount || !$actorAccount) {
+            if (! $targetAccount || ! $actorAccount) {
                 throw new Exception('Invalid move accounts');
             }
 
@@ -66,7 +68,7 @@ class UnfollowLegacyAccountMovePipeline implements ShouldQueue
             Log::error('UnfollowLegacyAccountMovePipeline failed', [
                 'target' => $this->target,
                 'activity' => $this->activity,
-                'error' => $e->getMessage()
+                'error' => $e->getMessage(),
             ]);
             throw $e;
         }
@@ -74,7 +76,7 @@ class UnfollowLegacyAccountMovePipeline implements ShouldQueue
 
     private function validateEnvironment(): void
     {
-        if (config('app.env') !== 'production' || !(bool)config('federation.activitypub.enabled')) {
+        if (config('app.env') !== 'production' || ! (bool) config('federation.activitypub.enabled')) {
             throw new Exception('ActivityPub not enabled');
         }
     }
@@ -124,7 +126,7 @@ class UnfollowLegacyAccountMovePipeline implements ShouldQueue
     private function generateRequests($followers, string $targetInbox, int $targetPid): \Generator
     {
         foreach ($followers as $follower) {
-            if (!$this->isValidFollower($follower)) {
+            if (! $this->isValidFollower($follower)) {
                 continue;
             }