Update AP helpers, remove tombstone support until race condition fixed

5 years ago · 9661b7788c
parent ed5667c8ff
commit 9661b7788c
2 changed files with 3 additions and 1 deletions
--- a/app/Util/ActivityPub/Helpers.php
+++ b/app/Util/ActivityPub/Helpers.php
@ -236,7 +236,7 @@ class Helpers {
 				$activity = ['object' => $res];
 			}

-			if(isset($res['content']) == false) {
+			if(isset($activity['object']['content']) == false) {
 				abort(400, 'Invalid object');
 			}

--- a/app/Util/ActivityPub/Inbox.php
+++ b/app/Util/ActivityPub/Inbox.php
@ -323,6 +323,8 @@ class Inbox
                break;

            case 'Tombstone':
+                    // todo: fix race condition
+                    return; 
                    $profile = Helpers::profileFetch($actor);
                    $status = Status::whereProfileId($profile->id)
                        ->whereUri($id)