Add getter for generic avatars to IAvatarManager

Signed-off-by: Daniel Calviño Sánchez <[email protected]>

lib/private/Avatar/AvatarManager.php

@@ -152,4 +152,16 @@ public function deleteUserAvatar(string $userId): void {
 	public function getGuestAvatar(string $name): IAvatar {
 		return new GuestAvatar($name, $this->logger);
 	}
+
+	public function getGenericAvatar(string $type, string $id): IAvatar {
+		if ($type === 'user') {
+			return $this->getAvatar($id);
+		}
+
+		if ($type === 'guest') {
+			return $this->getGuestAvatar($id);
+		}
+
+		throw new \InvalidArgumentException('Unknown avatar type: ' . $type);
+	}
 }

lib/public/IAvatarManager.php

@@ -56,4 +56,17 @@ public function getAvatar(string $user) : IAvatar;
 	 * @since 16.0.0
 	 */
 	public function getGuestAvatar(string $name): IAvatar;
+
+	/**
+	 * Returns an avatar instance of the given type.
+	 *
+	 * @param string $type the type of the avatar
+	 * @param string $id the identifier for the avatar of the given type
+	 * @return IAvatar
+	 * @throws \InvalidArgumentException if the type is not known or the id is
+	 *         not valid
+	 * @throws \Exception if getting the avatar failed
+	 * @since 21.0.0
+	 */
+	public function getGenericAvatar(string $type, string $id): IAvatar;
 }