set default avatar not respecting setting

RocketChat · Dec 13, 2024 · 2c039eb · 2c039eb
1 parent e080c0f
commit 2c039eb
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/apps/meteor/server/routes/avatar/user.ts b/apps/meteor/server/routes/avatar/user.ts
@@ -40,7 +40,20 @@ export const userAvatarByUsername = async function (request: IncomingMessage, re
 
 	// if request starts with @ always return the svg letters
 	if (requestUsername[0] === '@') {
-		serveSvgAvatarInRequestedFormat({ nameOrUsername: requestUsername.slice(1), req, res });
+		const usernameWithoutAt = requestUsername.slice(1);
+		if (settings.get('UI_Use_Name_Avatar')) {
+			const user = await Users.findOneByUsernameIgnoringCase(usernameWithoutAt, {
+				projection: {
+					name: 1,
+				},
+			});
+
+			if (user?.name) {
+				serveSvgAvatarInRequestedFormat({ nameOrUsername: user.name, req, res, useAllInitials: true });
+				return;
+			}
+		}
+		serveSvgAvatarInRequestedFormat({ nameOrUsername: usernameWithoutAt, req, res });
 		return;
 	}