fix display name history id

Author: blarfoon

apps/desktop/packages/mainWindow/src/pages/Settings/Accounts.tsx

@@ -226,11 +226,11 @@ const Accounts = () => {
       ? globalStore.gdlAccount.data?.value
       : undefined
 
-  const userId = createMemo(() => validGDLUser()?.id)
+  const friendCode = createMemo(() => validGDLUser()?.friendCode)
 
   const nicknameHistoryQuery = rspc.createQuery(() => ({
-    queryKey: ["account.getNicknameHistory", userId() ?? 0],
-    enabled: !!userId()
+    queryKey: ["account.getNicknameHistory", friendCode() ?? ""],
+    enabled: !!friendCode()
   }))
 
   const invalidGDLUser = () => globalStore.gdlAccount.data?.status === "invalid"

crates/carbon_app/src/api/account.rs

@@ -165,9 +165,9 @@ pub(super) fn mount() -> RouterBuilder<App> {
                 .await
         }
 
-        query GET_NICKNAME_HISTORY[app, user_id: i32] {
+        query GET_NICKNAME_HISTORY[app, friend_code: String] {
             let history = app.account_manager()
-                .get_nickname_history(user_id)
+                .get_nickname_history(friend_code)
                 .await?;
 
             Ok(history.into_iter().map(FENicknameHistoryEntry::from).collect::<Vec<_>>())
@@ -488,7 +488,6 @@ impl From<GDLAccountStatus> for FEGDLAccountStatus {
 #[derive(Type, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct FEGDLAccount {
-    id: i32,
     email: String,
     microsoft_oid: String,
     nickname: String,
@@ -508,7 +507,6 @@ struct FEGDLAccount {
 impl From<GDLUser> for FEGDLAccount {
     fn from(value: GDLUser) -> Self {
         Self {
-            id: value.id,
             email: value.email,
             microsoft_oid: value.microsoft_oid,
             nickname: value.nickname,

crates/carbon_app/src/managers/account/gdl_account.rs

@@ -76,7 +76,6 @@ pub enum GDLAccountStatus {
 
 #[derive(Clone, Serialize, Deserialize)]
 pub struct GDLUser {
-    pub id: i32,
     pub email: String,
     pub microsoft_oid: String,
     pub nickname: String,
@@ -361,11 +360,11 @@ impl GDLAccountTask {
 
     pub async fn get_nickname_history(
         &self,
-        user_id: i32,
+        friend_code: String,
     ) -> anyhow::Result<Vec<NicknameHistoryEntry>> {
         let url = format!(
             "{}/v1/users/users/{}/nickname-history",
-            self.base_api, user_id
+            self.base_api, friend_code
         );
 
         let resp = self.client.get(url).send().await?;

crates/carbon_app/src/managers/account/mod.rs

@@ -529,9 +529,9 @@ impl<'s> ManagerRef<'s, AccountManager> {
 
     pub async fn get_nickname_history(
         self,
-        user_id: i32,
+        friend_code: String,
     ) -> anyhow::Result<Vec<NicknameHistoryEntry>> {
-        self.gdl_account_task.get_nickname_history(user_id).await
+        self.gdl_account_task.get_nickname_history(friend_code).await
     }
 
     pub async fn clear_nickname_history(self, uuid: String) -> anyhow::Result<()> {