Add missing Module\Photo route for contact avatar

This commit is contained in:
Hypolite Petovan 2021-10-03 07:48:46 -04:00
parent f426a5bd98
commit 5112dd06f2
2 changed files with 11 additions and 5 deletions

View File

@ -97,6 +97,11 @@ class Photo extends BaseModule
$uid = intval(pathinfo($parameters['uid_ext'], PATHINFO_FILENAME)); $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); $photo = self::getAvatar($uid, $parameters['type'], $customsize ?: Proxy::PIXEL_SMALL);
} else { } else {
$photoid = pathinfo($parameters['name'], PATHINFO_FILENAME); $photoid = pathinfo($parameters['name'], PATHINFO_FILENAME);

View File

@ -375,6 +375,7 @@ return [
// User Id Fallback, to remove after version 2021.12 // User Id Fallback, to remove after version 2021.12
'/{type}/{uid_ext:\d+\..*}' => [Module\Photo::class, [R::GET]], '/{type}/{uid_ext:\d+\..*}' => [Module\Photo::class, [R::GET]],
'/{type}/{nickname_ext}' => [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 // User Id Fallback, to remove after version 2021.12
'/{type}/{customsize}/{uid_ext:\d+\..*}' => [Module\Photo::class, [R::GET]], '/{type}/{customsize}/{uid_ext:\d+\..*}' => [Module\Photo::class, [R::GET]],
'/{type}/{customsize}/{nickname_ext}' => [Module\Photo::class, [R::GET]], '/{type}/{customsize}/{nickname_ext}' => [Module\Photo::class, [R::GET]],