mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

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

Update Inbox
This commit is contained in:
daniel 2019-08-12 00:24:28 -06:00 committed by GitHub
parent fdeb424f57 2879e26955
commit e6e83cb870
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,7 +176,7 @@ class Inbox
'following_id' => $target->id, 'following_id' => $target->id,
'local_profile' => empty($actor->domain) 'local_profile' => empty($actor->domain)
]); ]);
if($follower->wasRecentlyCreated == true) { if($follower->wasRecentlyCreated == true && $target->domain == null) {
// send notification // send notification
Notification::firstOrCreate([ Notification::firstOrCreate([
'profile_id' => $target->id, 'profile_id' => $target->id,
@ -188,14 +188,19 @@ class Inbox
'item_type' => 'App\Profile' 'item_type' => 'App\Profile'
]); ]);
} }
$payload = $this->payload;
// send Accept to remote profile // send Accept to remote profile
$accept = [ $accept = [
'@context' => 'https://www.w3.org/ns/activitystreams', '@context' => 'https://www.w3.org/ns/activitystreams',
'id' => $target->permalink().'#accepts/follows/' . $follower->id, 'id' => $target->permalink().'#accepts/follows/' . $follower->id,
'type' => 'Accept', 'type' => 'Accept',
'actor' => $target->permalink(), 'actor' => $target->permalink(),
'object' => $payload 'object' => [
'id' => $actor->permalink('#follows/' . $follower->id),
'actor' => $actor->permalink(),
'type' => 'Follow',
'object' => $target->permalink()
]
]; ];
Helpers::sendSignedObject($target, $actor->inbox_url, $accept); Helpers::sendSignedObject($target, $actor->inbox_url, $accept);
} }