Update avatars on update

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
nextcloud · Sep 8, 2022 · 35813f1 · 35813f1
1 parent f4df52a
commit 35813f1
Show file tree

Hide file tree

Showing 11 changed files with 11,652 additions and 24 deletions.
diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php
@@ -131,7 +131,7 @@ public function getAvatarDark(string $userId, int $size) {
 	 *
 	 * @return JSONResponse|FileDisplayResponse
 	 */
-	public function getAvatar(string $userId, int $size, bool $darkTheme = false) {
+	public function getAvatar(string $userId, int $size) {
 		if ($size <= 64) {
 			if ($size !== 64) {
 				$this->logger->debug('Avatar requested in deprecated size ' . $size);

diff --git a/core/Controller/GuestAvatarController.php b/core/Controller/GuestAvatarController.php
@@ -60,9 +60,9 @@ public function __construct(
 	 * @param string $size The desired avatar size, e.g. 64 for 64x64px
 	 * @return FileDisplayResponse|Http\Response
 	 */
-	public function getAvatar(string $guestName, string $size, ?bool $dark = false) {
+	public function getAvatar(string $guestName, string $size, ?bool $darkTheme = false) {
 		$size = (int) $size;
-		$dark = $dark === null ? false : $dark;
+		$darkTheme = $darkTheme ?? false;
 
 		if ($size <= 64) {
 			if ($size !== 64) {
@@ -78,7 +78,7 @@ public function getAvatar(string $guestName, string $size, ?bool $dark = false)
 
 		try {
 			$avatar = $this->avatarManager->getGuestAvatar($guestName);
-			$avatarFile = $avatar->getFile($size);
+			$avatarFile = $avatar->getFile($size, $darkTheme);
 
 			$resp = new FileDisplayResponse(
 				$avatarFile,