Remove photo user id fallback from 2021

- Remove deprecated /photos/{nickname} fallback routes
- The contact id fallback is a lie, there's no replacement feature

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index 1bac70cdfd560064623d00cdb2d6aa8bc1e4a350..6bf81ac7cb2703c6402e6771cee4687d67f848c6 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -100,7 +100,6 @@ class Photo extends BaseApi
                                $id = $account['id'];
                        }
 
-                       // Contact Id Fallback, to remove after version 2021.12
                        if (isset($this->parameters['contact_id'])) {
                                $id = intval($this->parameters['contact_id']);
                        }
@@ -115,12 +114,6 @@ class Photo extends BaseApi
                                $id = $user['uid'];
                        }
 
-                       // User Id Fallback, to remove after version 2021.12
-                       if (!empty($this->parameters['uid_ext'])) {
-                               $id = intval(pathinfo($this->parameters['uid_ext'], PATHINFO_FILENAME));
-                       }
-
-                       // Please refactor this for the love of everything that's good
                        if (isset($this->parameters['id'])) {
                                $id = $this->parameters['id'];
                        }

diff --git a/static/routes.config.php b/static/routes.config.php
index 67ffec8e2b0968bf1fccaaaf3aaeda0647f7ea32..146255adc6d20959b9f759d09a01795b1d334182 100644 (file)
--- a/static/routes.config.php
+++ b/static/routes.config.php
@@ -575,22 +575,13 @@ return [
                '/{name}'                                                  => [Module\Photo::class, [R::GET]],
                '/{type}/{id:\d+}'                                         => [Module\Photo::class, [R::GET]],
                '/{type:contact|header}/{guid}'                            => [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]],
        ],
 
-       // Kept for backwards-compatibility
-       // @TODO remove by version 2023.12
-       '/photos/{nickname}' => [Module\Profile\Photos::class, [R::GET]],
-
        '/ping'              => [Module\Notifications\Ping::class, [R::GET]],
 
        '/post' => [