Merge pull request #2153 from pixelfed/staging

Update AP helpers, remove tombstone support until race condition fixed

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');
 			}
 

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)