From 8539b1b676f6ed9ff6cad947cc56a348d616abd0 Mon Sep 17 00:00:00 2001
From: kwaroran <kwaworan@gmail.com>
Date: Tue, 16 May 2023 18:09:31 +0900
Subject: [PATCH] [feat] new google translator api

---
 src/lib/SideBars/Settings.svelte | 12 +++----
 src/ts/translator/translator.ts  | 55 +++++++++++++++++---------------
 2 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/src/lib/SideBars/Settings.svelte b/src/lib/SideBars/Settings.svelte
index 8e978836..bedab8ed 100644
--- a/src/lib/SideBars/Settings.svelte
+++ b/src/lib/SideBars/Settings.svelte
@@ -341,13 +341,11 @@
     {/if}
 
 
-    {#if isTauri}
-        <span class="text-neutral-200 mt-4">{language.translator}</span>
-        <select class="bg-transparent input-text mt-2 mb-4 text-gray-200 appearance-none text-sm" bind:value={$DataBase.translator}>
-            <option value="" class="bg-darkbg appearance-none">{language.disabled}</option>
-            <option value="ko" class="bg-darkbg appearance-none">한국어</option>
-        </select>
-    {/if}
+    <span class="text-neutral-200 mt-4">{language.translator}</span>
+    <select class="bg-transparent input-text mt-2 mb-4 text-gray-200 appearance-none text-sm" bind:value={$DataBase.translator}>
+        <option value="" class="bg-darkbg appearance-none">{language.disabled}</option>
+        <option value="ko" class="bg-darkbg appearance-none">한국어</option>
+    </select>
     <span class="text-neutral-200">{language.UISize}</span>
     <input class="text-neutral-200 p-2 bg-transparent input-text focus:bg-selected" type="range" min="50" max="200" bind:value={$DataBase.zoomsize}>
     <span class="text-gray-400 mb-6 text-sm">{($DataBase.zoomsize)}%</span>
diff --git a/src/ts/translator/translator.ts b/src/ts/translator/translator.ts
index 76935e0b..43f1c84d 100644
--- a/src/ts/translator/translator.ts
+++ b/src/ts/translator/translator.ts
@@ -1,4 +1,4 @@
-import { Body,fetch,ResponseType } from "@tauri-apps/api/http"
+import { Body,fetch as TauriFetch,ResponseType } from "@tauri-apps/api/http"
 import { isTauri } from "../globalApi"
 import { translatorPlugin } from "../process/plugins"
 import { sleep } from "../util"
@@ -11,9 +11,6 @@ let cache={
 let waitTrans = 0
 
 export async function translate(text:string, reverse:boolean) {
-    if(!isTauri){
-        return text
-    }
     const plug = await translatorPlugin(text, reverse ? 'ko' : 'en', reverse ? 'en' : 'ko')
     if(plug){
         return plug.content
@@ -35,39 +32,45 @@ export async function translate(text:string, reverse:boolean) {
 }
 
 async function googleTrans(text:string, reverse:boolean) {
-    const time = Date.now()
-    if(time < waitTrans){
-        const waitTime = waitTrans - time
-        waitTrans += 5000
-        await sleep(waitTime)
-    }
-    else{
-        waitTrans = time + 5000
-    }
+
     const arg = {
+
         from: reverse ? 'ko' : 'en',
+
         to: reverse ? 'en' : 'ko',
-        host: 'translate.google.com',
+
+        host: 'translate.googleapis.com',
+
     }
-    const body = Body.form({
-        sl: reverse ? 'ko' : 'en',
-        tl: reverse ? 'en' : 'ko',
-        q: text,
-    })
-    const url = `https://${arg.host}/translate_a/single?client=at&dt=t&dt=rm&dj=1`
+
+
+
+    const url = `https://${arg.host}/translate_a/single?client=gtx&dt=t&sl=${arg.from}&tl=${arg.to}&q=` + encodeURIComponent(text)
+
+
 
     const f = await fetch(url, {
-        method: "POST",
-        body: body,
-        responseType: ResponseType.JSON
+
+        method: "GET",
+
     })
 
-    const res = f.data as {sentences:{trans?:string}[]}
-    if(typeof(f.data) === 'string'){
+    const res = await f.json()
+
+    
+
+    if(typeof(res) === 'string'){
+
         return res as unknown as string
+
     }
-    const result = res.sentences.filter((s) => 'trans' in s).map((s) => s.trans).join('');
+
+    const result = res[0].map((s) => s[0]).filter(Boolean).join('');
+
     cache.origin.push(reverse ? result : text)
+
     cache.trans.push(reverse ? text : result)
+
     return result
+
 }
\ No newline at end of file