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

Merge pull request #3790 from pixelfed/staging

Browse source 
Update Inbox, fix handleUndoActivity
This commit is contained in:
daniel 2022-11-17 20:49:55 -07:00 committed by GitHub
commit 8cfb1e2495
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -729,6 +729,9 @@ class Inbox
$profile = self::actorFirstOrCreate($actor); $profile = self::actorFirstOrCreate($actor);
$obj = $this->payload['object']; $obj = $this->payload['object'];
if(!$profile) {
return;
}
// TODO: Some implementations do not inline the object, skip for now // TODO: Some implementations do not inline the object, skip for now
if(!$obj || !is_array($obj) || !isset($obj['type'])) { if(!$obj || !is_array($obj) || !isset($obj['type'])) {
return; return;
@ -788,7 +791,7 @@ class Inbox
Like::whereProfileId($profile->id) Like::whereProfileId($profile->id)
->whereStatusId($status->id) ->whereStatusId($status->id)
->forceDelete(); ->forceDelete();
Notification::whereProfileId($status->profile->id) Notification::whereProfileId($status->profile_id)
->whereActorId($profile->id) ->whereActorId($profile->id)
->whereAction('like') ->whereAction('like')
->whereItemId($status->id) ->whereItemId($status->id)