UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-19 21:11:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4034 from pixelfed/staging

Browse source 
Update ap inbox
This commit is contained in:
daniel 2022-12-29 04:06:53 -07:00 committed by GitHub
commit a97d2be7b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -307,10 +307,20 @@ class Inbox
{ {
$activity = $this->payload['object']; $activity = $this->payload['object'];
$actor = $this->actorFirstOrCreate($this->payload['actor']); $actor = $this->actorFirstOrCreate($this->payload['actor']);
if(!$actor) {
return;
}
$status = Helpers::statusFetch($activity['inReplyTo']); $status = Helpers::statusFetch($activity['inReplyTo']);
if(!$status) {
return;
}
$poll = $status->poll; $poll = $status->poll;
if(!$status || !$poll) { if(!$poll) {
return; return;
} }
@ -486,9 +496,14 @@ class Inbox
{ {
$actor = $this->actorFirstOrCreate($this->payload['actor']); $actor = $this->actorFirstOrCreate($this->payload['actor']);
$target = $this->actorFirstOrCreate($this->payload['object']); $target = $this->actorFirstOrCreate($this->payload['object']);
if(!$actor || $actor->domain == null || $target->domain !== null) { if(!$actor || !$target) {
return; return;
} }
if($actor->domain == null || $target->domain !== null) {
return;
}
if( if(
Follower::whereProfileId($actor->id) Follower::whereProfileId($actor->id)
->whereFollowingId($target->id) ->whereFollowingId($target->id)