Fix avatar display issue in Pull Request tree view (#7851)

* Fix avatar display issue in Pull Request tree view

- Fix getAvatarWithEnterpriseFallback to prioritize GitHub avatars over Gravatar fallback
- Implement cache invalidation by including avatar URL hash in cache keys
- Ensure logged-in users see their actual GitHub profile avatars instead of random generated ones

Fixes #6914

* Revert package.json changes

* Clean up

---------

Co-authored-by: Alex Ross <[email protected]>

Author: wankun-tcj

src/common/uri.ts

@@ -205,7 +205,17 @@ export namespace DataUri {
 	const iconsFolder = 'userIcons';
 
 	function iconFilename(user: IAccount | ITeam): string {
-		return `${reviewerId(user)}.jpg`;
+		// Include avatarUrl hash to invalidate cache when URL changes
+		const baseId = reviewerId(user);
+		if (user.avatarUrl) {
+			// Create a simple hash of the URL to detect changes
+			const urlHash = user.avatarUrl.split('').reduce((a, b) => {
+				a = ((a << 5) - a) + b.charCodeAt(0);
+				return a & a;
+			}, 0);
+			return `${baseId}_${Math.abs(urlHash)}.jpg`;
+		}
+		return `${baseId}.jpg`;
 	}
 
 	function cacheLocation(context: vscode.ExtensionContext): vscode.Uri {
@@ -291,7 +301,6 @@ export namespace DataUri {
 		const startingCacheSize = cacheLogOrder.length;
 
 		const results = await Promise.all(users.map(async (user) => {
-
 			const imageSourceUrl = user.avatarUrl;
 			if (imageSourceUrl === undefined) {
 				return undefined;
@@ -311,6 +320,9 @@ export namespace DataUri {
 				cacheMiss = true;
 				const doFetch = async () => {
 					const response = await fetch(imageSourceUrl.toString());
+					if (!response.ok) {
+						throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+					}
 					const buffer = await response.arrayBuffer();
 					await writeAvatarToCache(context, user, new Uint8Array(buffer));
 					innerImageContents = Buffer.from(buffer);

src/github/utils.ts

@@ -653,10 +653,13 @@ export function parseAccount(
 		}
 
 		// In some places, Copilot comes in as a user, and in others as a bot
+
+		const finalAvatarUrl = githubRepository ? getAvatarWithEnterpriseFallback(avatarUrl, undefined, githubRepository.remote.isEnterprise) : avatarUrl;
+
 		return {
 			login: author.login,
 			url: COPILOT_ACCOUNTS[author.login]?.url ?? url,
-			avatarUrl: githubRepository ? getAvatarWithEnterpriseFallback(avatarUrl, undefined, githubRepository.remote.isEnterprise) : avatarUrl,
+			avatarUrl: finalAvatarUrl,
 			email: author.email ?? undefined,
 			id,
 			name: author.name ?? COPILOT_ACCOUNTS[author.login]?.name ?? undefined,
@@ -1637,8 +1640,21 @@ export function generateGravatarUrl(gravatarId: string | undefined, size: number
 }
 
 export function getAvatarWithEnterpriseFallback(avatarUrl: string, email: string | undefined, isEnterpriseRemote: boolean): string | undefined {
-	return !isEnterpriseRemote ? avatarUrl : (email ? generateGravatarUrl(
-		crypto.createHash('sha256').update(email?.trim()?.toLowerCase()).digest('hex')) : undefined);
+
+	// For non-enterprise, always use the provided avatarUrl
+	if (!isEnterpriseRemote) {
+		return avatarUrl;
+	}
+
+	// For enterprise, prefer GitHub avatarUrl if available, fallback to Gravatar only if needed
+	if (avatarUrl && avatarUrl.trim()) {
+		return avatarUrl;
+	}
+
+	// Only fallback to Gravatar if no avatarUrl is available and email is provided
+	const gravatarUrl = email ? generateGravatarUrl(
+		crypto.createHash('sha256').update(email.trim().toLowerCase()).digest('hex')) : undefined;
+	return gravatarUrl;
 }
 
 export function getPullsUrl(repo: GitHubRepository) {