chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #2153 from pixelfed/staging 

Update AP helpers, remove tombstone support until race condition fixed
This commit is contained in:
daniel 2020-04-29 12:56:58 -06:00 committed by GitHub
parent e553bfe30e 9661b7788c
commit cc67bd9812
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Util/ActivityPub/Helpers.php
View File

@ -236,7 +236,7 @@ class Helpers {
$activity = ['object' => $res]; $activity = ['object' => $res];
} }
if(isset($res['content']) == false) { if(isset($activity['object']['content']) == false) {
abort(400, 'Invalid object'); abort(400, 'Invalid object');
} }

2
app/Util/ActivityPub/Inbox.php
View File

@ -323,6 +323,8 @@ class Inbox
break; break;
case 'Tombstone': case 'Tombstone':
// todo: fix race condition
return;
$profile = Helpers::profileFetch($actor); $profile = Helpers::profileFetch($actor);
$status = Status::whereProfileId($profile->id) $status = Status::whereProfileId($profile->id)
->whereUri($id) ->whereUri($id)