X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=static%2Froutes.config.php;h=d1f11567a2a2932c91208cc11318b8345505f746;hb=aeb75c19a3576a33ce900cb2833c6323b49fd387;hp=b9b26786f5f983d78eb1282989c3dafb949517e8;hpb=c3554ac0f4dbcc4516ca3c9a9cd8c8fa9f9163ea;p=friendica.git

diff --git a/static/routes.config.php b/static/routes.config.php
index b9b26786f5..d1f11567a2 100644
--- a/static/routes.config.php
+++ b/static/routes.config.php
@@ -180,8 +180,9 @@ return [
 		'/addons/{addon}' => [Module\Admin\Addons\Details::class, [R::GET, R::POST]],
 
 
-		'/blocklist/contact' => [Module\Admin\Blocklist\Contact::class, [R::GET, R::POST]],
-		'/blocklist/server'  => [Module\Admin\Blocklist\Server::class,  [R::GET, R::POST]],
+		'/blocklist/contact'    => [Module\Admin\Blocklist\Contact::class,      [R::GET, R::POST]],
+		'/blocklist/server'     => [Module\Admin\Blocklist\Server\Index::class, [R::GET, R::POST]],
+		'/blocklist/server/add' => [Module\Admin\Blocklist\Server\Add::class,   [R::GET, R::POST]],
 
 		'/dbsync[/{action}[/{update:\d+}]]' => [Module\Admin\DBSync::class, [R::GET]],
 
@@ -236,11 +237,11 @@ return [
 		'/{id:\d+}/block'             => [Module\Contact::class,           [R::GET]],
 		'/{id:\d+}/conversations'     => [Module\Contact::class,           [R::GET]],
 		'/{id:\d+}/contacts[/{type}]' => [Module\Contact\Contacts::class,  [R::GET]],
-		'/{id:\d+}/drop'              => [Module\Contact::class,           [R::GET]],
 		'/{id:\d+}/ignore'            => [Module\Contact::class,           [R::GET]],
-		'/{id:\d+}/media'             => [Module\Contact::class,           [R::GET]],
+		'/{id:\d+}/media'             => [Module\Contact\Media::class,     [R::GET]],
 		'/{id:\d+}/poke'              => [Module\Contact\Poke::class,      [R::GET, R::POST]],
 		'/{id:\d+}/posts'             => [Module\Contact::class,           [R::GET]],
+		'/{id:\d+}/revoke'            => [Module\Contact\Revoke::class,    [R::GET, R::POST]],
 		'/{id:\d+}/update'            => [Module\Contact::class,           [R::GET]],
 		'/{id:\d+}/updateprofile'     => [Module\Contact::class,           [R::GET]],
 		'/archived'                   => [Module\Contact::class,           [R::GET]],
@@ -259,6 +260,8 @@ return [
 	'/dirfind'                  => [Module\Search\Directory::class, [R::GET]],
 	'/directory'                => [Module\Directory::class,        [R::GET]],
 
+	'/events/json'                => [Module\Events\Json::class,        [R::GET]],
+
 	'/feed'     => [
 		'/{nickname}'          => [Module\Feed::class, [R::GET]],
 		'/{nickname}/posts'    => [Module\Feed::class, [R::GET]],
@@ -371,9 +374,18 @@ return [
 	'/permission/tooltip/{type}/{id:\d+}' => [Module\PermissionTooltip::class, [R::GET]],
 
 	'/photo' => [
-		'/{name}'                     => [Module\Photo::class, [R::GET]],
-		'/{type}/{name}'              => [Module\Photo::class, [R::GET]],
-		'/{type}/{customsize}/{name}' => [Module\Photo::class, [R::GET]],
+		'/{name}'                                                  => [Module\Photo::class, [R::GET]],
+		'/{type}/{id:\d+}'                                         => [Module\Photo::class, [R::GET]],
+		// User Id Fallback, to remove after version 2021.12
+		'/{type}/{uid_ext:\d+\..*}'                                => [Module\Photo::class, [R::GET]],
+		'/{type}/{nickname_ext}'                                   => [Module\Photo::class, [R::GET]],
+		// Contact Id Fallback, to remove after version 2021.12
+		'/{type:contact|header}/{customsize:\d+}/{contact_id:\d+}' => [Module\Photo::class, [R::GET]],
+		'/{type:contact|header}/{customsize:\d+}/{guid}'           => [Module\Photo::class, [R::GET]],
+		'/{type}/{customsize:\d+}/{id:\d+}'                        => [Module\Photo::class, [R::GET]],
+		// User Id Fallback, to remove after version 2021.12
+		'/{type}/{customsize:\d+}/{uid_ext:\d+\..*}'               => [Module\Photo::class, [R::GET]],
+		'/{type}/{customsize:\d+}/{nickname_ext}'                  => [Module\Photo::class, [R::GET]],
 	],
 
 	'/pretheme'          => [Module\ThemeDetails::class, [R::GET]],
@@ -398,8 +410,8 @@ return [
 	],
 
 	'/receive' => [
-		'/public'       => [Module\Diaspora\Receive::class, [R::POST]],
-		'/users/{guid}' => [Module\Diaspora\Receive::class, [R::POST]],
+		'/{type:public}'       => [Module\Diaspora\Receive::class, [        R::POST]],
+		'/{type:users}/{guid}' => [Module\Diaspora\Receive::class, [        R::POST]],
 	],
 
 	'/settings' => [