mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-12-22 04:53:17 +00:00
Merge pull request #3790 from pixelfed/staging
Update Inbox, fix handleUndoActivity
This commit is contained in:
commit
8cfb1e2495
1 changed files with 4 additions and 1 deletions
|
@ -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)
|
||||||
|
|
Loading…
Reference in a new issue