From 754135743e6a07ed138dd5b9863742caf8a98f4c Mon Sep 17 00:00:00 2001 From: Diogo Peralta Cordeiro Date: Tue, 4 Jan 2022 21:52:24 +0000 Subject: [PATCH] [COMPONENT][Subscription] Move respective routes to component --- .../Subscription/Controller/Subscribers.php | 12 ++--- .../Subscription/Controller/Subscriptions.php | 12 ++--- components/Subscription/Subscription.php | 13 +++++ src/Routes/Subscribers.php | 49 ------------------- src/Routes/Subscriptions.php | 49 ------------------- 5 files changed, 25 insertions(+), 110 deletions(-) delete mode 100644 src/Routes/Subscribers.php delete mode 100644 src/Routes/Subscriptions.php diff --git a/components/Subscription/Controller/Subscribers.php b/components/Subscription/Controller/Subscribers.php index 2fda4ec90a..137cb1731c 100644 --- a/components/Subscription/Controller/Subscribers.php +++ b/components/Subscription/Controller/Subscribers.php @@ -49,12 +49,12 @@ class Subscribers extends CircleController return $this->handleActorByNickname( $nickname, fn ($actor) => [ - '_template' => 'collection/actors.html.twig', - 'title' => _m('Subscribers'), - 'empty_message' => _m('No subscribers'), - 'sort_options' => [], - 'page' => $this->int('page') ?? 1, - 'actors' => $actor->getSubscribers(), + '_template' => 'collection/actors.html.twig', + 'title' => _m('Subscribers'), + 'empty_message' => _m('No subscribers.'), + 'sort_form_fields' => [], + 'page' => $this->int('page') ?? 1, + 'actors' => $actor->getSubscribers(), ], ); } diff --git a/components/Subscription/Controller/Subscriptions.php b/components/Subscription/Controller/Subscriptions.php index 4764c83bec..dbf3d691fc 100644 --- a/components/Subscription/Controller/Subscriptions.php +++ b/components/Subscription/Controller/Subscriptions.php @@ -49,12 +49,12 @@ class Subscriptions extends CircleController return $this->handleActorByNickname( $nickname, fn ($actor) => [ - '_template' => 'collection/actors.html.twig', - 'title' => _m('Subscribers'), - 'empty_message' => _m('No subscribers'), - 'sort_options' => [], - 'page' => $this->int('page') ?? 1, - 'actors' => $actor->getSubscribers(), + '_template' => 'collection/actors.html.twig', + 'title' => _m('Subscriptions'), + 'empty_message' => _m('Haven\'t subscribed anyone.'), + 'sort_form_fields' => [], + 'page' => $this->int('page') ?? 1, + 'actors' => $actor->getSubscribers(), ], ); } diff --git a/components/Subscription/Subscription.php b/components/Subscription/Subscription.php index 98a78f0375..9945627856 100644 --- a/components/Subscription/Subscription.php +++ b/components/Subscription/Subscription.php @@ -27,13 +27,26 @@ use App\Core\DB\DB; use App\Core\Event; use function App\Core\I18n\_m; use App\Core\Modules\Component; +use App\Core\Router\RouteLoader; use App\Entity\Activity; use App\Entity\Actor; use App\Entity\LocalUser; use App\Util\Exception\ServerException; +use App\Util\Nickname; +use Component\Subscription\Controller\Subscribers; +use Component\Subscription\Controller\Subscriptions; class Subscription extends Component { + public function onAddRoute(RouteLoader $r): bool + { + $r->connect(id: 'actor_subscriptions_id', uri_path: '/actor/{id<\d+>}/subscriptions', target: [Subscriptions::class, 'subscriptionsByActorId']); + $r->connect(id: 'actor_subscriptions_nickname', uri_path: '/@{nickname<' . Nickname::DISPLAY_FMT . '>}/subscriptions', target: [Subscriptions::class, 'subscriptionsByActorNickname']); + $r->connect(id: 'actor_subscribers_id', uri_path: '/actor/{id<\d+>}/subscribers', target: [Subscribers::class, 'subscribersByActorId']); + $r->connect(id: 'actor_subscribers_nickname', uri_path: '/@{nickname<' . Nickname::DISPLAY_FMT . '>}/subscribers', target: [Subscribers::class, 'subscribersByActorNickname']); + return Event::next; + } + /** * Persists a new Subscription Entity from Subscriber to Subject (Actor being subscribed) and Activity * diff --git a/src/Routes/Subscribers.php b/src/Routes/Subscribers.php deleted file mode 100644 index dc1c718137..0000000000 --- a/src/Routes/Subscribers.php +++ /dev/null @@ -1,49 +0,0 @@ -. - -// }}} - -/** - * Define social's Actor's subscribers routes - * - * @package GNUsocial - * @category Router - * - * @author Diogo Cordeiro - * @copyright 2021 Free Software Foundation, Inc http://www.fsf.org - * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later - */ - -namespace App\Routes; - -use App\Core\Router\RouteLoader; -use App\Util\Nickname; -use Component\Subscription\Controller as C; - -abstract class Subscribers -{ - public const LOAD_ORDER = 31; - public static function load(RouteLoader $r): void - { - $r->connect(id: 'actor_subscribers_id', uri_path: '/actor/{id<\d+>}/subscribers', target: [C\Subscribers::class, 'subscribersByActorId']); - $r->connect(id: 'actor_subscribers_nickname', uri_path: '/@{nickname<' . Nickname::DISPLAY_FMT . '>}/subscribers', target: [C\Subscribers::class, 'subscribersByActorNickname']); - } -} diff --git a/src/Routes/Subscriptions.php b/src/Routes/Subscriptions.php deleted file mode 100644 index 030489f1c8..0000000000 --- a/src/Routes/Subscriptions.php +++ /dev/null @@ -1,49 +0,0 @@ -. - -// }}} - -/** - * Define social's Actor's subscriptions routes - * - * @package GNUsocial - * @category Router - * - * @author Diogo Cordeiro - * @copyright 2021 Free Software Foundation, Inc http://www.fsf.org - * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later - */ - -namespace App\Routes; - -use App\Core\Router\RouteLoader; -use App\Util\Nickname; -use Component\Subscription\Controller as C; - -abstract class Subscriptions -{ - public const LOAD_ORDER = 32; - public static function load(RouteLoader $r): void - { - $r->connect(id: 'actor_subscriptions_id', uri_path: '/actor/{id<\d+>}/subscriptions', target: [C\Subscriptions::class, 'subscriptionsByActorId']); - $r->connect(id: 'actor_subscriptions_nickname', uri_path: '/@{nickname<' . Nickname::DISPLAY_FMT . '>}/subscriptions', target: [C\Subscriptions::class, 'subscriptionsByActorNickname']); - } -}