fix(core): Return X-NC-IsCustomAvatar for guest avatars too

Signed-off-by: provokateurin <kate@provokateurin.de>

diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php
index a13c722a44532c0724b044f363fc9b7b75fd4888..4bb32c04c972d158aee04bed2e7d40841217851f 100644 (file)
--- a/core/Controller/AvatarController.php
+++ b/core/Controller/AvatarController.php
@@ -80,9 +80,10 @@ class AvatarController extends Controller {
         * @param string $userId ID of the user
         * @param int $size Size of the avatar
         * @param bool $guestFallback Fallback to guest avatar if not found
-        * @return FileDisplayResponse<Http::STATUS_OK|Http::STATUS_CREATED, array{Content-Type: string, X-NC-IsCustomAvatar?: int}>|JSONResponse<Http::STATUS_NOT_FOUND, array<empty>, array{}>|Response<Http::STATUS_INTERNAL_SERVER_ERROR, array{}>
+        * @return FileDisplayResponse<Http::STATUS_OK|Http::STATUS_CREATED, array{Content-Type: string, X-NC-IsCustomAvatar: int}>|JSONResponse<Http::STATUS_NOT_FOUND, array<empty>, array{}>|Response<Http::STATUS_INTERNAL_SERVER_ERROR, array{}>
         *
         * 200: Avatar returned
+        * 201: Avatar returned
         * 404: Avatar not found
         */
        public function getAvatarDark(string $userId, int $size, bool $guestFallback = false) {
@@ -130,9 +131,10 @@ class AvatarController extends Controller {
         * @param string $userId ID of the user
         * @param int $size Size of the avatar
         * @param bool $guestFallback Fallback to guest avatar if not found
-        * @return FileDisplayResponse<Http::STATUS_OK|Http::STATUS_CREATED, array{Content-Type: string, X-NC-IsCustomAvatar?: int}>|JSONResponse<Http::STATUS_NOT_FOUND, array<empty>, array{}>|Response<Http::STATUS_INTERNAL_SERVER_ERROR, array{}>
+        * @return FileDisplayResponse<Http::STATUS_OK|Http::STATUS_CREATED, array{Content-Type: string, X-NC-IsCustomAvatar: int}>|JSONResponse<Http::STATUS_NOT_FOUND, array<empty>, array{}>|Response<Http::STATUS_INTERNAL_SERVER_ERROR, array{}>
         *
         * 200: Avatar returned
+        * 201: Avatar returned
         * 404: Avatar not found
         */
        public function getAvatar(string $userId, int $size, bool $guestFallback = false) {

diff --git a/core/Controller/GuestAvatarController.php b/core/Controller/GuestAvatarController.php
index 3270a1f7f5aae6d892181699893ca2ddaa0c3a75..00745d8c3e2d18b8abf238b38e56446810e9a908 100644 (file)
--- a/core/Controller/GuestAvatarController.php
+++ b/core/Controller/GuestAvatarController.php
@@ -56,7 +56,7 @@ class GuestAvatarController extends Controller {
         * @param string $guestName The guest name, e.g. "Albert"
         * @param string $size The desired avatar size, e.g. 64 for 64x64px
         * @param bool|null $darkTheme Return dark avatar
-        * @return FileDisplayResponse<Http::STATUS_OK|Http::STATUS_CREATED, array{Content-Type: string}>|Response<Http::STATUS_INTERNAL_SERVER_ERROR, array{}>
+        * @return FileDisplayResponse<Http::STATUS_OK|Http::STATUS_CREATED, array{Content-Type: string, X-NC-IsCustomAvatar: int}>|Response<Http::STATUS_INTERNAL_SERVER_ERROR, array{}>
         *
         * 200: Custom avatar returned
         * 201: Avatar returned
@@ -84,7 +84,7 @@ class GuestAvatarController extends Controller {
                        $resp = new FileDisplayResponse(
                                $avatarFile,
                                $avatar->isCustomAvatar() ? Http::STATUS_OK : Http::STATUS_CREATED,
-                               ['Content-Type' => $avatarFile->getMimeType()]
+                               ['Content-Type' => $avatarFile->getMimeType(), 'X-NC-IsCustomAvatar' => (int)$avatar->isCustomAvatar()]
                        );
                } catch (\Exception $e) {
                        $this->logger->error('error while creating guest avatar', [
@@ -108,7 +108,7 @@ class GuestAvatarController extends Controller {
         *
         * @param string $guestName The guest name, e.g. "Albert"
         * @param string $size The desired avatar size, e.g. 64 for 64x64px
-        * @return FileDisplayResponse<Http::STATUS_OK|Http::STATUS_CREATED, array{Content-Type: string}>|Response<Http::STATUS_INTERNAL_SERVER_ERROR, array{}>
+        * @return FileDisplayResponse<Http::STATUS_OK|Http::STATUS_CREATED, array{Content-Type: string, X-NC-IsCustomAvatar: int}>|Response<Http::STATUS_INTERNAL_SERVER_ERROR, array{}>
         *
         * 200: Custom avatar returned
         * 201: Avatar returned