Add missing Module\Photo route for contact avatar

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index 806ad449c5691feaff64f4e272a1e9e55b84e4f0..9a59d967b06e31941f86643748d63e0a2fbbc8c7 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -97,6 +97,11 @@ class Photo extends BaseModule
                                $uid = intval(pathinfo($parameters['uid_ext'], PATHINFO_FILENAME));
                        }
 
+                       // Please refactor this for the love of everything that's good
+                       if (!empty($parameters['contact_id'])) {
+                               $uid = $parameters['contact_id'];
+                       }
+
                        $photo = self::getAvatar($uid, $parameters['type'], $customsize ?: Proxy::PIXEL_SMALL);
                } else {
                        $photoid = pathinfo($parameters['name'], PATHINFO_FILENAME);

diff --git a/static/routes.config.php b/static/routes.config.php
index 9dbd2a615b42b1442152e0aa7bc997264a2d4a14..72a71f2c1bc943cd80a37bcacaa7bfcf5895d910 100644 (file)
--- a/static/routes.config.php
+++ b/static/routes.config.php
@@ -371,13 +371,14 @@ return [
        '/permission/tooltip/{type}/{id:\d+}' => [Module\PermissionTooltip::class, [R::GET]],
 
        '/photo' => [
-               '/{name}'                             => [Module\Photo::class, [R::GET]],
+               '/{name}'                                => [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]],
+               '/{type}/{uid_ext:\d+\..*}'              => [Module\Photo::class, [R::GET]],
+               '/{type}/{nickname_ext}'                 => [Module\Photo::class, [R::GET]],
+               '/{type}/{customsize}/{contact_id:\d+}'  => [Module\Photo::class, [R::GET]],
                // User Id Fallback, to remove after version 2021.12
-               '/{type}/{customsize}/{uid_ext:\d+\..*}'  => [Module\Photo::class, [R::GET]],
-               '/{type}/{customsize}/{nickname_ext}' => [Module\Photo::class, [R::GET]],
+               '/{type}/{customsize}/{uid_ext:\d+\..*}' => [Module\Photo::class, [R::GET]],
+               '/{type}/{customsize}/{nickname_ext}'    => [Module\Photo::class, [R::GET]],
        ],
 
        '/pretheme'          => [Module\ThemeDetails::class, [R::GET]],