From a92ab7774792c916946b99f346d5a0cc8a5bb173 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 28 Feb 2020 10:44:15 +0100 Subject: [PATCH] Also cache avatars when it's not allowed Signed-off-by: Joas Schilling --- core/Controller/AvatarController.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php index 7ec338467c..5ecdc91db2 100644 --- a/core/Controller/AvatarController.php +++ b/core/Controller/AvatarController.php @@ -134,13 +134,15 @@ class AvatarController extends Controller { if ($scope !== IAccountManager::VISIBILITY_PUBLIC && $this->userId === null) { // Public avatar access is not allowed - return new JSONResponse([], Http::STATUS_NOT_FOUND); + $response = new JSONResponse([], Http::STATUS_NOT_FOUND); + $response->cacheFor(1800); + return $response; } try { $avatar = $this->avatarManager->getAvatar($userId); $avatarFile = $avatar->getFile($size); - $resp = new FileDisplayResponse( + $response = new FileDisplayResponse( $avatarFile, $avatar->isCustomAvatar() ? Http::STATUS_OK : Http::STATUS_CREATED, ['Content-Type' => $avatarFile->getMimeType()] @@ -150,8 +152,8 @@ class AvatarController extends Controller { } // Cache for 30 minutes - $resp->cacheFor(1800); - return $resp; + $response->cacheFor(1800); + return $response; } /**