Merge pull request #9146 from tobiasd/2020.09-CHANGELOG

[friendica.git] / static / routes.config.php

diff --git a/static/routes.config.php b/static/routes.config.php
index 8387366b3dcb8513797066b773e62e586efa99fb..6f485000636550b198a6ed0f6cc1294b865bd19e 100644 (file)
--- a/static/routes.config.php
+++ b/static/routes.config.php
@@ -30,6 +30,14 @@
 use Friendica\App\Router as R;
 use Friendica\Module;
 
+$profileRoutes = [
+       ''                                         => [Module\Profile\Index::class,    [R::GET]],
+       '/profile'                                 => [Module\Profile\Profile::class,  [R::GET]],
+       '/contacts/common'                         => [Module\Profile\Common::class,   [R::GET]],
+       '/contacts[/{type}]'                       => [Module\Profile\Contacts::class, [R::GET]],
+       '/status[/{category}[/{date1}[/{date2}]]]' => [Module\Profile\Status::class,   [R::GET]],
+];
+
 return [
        '/' => [Module\Home::class, [R::GET]],
 
@@ -48,12 +56,13 @@ return [
 
        '/api' => [
                '/v1' => [
-                       '/custom_emojis'                     => [Module\Api\Mastodon\CustomEmojis::class,   [R::GET         ]],
-                       '/directory'                         => [Module\Api\Mastodon\Directory::class,      [R::GET         ]],
-                       '/follow_requests'                   => [Module\Api\Mastodon\FollowRequests::class, [R::GET         ]],
-                       '/follow_requests/{id:\d+}/{action}' => [Module\Api\Mastodon\FollowRequests::class, [        R::POST]],
-                       '/instance'                          => [Module\Api\Mastodon\Instance::class,       [R::GET         ]],
-                       '/instance/peers'                    => [Module\Api\Mastodon\Instance\Peers::class, [R::GET         ]],
+                       '/custom_emojis'                     => [Module\Api\Mastodon\CustomEmojis::class,             [R::GET         ]],
+                       '/directory'                         => [Module\Api\Mastodon\Directory::class,                [R::GET         ]],
+                       '/follow_requests'                   => [Module\Api\Mastodon\FollowRequests::class,           [R::GET         ]],
+                       '/follow_requests/{id:\d+}/{action}' => [Module\Api\Mastodon\FollowRequests::class,           [        R::POST]],
+                       '/instance'                          => [Module\Api\Mastodon\Instance::class,                 [R::GET         ]],
+                       '/instance/peers'                    => [Module\Api\Mastodon\Instance\Peers::class,           [R::GET         ]],
+                       '/timelines/public'                  => [Module\Api\Mastodon\Timelines\PublicTimeline::class, [R::GET         ]],
                ],
                '/friendica' => [
                        '/profile/show'                      => [Module\Api\Friendica\Profile\Show::class , [R::GET         ]],
@@ -75,9 +84,7 @@ return [
                '/blocklist/contact' => [Module\Admin\Blocklist\Contact::class, [R::GET, R::POST]],
                '/blocklist/server'  => [Module\Admin\Blocklist\Server::class,  [R::GET, R::POST]],
 
-               '/dbsync[/check]'           => [Module\Admin\DBSync::class, [R::GET]],
-               '/dbsync/{update:\d+}'      => [Module\Admin\DBSync::class, [R::GET]],
-               '/dbsync/mark/{update:\d+}' => [Module\Admin\DBSync::class, [R::GET]],
+               '/dbsync[/{action}[/{update:\d+}]]' => [Module\Admin\DBSync::class, [R::GET]],
 
                '/features'   => [Module\Admin\Features::class,   [R::GET, R::POST]],
                '/federation' => [Module\Admin\Federation::class, [R::GET]],
@@ -90,7 +97,7 @@ return [
 
                '/phpinfo' => [Module\Admin\PhpInfo::class, [R::GET]],
 
-               '/queue[/deferred]' => [Module\Admin\Queue::class, [R::GET]],
+               '/queue[/{status}]' => [Module\Admin\Queue::class, [R::GET]],
 
                '/site' => [Module\Admin\Site::class, [R::GET, R::POST]],
 
@@ -251,13 +258,9 @@ return [
        '/pretheme'          => [Module\ThemeDetails::class, [R::GET]],
        '/probe'             => [Module\Debug\Probe::class,  [R::GET]],
 
-       '/profile' => [
-               '/{nickname}'                                         => [Module\Profile\Index::class,    [R::GET]],
-               '/{nickname}/profile'                                 => [Module\Profile\Profile::class,  [R::GET]],
-               '/{nickname}/contacts/common'                         => [Module\Profile\Common::class,   [R::GET]],
-               '/{nickname}/contacts[/{type}]'                       => [Module\Profile\Contacts::class, [R::GET]],
-               '/{nickname}/status[/{category}[/{date1}[/{date2}]]]' => [Module\Profile\Status::class,   [R::GET]],
-       ],
+       '/profile/{nickname}' => $profileRoutes,
+       '/u/{nickname}'       => $profileRoutes,
+       '/~{nickname}'        => $profileRoutes,
 
        '/proxy' => [
                '[/]'                  => [Module\Proxy::class, [R::GET]],