eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

[Actor] Refactor GSActor into Actor

Browse Source
This commit is contained in:
Diogo Peralta Cordeiro
2021-09-18 03:22:27 +01:00
parent 6c899b7b61
commit 941cbe6599
73 changed files with 489 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/ActivityStreamsTwo/ActivityStreamsTwo.php
View File

@@ -42,19 +42,19 @@ class ActivityStreamsTwo extends Plugin
switch ($route) {
case 'actor_view_id':
case 'actor_view_nickname':
$response = ActorResponse::handle($vars['gsactor']);
$response = ActorResponse::handle($vars['actor']);
return Event::stop;
case 'note_view':
$response = NoteResponse::handle($vars['note']);
return Event::stop;
case 'actor_favourites':
$response = LikeResponse::handle($vars['gsactor']);
$response = LikeResponse::handle($vars['actor']);
return Event::stop;
case 'actor_subscriptions':
$response = FollowingResponse::handle($vars['gsactor']);
$response = FollowingResponse::handle($vars['actor']);
return Event::stop;
case 'actor_subscribers':
$response = FollowersResponse::handle($vars['gsactor']);
$response = FollowersResponse::handle($vars['actor']);
return Event::stop;
default:
return Event::next;

9
plugins/ActivityStreamsTwo/Util/Model/EntityToType/GSActorToType.php
View File

@@ -3,7 +3,7 @@
namespace Plugin\ActivityStreamsTwo\Util\Model\EntityToType;
use App\Core\Router\Router;
use App\Entity\GSActor;
use App\Entity\Actor;
use DateTimeInterface;
use Exception;
use Plugin\ActivityStreamsTwo\Util\Type;
@@ -11,13 +11,14 @@ use Plugin\ActivityStreamsTwo\Util\Type;
class GSActorToType
{
/**
* @param GSActor $gsactor
* @param Actor $gsactor
*
* @throws Exception
*@throws Exception
*
* @return Type
*
*/
public static function translate(GSActor $gsactor)
public static function translate(Actor $gsactor)
{
$uri = Router::url('actor_view_id', ['id' => $gsactor->getId()], Router::ABSOLUTE_URL);
$attr = [

11
plugins/ActivityStreamsTwo/Util/Response/ActorResponse.php
View File

@@ -2,21 +2,22 @@
namespace Plugin\ActivityStreamsTwo\Util\Response;
use App\Entity\GSActor;
use App\Entity\Actor;
use Exception;
use Plugin\ActivityStreamsTwo\Util\Model\EntityToType\GSActorToType;
abstract class ActorResponse
{
/**
* @param GSActor $gsactor
* @param int $status The response status code
* @param Actor $gsactor
* @param int $status The response status code
*
* @throws Exception
*@throws Exception
*
* @return TypeResponse
*
*/
public static function handle(GSActor $gsactor, int $status = 200): TypeResponse
public static function handle(Actor $gsactor, int $status = 200): TypeResponse
{
$gsactor->getLocalUser(); // This throws exception if not a local user, which is intended
return new TypeResponse(data: GSActorToType::translate($gsactor), status: $status);