From 88a137fb15955aec073fe54345f4a119ee9ee2f4 Mon Sep 17 00:00:00 2001
From: Hugo Sales <hugo@hsal.es>
Date: Tue, 21 Dec 2021 12:10:51 +0000
Subject: [PATCH] [ROUTES] Rename actor routes and add route for groups

---
 src/Routes/Actor.php         | 6 ++++--
 src/Routes/Subscribers.php   | 4 ++--
 src/Routes/Subscriptions.php | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Routes/Actor.php b/src/Routes/Actor.php
index cad07bedb2..b9b7a37312 100644
--- a/src/Routes/Actor.php
+++ b/src/Routes/Actor.php
@@ -45,7 +45,9 @@ abstract class Actor
 
     public static function load(RouteLoader $r): void
     {
-        $r->connect(id: 'actor_view_id', uri_path: '/actor/{id<\d+>}', target: [C\Actor::class, 'ActorShowId']);
-        $r->connect(id: 'actor_view_nickname', uri_path: '/@{nickname<' . Nickname::DISPLAY_FMT . '>}', target: [C\Actor::class, 'ActorShowNickname'], options: ['is_system_path' => false]);
+        $r->connect(id: 'actor_view_id', uri_path: '/actor/{id<\d+>}', target: [C\Actor::class, 'actorViewId']);
+        $r->connect(id: 'actor_view_nickname', uri_path: '/@{nickname<' . Nickname::DISPLAY_FMT . '>}', target: [C\Actor::class, 'actorViewId'], options: ['is_system_path' => false]);
+        $r->connect(id: 'group_actor_view_id', uri_path: '/group/{id<\d+>}', target: [C\Actor::class, 'groupViewId']);
+        $r->connect(id: 'group_actor_view_nickname', uri_path: '/!{nickname<' . Nickname::DISPLAY_FMT . '>}', target: [C\Actor::class, 'groupViewNickname'], options: ['is_system_path' => false]);
     }
 }
diff --git a/src/Routes/Subscribers.php b/src/Routes/Subscribers.php
index 6231e82de0..1db8f7e9f6 100644
--- a/src/Routes/Subscribers.php
+++ b/src/Routes/Subscribers.php
@@ -43,7 +43,7 @@ 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']);
+        $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
index 81ce493c24..f91243283b 100644
--- a/src/Routes/Subscriptions.php
+++ b/src/Routes/Subscriptions.php
@@ -43,7 +43,7 @@ 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']);
+        $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']);
     }
 }