UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-23 05:23:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1134 from pixelfed/frontend-ui-refactor

Browse source 
Update AP Inbox
This commit is contained in:
daniel 2019-04-06 22:28:12 -06:00 committed by GitHub
commit 97226814f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/Util/ActivityPub/Inbox.php
View file

@ -41,7 +41,7 @@ class Inbox
public function handleVerb()
{
$verb = $this->payload['type'];
$verb = (string) $this->payload['type'];
switch ($verb) {
case 'Create':
$this->handleCreateActivity();
@ -262,9 +262,9 @@ class Inbox
if(is_string($obj) && Helpers::validateUrl($obj)) {
// actor object detected
// todo delete actor
} else if (is_array($obj) && isset($obj['type']) && $obj['type'] == 'Tombstone') {
} else if (Helpers::validateUrl($obj['id']) && is_array($obj) && isset($obj['type']) && $obj['type'] == 'Tombstone') {
// tombstone detected
$status = Status::whereUri($obj['id'])->firstOrFail();
$status = Status::whereLocal(false)->whereUri($obj['id'])->firstOrFail();
$status->forceDelete();
}
}
@ -278,6 +278,9 @@ class Inbox
return;
}
$status = Helpers::statusFirstOrFetch($obj);
if(!$status || !$profile) {
return;
}
$like = Like::firstOrCreate([
'profile_id' => $profile->id,
'status_id' => $status->id
@ -313,6 +316,9 @@ class Inbox
case 'Follow':
$following = self::actorFirstOrCreate($obj['object']);
if(!$following) {
return;
}
Follower::whereProfileId($profile->id)
->whereFollowingId($following->id)
->delete();
@ -320,6 +326,9 @@ class Inbox
case 'Like':
$status = Helpers::statusFirstOrFetch($obj['object']);
if(!$status) {
return;
}
Like::whereProfileId($profile->id)
->whereStatusId($status->id)
->forceDelete();