From 5558535aea10bfb43c756a4ef387ebbc70116e47 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 7 Sep 2024 04:18:07 -0600
Subject: [PATCH] Update Move pipeline, add debug logging

---
 app/Jobs/MovePipeline/ProcessMovePipeline.php | 5 +++++
 app/Util/ActivityPub/Inbox.php                | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/Jobs/MovePipeline/ProcessMovePipeline.php b/app/Jobs/MovePipeline/ProcessMovePipeline.php
index 74fbd4df..db2bd491 100644
--- a/app/Jobs/MovePipeline/ProcessMovePipeline.php
+++ b/app/Jobs/MovePipeline/ProcessMovePipeline.php
@@ -9,6 +9,7 @@ use Illuminate\Foundation\Queue\Queueable;
 use Illuminate\Queue\Middleware\ThrottlesExceptions;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
 use DateTime;
+use Log;
 
 class ProcessMovePipeline implements ShouldQueue
 {
@@ -86,11 +87,13 @@ class ProcessMovePipeline implements ShouldQueue
         $res = ActivityPubFetchService::fetchRequest($this->target, true);
 
         if (! $res || ! isset($res['alsoKnownAs'])) {
+            Log::info('[AP][INBOX][MOVE] target_aka failure');
             return false;
         }
 
         $res = Helpers::profileFetch($this->target);
         if (! $res) {
+            Log::info('[AP][INBOX][MOVE] target fetch failure');
             return false;
         }
 
@@ -112,11 +115,13 @@ class ProcessMovePipeline implements ShouldQueue
         $res = ActivityPubFetchService::fetchRequest($this->actor, true);
 
         if (! $res || ! isset($res['movedTo'])) {
+            Log::info('[AP][INBOX][MOVE] actor_movedTo failure');
             return false;
         }
 
         $res = Helpers::profileFetch($this->actor);
         if (! $res) {
+            Log::info('[AP][INBOX][MOVE] actor fetch failure');
             return false;
         }
 
diff --git a/app/Util/ActivityPub/Inbox.php b/app/Util/ActivityPub/Inbox.php
index dba40b08..a181c1f9 100644
--- a/app/Util/ActivityPub/Inbox.php
+++ b/app/Util/ActivityPub/Inbox.php
@@ -145,7 +145,6 @@ class Inbox
             case 'Move':
                 if (MoveValidator::validate($this->payload) == false) {
                     \Log::info('[AP][INBOX][MOVE] VALIDATE_FAILURE '.json_encode($this->payload));
-
                     return;
                 }
                 $this->handleMoveActivity();
@@ -1367,6 +1366,7 @@ class Inbox
             ! Helpers::validateUrl($activity) ||
             ! Helpers::validateUrl($target)
         ) {
+            \Log::info('[AP][INBOX][MOVE] validateUrl fail');
             return;
         }
 
@@ -1375,6 +1375,6 @@ class Inbox
             new MoveMigrateFollowersPipeline($target, $activity),
             new UnfollowLegacyAccountMovePipeline($target, $activity),
             new CleanupLegacyAccountMovePipeline($target, $activity),
-        ])->onQueue('move')->dispatch();
+        ])->onQueue('move')->dispatchSync();
     }
 }