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

Update FollowRequest model

Browse source
This commit is contained in:
Daniel Supernault 2022-06-03 01:29:50 -06:00
parent 4f99039c15
commit 85fb46668c
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
4 changed files with 37 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/FollowRequest.php
View file

@ -6,7 +6,11 @@ use Illuminate\Database\Eloquent\Model;
class FollowRequest extends Model
{
protected $fillable = ['follower_id', 'following_id'];
protected $fillable = ['follower_id', 'following_id', 'activity', 'handled_at'];
protected $casts = [
'activity' => 'array',
];
public function follower()
{
@ -27,4 +31,10 @@ class FollowRequest extends Model
{
return $this->belongsTo(Profile::class, 'following_id', 'id');
}
public function permalink($append = null)
{
$path = $this->target->permalink("#accepts/follows/{$this->id}{$append}");
return url($path);
}
}

5
app/Jobs/FollowPipeline/FollowPipeline.php
View file

@ -63,11 +63,6 @@ class FollowPipeline implements ShouldQueue
$notification->item_id = $target->id;
$notification->item_type = "App\Profile";
$notification->save();
$redis = Redis::connection();
$nkey = config('cache.prefix').':user.'.$target->id.'.notifications';
$redis->lpush($nkey, $notification->id);
} catch (Exception $e) {
Log::error($e);
}

25
app/Transformer/ActivityPub/Verb/AcceptFollow.php Normal file
View file

@ -0,0 +1,25 @@
<?php
namespace App\Transformer\ActivityPub\Verb;
use App\FollowRequest;
use League\Fractal;
class AcceptFollow extends Fractal\TransformerAbstract
{
public function transform(FollowRequest $follow)
{
return [
'@context' => 'https://www.w3.org/ns/activitystreams',
'type' => 'Accept',
'id' => $follow->permalink(),
'actor' => $follow->target->permalink(),
'object' => [
'type' => 'Follow',
'id' => $follow->activity ? $follow->activity['id'] : null,
'actor' => $follow->actor->permalink(),
'object' => $follow->target->permalink()
]
];
}
}

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

@ -477,7 +477,7 @@ class Inbox
'follower_id' => $actor->id,
'following_id' => $target->id,
],[
'activity' => collect($this->payload)->only(['id','actor','object'])->toArray()
'activity' => collect($this->payload)->only(['id','actor','object','type'])->toArray()
]);
} else {
$follower = new Follower;