From 9661b7788cef835ccae8fbaf1da23f3969101600 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 29 Apr 2020 12:55:08 -0600
Subject: [PATCH] Update AP helpers, remove tombstone support until race
 condition fixed

---
 app/Util/ActivityPub/Helpers.php | 2 +-
 app/Util/ActivityPub/Inbox.php   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php
index b68b6fd84..f98647e97 100644
--- 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');
 			}
 
diff --git a/app/Util/ActivityPub/Inbox.php b/app/Util/ActivityPub/Inbox.php
index 052b5fd07..195b8d6ef 100644
--- 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)