From f1f2f5ca985bd038d7490ae7be6e5839e3cee790 Mon Sep 17 00:00:00 2001
From: skjnldsv <skjnldsv@protonmail.com>
Date: Thu, 6 Jun 2024 19:36:19 +0200
Subject: fix(files_sharing): dark avatar support

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
---
 core/Controller/AvatarController.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'core')

diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php
index e2aba26b8b7..a13c722a445 100644
--- a/core/Controller/AvatarController.php
+++ b/core/Controller/AvatarController.php
@@ -37,14 +37,13 @@ use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataDisplayResponse;
 use OCP\AppFramework\Http\FileDisplayResponse;
 use OCP\AppFramework\Http\JSONResponse;
-use OCP\AppFramework\Http\RedirectResponse;
+use OCP\AppFramework\Http\Response;
 use OCP\Files\File;
 use OCP\Files\IRootFolder;
 use OCP\IAvatarManager;
 use OCP\ICache;
 use OCP\IL10N;
 use OCP\IRequest;
-use OCP\IURLGenerator;
 use OCP\IUserManager;
 use Psr\Log\LoggerInterface;
 
@@ -65,7 +64,6 @@ class AvatarController extends Controller {
 		protected LoggerInterface $logger,
 		protected ?string $userId,
 		protected TimeFactory $timeFactory,
-		protected IURLGenerator $urlGenerator,
 		protected GuestAvatarController $guestAvatarController,
 	) {
 		parent::__construct($appName, $request);
@@ -81,12 +79,13 @@ class AvatarController extends Controller {
 	 *
 	 * @param string $userId ID of the user
 	 * @param int $size Size of the avatar
-	 * @return FileDisplayResponse<Http::STATUS_OK, array{Content-Type: string, X-NC-IsCustomAvatar: int}>|JSONResponse<Http::STATUS_NOT_FOUND, array<empty>, array{}>
+	 * @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{}>
 	 *
 	 * 200: Avatar returned
 	 * 404: Avatar not found
 	 */
-	public function getAvatarDark(string $userId, int $size) {
+	public function getAvatarDark(string $userId, int $size, bool $guestFallback = false) {
 		if ($size <= 64) {
 			if ($size !== 64) {
 				$this->logger->debug('Avatar requested in deprecated size ' . $size);
@@ -130,12 +129,13 @@ class AvatarController extends Controller {
 	 *
 	 * @param string $userId ID of the user
 	 * @param int $size Size of the avatar
-	 * @return FileDisplayResponse<Http::STATUS_OK, array{Content-Type: string, X-NC-IsCustomAvatar: int}>|JSONResponse<Http::STATUS_NOT_FOUND, array<empty>, array{}>
+	 * @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{}>
 	 *
 	 * 200: Avatar returned
 	 * 404: Avatar not found
 	 */
-	public function getAvatar(string $userId, int $size) {
+	public function getAvatar(string $userId, int $size, bool $guestFallback = false) {
 		if ($size <= 64) {
 			if ($size !== 64) {
 				$this->logger->debug('Avatar requested in deprecated size ' . $size);
-- 
cgit v1.2.3