From 07691de7b5f19302d022f6c01f9cc9135626b623 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Sun, 17 Aug 2025 22:42:11 +0100
Subject: [PATCH] Fix user icons for new accounts

---
 src/app/browser/main/sidebar.tsx | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/app/browser/main/sidebar.tsx b/src/app/browser/main/sidebar.tsx
index 2156ca8..fc6880f 100644
--- a/src/app/browser/main/sidebar.tsx
+++ b/src/app/browser/main/sidebar.tsx
@@ -68,15 +68,24 @@ function User(props: {
         ipc.showUserMenu(props.user.user, props.user.nso?.nsoAccount.user);
     }, [ipc, props.user.user, props.user.nso?.nsoAccount.user]);
 
-    const miiImageSource: ImageURISource = props.user.user.mii ? {
-        uri: 'https://' + props.user.user.mii.imageOrigin + '/2.0.0/mii_images/' +
+    const mii_url = new URL(props.user.user.iconUri ?? (props.user.user.mii ?
+        'https://' + props.user.user.mii.imageOrigin + '/2.0.0/mii_images/' +
             props.user.user.mii.id + '/' +
-            props.user.user.mii.etag + '.png' +
-            '?type=face&width=140&bgColor=DFDFDFFF',
-        width: 32,
-        height: 32,
-    } : {
-        uri: 'https://cdn.accounts.nintendo.com/account/images/common/defaults/mii.png',
+            props.user.user.mii.etag + '.png' :
+        'https://cdn.accounts.nintendo.com/account/images/common/defaults/mii.png'));
+
+    if (mii_url.origin === 'https://cdn-mii.accounts.nintendo.com' ||
+        props.user.user.mii && mii_url.hostname === props.user.user.mii.imageOrigin
+    ) {
+        mii_url.searchParams.append('type', 'face');
+        mii_url.searchParams.append('width', '140');
+        mii_url.searchParams.append('bgColor', 'DFDFDFFF');
+    } else {
+        mii_url.href = 'https://cdn.accounts.nintendo.com/account/images/common/defaults/mii.png';
+    }
+
+    const miiImageSource: ImageURISource = {
+        uri: mii_url.toString(),
         width: 32,
         height: 32,
     };