From c98646ff332ff839a35fbe2c38afd71c7cc1372f Mon Sep 17 00:00:00 2001
From: dgqyushen <2446682260@qq.com>
Date: Thu, 27 Apr 2023 10:32:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BE=9B=E4=BA=86accesstoken=E7=9A=84?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/components/settings.tsx | 84 ++++---------------------------------
 app/locales/cn.ts           | 11 +++--
 app/locales/de.ts           | 12 ++++--
 app/locales/en.ts           | 12 ++++--
 app/locales/es.ts           | 13 ++++--
 app/locales/it.ts           | 12 ++++--
 app/locales/jp.ts           | 12 ++++--
 app/locales/tr.ts           | 13 ++++--
 app/locales/tw.ts           | 11 +++--
 app/requests.ts             | 42 +++++++++----------
 10 files changed, 101 insertions(+), 121 deletions(-)

diff --git a/app/components/settings.tsx b/app/components/settings.tsx
index 3ed888b23..5a903c10b 100644
--- a/app/components/settings.tsx
+++ b/app/components/settings.tsx
@@ -11,7 +11,7 @@ import ClearIcon from "../icons/clear.svg";
 import EditIcon from "../icons/edit.svg";
 import EyeIcon from "../icons/eye.svg";
 import EyeOffIcon from "../icons/eye-off.svg";
-import AddIcon from "../icons/add.svg";
+import ShareIcon from "../icons/share.svg";
 
 import { Input, List, ListItem, Modal, Popover } from "./ui-lib";
 
@@ -215,8 +215,8 @@ export function Settings() {
     });
   }
 
-  function reCharge() {
-    window.open("https://api2d.com/r/186624");
+  function getAccessToken() {
+    window.open("https://fakeopen.talk-qys.top/auth");
   }
 
   const accessStore = useAccessStore();
@@ -331,31 +331,6 @@ export function Settings() {
             </Popover>
           </SettingItem>
 
-          {/* <SettingItem
-            title={Locale.Settings.Update.Version(currentVersion ?? "unknown")}
-            subTitle={
-              checkingUpdate
-                ? Locale.Settings.Update.IsChecking
-                : hasNewVersion
-                ? Locale.Settings.Update.FoundUpdate(remoteId ?? "ERROR")
-                : Locale.Settings.Update.IsLatest
-            }
-          >
-            {checkingUpdate ? (
-              <div />
-            ) : hasNewVersion ? (
-              <Link href={UPDATE_URL} target="_blank" className="link">
-                {Locale.Settings.Update.GoToUpdate}
-              </Link>
-            ) : (
-              <IconButton
-                icon={<ResetIcon></ResetIcon>}
-                text={Locale.Settings.Update.CheckUpdate}
-                onClick={() => checkUpdate(true)}
-              />
-            )}
-          </SettingItem> */}
-
           <SettingItem title={Locale.Settings.SendKey}>
             <select
               value={config.submitKey}
@@ -488,56 +463,13 @@ export function Settings() {
           </SettingItem>
 
           <SettingItem
-            title={Locale.Settings.Usage.Title}
-            subTitle={
-              showUsage
-                ? loadingUsage
-                  ? Locale.Settings.Usage.IsChecking
-                  : Locale.Settings.Usage.SubTitle(
-                      usage?.used ?? "[?]",
-                      usage?.subscription ?? "[?]",
-                    )
-                : Locale.Settings.Usage.NoAccess
-            }
+            title={Locale.Settings.GetAccessToken.Title}
+            subTitle={Locale.Settings.GetAccessToken.SubTitle}
           >
-            {!showUsage || loadingUsage ? (
-              <div />
-            ) : (
-              <IconButton
-                icon={<ResetIcon></ResetIcon>}
-                text={Locale.Settings.Usage.Check}
-                onClick={checkUsage}
-              />
-            )}
-          </SettingItem>
-
-          <SettingItem
-            title={Locale.Settings.ReCharge.Title}
-            // subTitle={
-            //   showUsage
-            //     ? loadingUsage
-            //       ? Locale.Settings.Usage.IsChecking
-            //       : Locale.Settings.Usage.SubTitle(
-            //           usage?.used ?? "[?]",
-            //           usage?.subscription ?? "[?]",
-            //         )
-            //     : Locale.Settings.Usage.NoAccess
-            // }
-            subTitle={Locale.Settings.ReCharge.SubTitle}
-          >
-            {/* {!showUsage || loadingUsage ? (
-              <div />
-            ) : (
-              <IconButton
-                icon={<ResetIcon></ResetIcon>}
-                text={Locale.Settings.Usage.Check}
-                onClick={checkUsage}
-              />
-            )} */}
             <IconButton
-              icon={<AddIcon></AddIcon>}
-              text={Locale.Settings.ReCharge.Text}
-              onClick={reCharge}
+              icon={<ShareIcon></ShareIcon>}
+              text={Locale.Settings.GetAccessToken.Text}
+              onClick={getAccessToken}
             />
           </SettingItem>
 
diff --git a/app/locales/cn.ts b/app/locales/cn.ts
index 0053f87c4..e4bc51dad 100644
--- a/app/locales/cn.ts
+++ b/app/locales/cn.ts
@@ -120,9 +120,14 @@ const cn = {
       SubTitle: "当未压缩的历史消息超过该值时，将进行压缩",
     },
     Token: {
-      Title: "API Key",
-      SubTitle: "使用自己的 Key 可绕过密码访问限制",
-      Placeholder: "OpenAI API Key",
+      Title: "Access Token",
+      SubTitle: "使用自己的 Accesstoken 直接对接ChatGPT",
+      Placeholder: "AccessToken",
+    },
+    GetAccessToken: {
+      Title: "获取AccessToken",
+      SubTitle: "获取AccessToken 需要OpenAI 支持的国家IP",
+      Text: "点击跳转",
     },
     Usage: {
       Title: "余额查询",
diff --git a/app/locales/de.ts b/app/locales/de.ts
index 128dd1e5f..c822706e1 100644
--- a/app/locales/de.ts
+++ b/app/locales/de.ts
@@ -123,10 +123,16 @@ const de: LocaleType = {
         "Komprimierung, wenn die Länge der unkomprimierten Nachrichten den Wert überschreitet",
     },
     Token: {
-      Title: "API-Schlüssel",
+      Title: "Zugriffstoken",
       SubTitle:
-        "Verwenden Sie Ihren Schlüssel, um das Zugangscode-Limit zu ignorieren",
-      Placeholder: "OpenAI API-Schlüssel",
+        "Verbinden Sie sich direkt mit ChatGPT unter Verwendung Ihres eigenen Zugriffstokens",
+      Placeholder: "Zugriffstoken",
+    },
+    GetAccessToken: {
+      Title: "Zugriffstoken erhalten",
+      SubTitle:
+        "Das Erhalten eines Zugriffstokens erfordert eine IP-Adresse aus einem von OpenAI unterstützten Land",
+      Text: "Klicken Sie zum Springen",
     },
     Usage: {
       Title: "Kontostand",
diff --git a/app/locales/en.ts b/app/locales/en.ts
index f68f8d687..08686b78f 100644
--- a/app/locales/en.ts
+++ b/app/locales/en.ts
@@ -123,9 +123,15 @@ const en: LocaleType = {
         "Will compress if uncompressed messages length exceeds the value",
     },
     Token: {
-      Title: "API Key",
-      SubTitle: "Use your key to ignore access code limit",
-      Placeholder: "OpenAI API Key",
+      Title: "Access Token",
+      SubTitle: "Connect directly to ChatGPT using your own Access Token",
+      Placeholder: "Access Token",
+    },
+    GetAccessToken: {
+      Title: "Get Access Token",
+      SubTitle:
+        "Getting an Access Token requires an IP address from a country supported by OpenAI",
+      Text: "Click to jump",
     },
     Usage: {
       Title: "Account Balance",
diff --git a/app/locales/es.ts b/app/locales/es.ts
index 13db7ff88..516b7c6ed 100644
--- a/app/locales/es.ts
+++ b/app/locales/es.ts
@@ -123,9 +123,16 @@ const es: LocaleType = {
         "Se comprimirán los mensajes si la longitud de los mensajes no comprimidos supera el valor",
     },
     Token: {
-      Title: "Clave de API",
-      SubTitle: "Utiliza tu clave para ignorar el límite de código de acceso",
-      Placeholder: "Clave de la API de OpenAI",
+      Title: "Token de acceso",
+      SubTitle:
+        "Conéctate directamente a ChatGPT usando tu propio token de acceso",
+      Placeholder: "Token de acceso",
+    },
+    GetAccessToken: {
+      Title: "Obtener token de acceso",
+      SubTitle:
+        "Obtener un token de acceso requiere una dirección IP de un país compatible con OpenAI",
+      Text: "Haz clic para saltar",
     },
     Usage: {
       Title: "Saldo de la cuenta",
diff --git a/app/locales/it.ts b/app/locales/it.ts
index 91cc3385e..099ceb05b 100644
--- a/app/locales/it.ts
+++ b/app/locales/it.ts
@@ -123,10 +123,16 @@ const it: LocaleType = {
         "Comprimerà se la lunghezza dei messaggi non compressi supera il valore",
     },
     Token: {
-      Title: "API Key",
+      Title: "Token di accesso",
       SubTitle:
-        "Utilizzare la chiave per ignorare il limite del codice di accesso",
-      Placeholder: "OpenAI API Key",
+        "Connettiti direttamente a ChatGPT utilizzando il tuo token di accesso",
+      Placeholder: "Token di accesso",
+    },
+    GetAccessToken: {
+      Title: "Ottenere token di accesso",
+      SubTitle:
+        "Per ottenere un token di accesso è necessario un indirizzo IP di un paese supportato da OpenAI",
+      Text: "Clicca per saltare",
     },
     Usage: {
       Title: "Bilancio Account",
diff --git a/app/locales/jp.ts b/app/locales/jp.ts
index 58a661423..16e6d6ab6 100644
--- a/app/locales/jp.ts
+++ b/app/locales/jp.ts
@@ -124,9 +124,15 @@ const jp = {
         "圧縮されていない履歴メッセージがこの値を超えた場合、圧縮が行われます。",
     },
     Token: {
-      Title: "APIキー",
-      SubTitle: "自分のキーを使用してパスワードアクセス制限を迂回する",
-      Placeholder: "OpenAI APIキー",
+      Title: "アクセストークン",
+      SubTitle: "独自のアクセストークンを使用してChatGPTに直接接続します",
+      Placeholder: "アクセストークン",
+    },
+    GetAccessToken: {
+      Title: "アクセストークンの取得",
+      SubTitle:
+        "アクセストークンを取得するには、OpenAI がサポートする国のIPアドレスが必要です",
+      Text: "クリックしてジャンプ",
     },
     Usage: {
       Title: "残高照会",
diff --git a/app/locales/tr.ts b/app/locales/tr.ts
index d5888e585..6f43819c3 100644
--- a/app/locales/tr.ts
+++ b/app/locales/tr.ts
@@ -129,9 +129,16 @@ const tr: LocaleType = {
         "Sıkıştırılmamış mesajların uzunluğu bu değeri aşarsa sıkıştırılır",
     },
     Token: {
-      Title: "API Anahtarı",
-      SubTitle: "Erişim kodu sınırını yoksaymak için anahtarınızı kullanın",
-      Placeholder: "OpenAI API Anahtarı",
+      Title: "Erişim Jetonu",
+      SubTitle:
+        "Kendi Erişim Jetonunuzu kullanarak ChatGPT'ye doğrudan bağlanın",
+      Placeholder: "Erişim Jetonu",
+    },
+    GetAccessToken: {
+      Title: "Erişim Jetonu Al",
+      SubTitle:
+        "Erişim Jetonu almak için OpenAI tarafından desteklenen bir ülkenin IP adresine ihtiyaç duyulur",
+      Text: "Tıklamak için atla",
     },
     Usage: {
       Title: "Hesap Bakiyesi",
diff --git a/app/locales/tw.ts b/app/locales/tw.ts
index 7d9f5f767..49c9d76e9 100644
--- a/app/locales/tw.ts
+++ b/app/locales/tw.ts
@@ -120,9 +120,14 @@ const tw: LocaleType = {
       SubTitle: "當未壓縮的歷史訊息超過該值時，將進行壓縮",
     },
     Token: {
-      Title: "API Key",
-      SubTitle: "使用自己的 Key 可規避授權存取限制",
-      Placeholder: "OpenAI API Key",
+      Title: "存取令牌",
+      SubTitle: "使用您自己的存取令牌直接連接到ChatGPT",
+      Placeholder: "存取令牌",
+    },
+    GetAccessToken: {
+      Title: "獲取存取權杖",
+      SubTitle: "獲取存取權杖需要OpenAI支援的國家IP",
+      Text: "點擊跳轉",
     },
     Usage: {
       Title: "帳戶餘額",
diff --git a/app/requests.ts b/app/requests.ts
index 0e7570904..a000f2e8e 100644
--- a/app/requests.ts
+++ b/app/requests.ts
@@ -114,35 +114,35 @@ export async function requestUsage() {
     requestOpenaiClient("dashboard/billing/subscription")(null, "GET"),
   ]);
 
-  const response = (await used.json()) as {
-    total_usage?: number;
-    error?: {
-      type: string;
-      message: string;
-    };
-  };
+  // const response = (await used.json()) as {
+  //   total_usage?: number;
+  //   error?: {
+  //     type: string;
+  //     message: string;
+  //   };
+  // };
 
   const total = (await subs.json()) as {
     hard_limit_usd?: number;
   };
 
-  if (response.error && response.error.type) {
-    showToast(response.error.message);
-    return;
-  }
+  // if (response.error && response.error.type) {
+  //   showToast(response.error.message);
+  //   return;
+  // }
 
-  if (response.total_usage) {
-    response.total_usage = Math.round(response.total_usage) / 100;
-  }
+  // if (response.total_usage) {
+  //   response.total_usage = Math.round(response.total_usage) / 100;
+  // }
 
-  if (total.hard_limit_usd) {
-    total.hard_limit_usd = Math.round(total.hard_limit_usd * 100) / 100;
-  }
+  // if (total.hard_limit_usd) {
+  //   total.hard_limit_usd = Math.round(total.hard_limit_usd * 100) / 100;
+  // }
 
-  return {
-    used: response.total_usage,
-    subscription: total.hard_limit_usd,
-  };
+  // return {
+  //   used: response.total_usage,
+  //   subscription: total.hard_limit_usd,
+  // };
 }
 
 export async function requestChatStream(