From 93800a15ce141cf45825aa1c9253877b8d8d006b Mon Sep 17 00:00:00 2001
From: BTMuli <BT-Muli@outlook.com>
Date: Thu, 26 Oct 2023 17:34:41 +0800
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=AE=8C=E6=95=B4=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/common/Config.vue    | 12 +++++++++---
 src/utils/TGClient.ts          |  2 +-
 src/web/request/getUserInfo.ts | 26 +++-----------------------
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/src/pages/common/Config.vue b/src/pages/common/Config.vue
index 3171210f..2692c1dd 100644
--- a/src/pages/common/Config.vue
+++ b/src/pages/common/Config.vue
@@ -302,14 +302,20 @@ async function confirmRefreshUser(): Promise<void> {
     failCount++;
   }
   await TGSqlite.saveAppData("cookie", JSON.stringify(ck));
-  const infoRes = await TGRequest.User.byCookie.getUserInfo(ck.cookie_token, ck.account_id, false);
+  const infoRes = await TGRequest.User.byCookie.getUserInfo(ck.cookie_token, ck.account_id);
   if ("retcode" in infoRes) {
     console.error(infoRes);
     loadingTitle.value = "获取失败!正在获取用户游戏账号信息";
     failCount++;
   } else {
-    userStore.setBriefInfo(infoRes);
-    await TGSqlite.saveAppData("userInfo", JSON.stringify(infoRes));
+    const briefInfo: TGApp.App.Account.BriefInfo = {
+      nickname: infoRes.nickname,
+      uid: infoRes.uid,
+      avatar: infoRes.avatar_url,
+      desc: infoRes.introduce,
+    };
+    userStore.setBriefInfo(briefInfo);
+    await TGSqlite.saveAppData("userInfo", JSON.stringify(briefInfo));
     loadingTitle.value = "获取成功!正在获取用户游戏账号信息";
   }
   const accountRes = await TGRequest.User.byCookie.getAccounts(ck.cookie_token, ck.account_id);
diff --git a/src/utils/TGClient.ts b/src/utils/TGClient.ts
index 37852b5d..87f5717f 100644
--- a/src/utils/TGClient.ts
+++ b/src/utils/TGClient.ts
@@ -355,7 +355,7 @@ class TGClient {
     const user = useUserStore();
     const cookieToken = user.cookie.cookie_token;
     const accountId = user.cookie.account_id;
-    const userInfo = await TGRequest.User.byCookie.getUserInfo(cookieToken, accountId, true);
+    const userInfo = await TGRequest.User.byCookie.getUserInfo(cookieToken, accountId);
     if ("retcode" in userInfo) {
       console.error(`[${callback}] ${userInfo.message}`);
       return;
diff --git a/src/web/request/getUserInfo.ts b/src/web/request/getUserInfo.ts
index 07b3fc60..bb39bb6e 100644
--- a/src/web/request/getUserInfo.ts
+++ b/src/web/request/getUserInfo.ts
@@ -12,27 +12,14 @@ import TGUtils from "../utils/TGUtils";
 /**
  * @description 根据 cookie 获取用户信息
  * @since Beta v0.3.4
- * @todo 完善
  * @param {string} cookie_token cookie token
  * @param {string} account_id 用户 account_id
- * @param {boolean} return_full 是否返回完整信息
- * @returns {Promise<TGApp.App.Account.BriefInfo | TGApp.Plugins.Mys.User.Info>}
+ * @returns {Promise<TGApp.BBS.Response.Base | TGApp.Plugins.Mys.User.Info>}
  */
 export async function getUserInfoByCookie(
   cookie_token: string,
   account_id: string,
-  return_full: false,
-): Promise<TGApp.App.Account.BriefInfo | TGApp.BBS.Response.Base>;
-export async function getUserInfoByCookie(
-  cookie_token: string,
-  account_id: string,
-  return_full: true,
-): Promise<TGApp.Plugins.Mys.User.Info | TGApp.BBS.Response.Base>;
-export async function getUserInfoByCookie(
-  cookie_token: string,
-  account_id: string,
-  return_full: boolean = false,
-): Promise<TGApp.App.Account.BriefInfo | TGApp.BBS.Response.Base | TGApp.Plugins.Mys.User.Info> {
+): Promise<TGApp.BBS.Response.Base | TGApp.Plugins.Mys.User.Info> {
   const cookie = {
     cookie_token,
     account_id,
@@ -48,13 +35,6 @@ export async function getUserInfoByCookie(
     })
     .then((res) => {
       if (res.data.retcode !== 0) return res.data;
-      const info = res.data.data.user_info;
-      if (return_full === undefined || return_full) return info;
-      return {
-        nickname: info.nickname,
-        uid: info.uid,
-        avatar: info.avatar_url,
-        desc: info.introduce,
-      };
+      return res.data.data.user_info;
     });
 }