From 321b974ea41b21a9b048ca3059db846c4f395dbd Mon Sep 17 00:00:00 2001 From: zhiyu1998 Date: Fri, 24 Mar 2023 18:20:55 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E5=BC=80=E6=94=BE=E5=92=95?= =?UTF-8?q?=E5=92=95=E7=BF=BB=E8=AF=91=20&=20=F0=9F=90=9E=20fix:=20?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=83=A8=E5=88=86=E6=96=87=E5=AD=97=E6=80=A7?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/tools.js | 3 --- utils/constant.js | 17 ++++++++++++++--- utils/trans-strategy.js | 8 ++++---- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/apps/tools.js b/apps/tools.js index e78ed2a..04487b1 100644 --- a/apps/tools.js +++ b/apps/tools.js @@ -131,8 +131,6 @@ export class tools extends plugin { "📝咕咕翻译:" + (await translateEngine.google(place, language[1])); } catch (err) { logger.error("咕咕翻译失败"); - } finally { - translateResult = ""; } // 腾讯交互式进行补充 translateResult += "\n\n🐧翻译:" + (await translateEngine.tencent(place, language[1])); @@ -342,7 +340,6 @@ export class tools extends plugin { }; // 格式化数据 const combineContent = - `标题:${title}\n` + `点赞:${dataProcessing(like,)} | 硬币:${dataProcessing(coin)} | 收藏:${dataProcessing(favorite)} | 分享:${dataProcessing(share)}\n`+ `总播放量:${dataProcessing(view)} | 弹幕数量:${dataProcessing(danmaku)} | 评论:${dataProcessing(reply)}\n`+ `简介:${desc}`; diff --git a/utils/constant.js b/utils/constant.js index 68d1309..ee8f820 100644 --- a/utils/constant.js +++ b/utils/constant.js @@ -1,10 +1,21 @@ /** - * 用于翻译的常量控制 + * 用于百度翻译的常量控制 * * @type {{英: string, 日: string, 文: string, 中: string}} */ export const transMap = { 中: "zh", 日: "jp", 文: "wyw", 英: "en", 俄: "ru", 韩: "kr" }; -export const transMap2 = { 中: "zh", 日: "ja", 韩: "ko", 英: "en", 俄: "ru" }; +/** + * 用于腾讯交互式翻译的常量控制 + * + * @type {{英: string, 俄: string, 日: string, 韩: string, 中: string}} + */ +export const tencentTransMap = { 中: "zh", 日: "ja", 韩: "ko", 英: "en", 俄: "ru" }; +/** + * 用于腾讯交互式翻译的常量控制 + * + * @type {{英: string, 俄: string, 日: string, 韩: string, 中: string}} + */ +export const googleTransMap = { 中: "zh-CN", 日: "jp", 韩: "ko", 英: "en", 俄: "ru" }; /** * 以下为抖音/TikTok类型代码 @@ -38,4 +49,4 @@ export const HOT_SEARCH_ACTIONS = { "哔哩哔哩": HOT_SEARCH_API + "bilihot", "头条": HOT_SEARCH_API + "toutiaohot", "头条新闻": HOT_SEARCH_API + "toutiaohotnew" -} \ No newline at end of file +} diff --git a/utils/trans-strategy.js b/utils/trans-strategy.js index 61397a5..2361768 100644 --- a/utils/trans-strategy.js +++ b/utils/trans-strategy.js @@ -1,4 +1,4 @@ -import {transMap, transMap2} from "./constant.js"; +import {transMap, tencentTransMap, googleTransMap} from "./constant.js"; import md5 from "md5"; import fetch from "node-fetch"; import HttpProxyAgent from "https-proxy-agent"; @@ -52,7 +52,7 @@ export default class Translate { * @returns {Promise} */ async google(query, targetLanguage) { - const url = `https://translate.googleapis.com/translate_a/single?client=gtx&dt=t&sl=auto&tl=${transMap2[targetLanguage]}&q=${query}`; + const url = `https://translate.googleapis.com/translate_a/single?client=gtx&dt=t&sl=auto&tl=${googleTransMap[targetLanguage]}&q=${query}`; return fetch(url, { method: "GET", headers: { @@ -119,7 +119,7 @@ export default class Translate { ] }, "target": { - "lang": transMap2[targetLanguage] + "lang": tencentTransMap[targetLanguage] } }) }).then(async resp => { @@ -130,4 +130,4 @@ export default class Translate { return data.auto_translation?.[1]; }) } -} \ No newline at end of file +}