Cover with integration tests the room avatar with emoji

Signed-off-by: Vitor Mattos <vitor@php.rio>

1 files changed, 8 insertions, 2 deletions

diff --git a/lib/Service/AvatarService.php b/lib/Service/AvatarService.php
index 0769a1ad0..b6a727dc4 100644
--- a/lib/Service/AvatarService.php
+++ b/lib/Service/AvatarService.php
@@ -180,10 +180,13 @@ class AvatarService {
 				}
 			}
 		}
-		return new InMemoryFile($token, $this->getAvatarPath($room, $darkTheme));
+		if ($this->emojiHelper->isValidSingleEmoji(mb_substr($room->getName(), 0, 1))) {
+			return new InMemoryFile($token, $this->getEmojiAvatar($room->getName(), $darkTheme));
+		}
+		return new InMemoryFile($token, file_get_contents($this->getAvatarPath($room, $darkTheme)));
 	}
 
-	protected function getEmojiAvatar(string $roomName, bool $darkTheme): string {
+	protected function getEmojiAvatar(string $roomName, bool $darkTheme = false): string {
 		return str_replace([
 			'{letter}',
 			'{fill}',
@@ -283,6 +286,9 @@ class AvatarService {
 			[$version] = explode('.', $avatarVersion);
 			return $version;
 		}
+		if ($this->emojiHelper->isValidSingleEmoji(mb_substr($room->getName(), 0, 1))) {
+			return substr(md5($this->getEmojiAvatar($room->getName())), 0, 8);
+		}
 		$avatarPath = $this->getAvatarPath($room);
 		return substr(md5($avatarPath), 0, 8);
 	}