saulteafarmer/castopod
1
0
Fork 0
mirror of https://code.castopod.org/adaures/castopod synced 2025-06-06 18:31:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(fediverse): expand object before sending accept follow request

Browse Source 
fixes #350
This commit is contained in:
Yassine Doghri 2023-07-05 14:57:05 +00:00
parent 7e20df6a58
commit 082cdc9ee7
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/Fediverse/Helpers/fediverse_helper.php
View File

@ -14,8 +14,10 @@ use Config\Mimes;
use Embera\Embera; use Embera\Embera;
use Modules\Fediverse\Activities\AcceptActivity; use Modules\Fediverse\Activities\AcceptActivity;
use Modules\Fediverse\ActivityRequest; use Modules\Fediverse\ActivityRequest;
use Modules\Fediverse\Core\ObjectType;
use Modules\Fediverse\Entities\Actor; use Modules\Fediverse\Entities\Actor;
use Modules\Fediverse\Entities\PreviewCard; use Modules\Fediverse\Entities\PreviewCard;
use Modules\Fediverse\Models\ActivityModel;
if (! function_exists('get_webfinger_data')) { if (! function_exists('get_webfinger_data')) {
/** /**
@ -64,13 +66,20 @@ if (! function_exists('accept_follow')) {
function accept_follow(Actor $actor, Actor $targetActor, string $objectId): void function accept_follow(Actor $actor, Actor $targetActor, string $objectId): void
{ {
$acceptActivity = new AcceptActivity(); $acceptActivity = new AcceptActivity();
$object = new ObjectType();
$object->set('id', $objectId);
$object->set('type', 'Follow');
$object->set('actor', $targetActor->uri);
$object->set('object', $actor->uri);
$acceptActivity->set('actor', $actor->uri) $acceptActivity->set('actor', $actor->uri)
->set('object', $objectId); ->set('object', $object);
$db = db_connect(); $db = db_connect();
$db->transStart(); $db->transStart();
$activityModel = model('ActivityModel', false); $activityModel = model(ActivityModel::class, false);
$activityId = $activityModel->newActivity( $activityId = $activityModel->newActivity(
'Accept', 'Accept',
$actor->id, $actor->id,