chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #2194 from pixelfed/staging 

Update Inbox handler, remove logger
This commit is contained in:
daniel 2020-05-21 16:46:32 -06:00 committed by GitHub
parent 77eb3a9a52 fee25d44e0
commit 2057592fc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,12 +42,12 @@ class Inbox
{
$this->handleVerb();
if(!Activity::where('data->id', $this->payload['id'])->exists()){
(new Activity())->create([
'to_id' => $this->profile->id,
'data' => json_encode($this->payload)
]);
}
// if(!Activity::where('data->id', $this->payload['id'])->exists()) {
// (new Activity())->create([
// 'to_id' => $this->profile->id,
// 'data' => json_encode($this->payload)
// ]);
// }
return;
@ -62,6 +62,7 @@ class Inbox
break;
case 'Follow':
if(FollowValidator::validate($this->payload) == false) { return; }
$this->handleFollowActivity();
break;
@ -80,6 +81,7 @@ class Inbox
break;
case 'Like':
if(LikeValidator::validate($this->payload) == false) { return; }
$this->handleLikeActivity();
break;
@ -171,26 +173,32 @@ class Inbox
public function handleFollowActivity()
{
$actor = $this->actorFirstOrCreate($this->payload['actor']);
if(!$actor || $actor->domain == null) {
$target = $this->profile;
if(!$actor || $actor->domain == null || $target->domain !== null) {
return;
}
if(
Follower::whereProfileId($actor->id)
->whereFollowingId($target->id)
->exists() ||
FollowRequest::whereFollowerId($actor->id)
->whereFollowingId($target->id)
->exists();
) {
return;
}
$target = $this->profile;
if($target->is_private == true) {
// make follow request
FollowRequest::firstOrCreate([
'follower_id' => $actor->id,
'following_id' => $target->id
]);
// todo: send notification
} else {
// store new follower
$follower = Follower::firstOrCreate([
'profile_id' => $actor->id,
'following_id' => $target->id,
'local_profile' => empty($actor->domain)
]);
if($follower->wasRecentlyCreated == true && $target->domain == null) {
// send notification
$follower = new Follower;
$follower->profile_id => $actor->id;
$follower->following_id => $target->id;
$follower->local_profile => empty($actor->domain);
if($target->domain == null) {
Notification::firstOrCreate([
'profile_id' => $target->id,
'actor_id' => $actor->id,