diff --git a/apps/tools.js b/apps/tools.js index 17a5b2c..e5d6091 100644 --- a/apps/tools.js +++ b/apps/tools.js @@ -92,7 +92,7 @@ export class tools extends plugin { const language = languageReg.exec(msg); if (!transMap.hasOwnProperty(language[1])) { e.reply( - "输入格式有误!例子:翻中 China's policy has been consistent, but Japan chooses a path of mistrust, decoupling and military expansion", + "输入格式有误或暂不支持该语言!\n例子:翻中 China's policy has been consistent, but Japan chooses a path of mistrust, decoupling and military expansion", ); return; } @@ -109,7 +109,9 @@ export class tools extends plugin { // 咕咕翻译 translateResult = await translateEngine.google(place, language[1]); } catch (err) { - console.err("咕咕翻译失败,", err); + logger.error("咕咕翻译失败"); + } finally { + translateResult = "" } // 腾讯交互式进行补充 translateResult += "\n\n🐧翻译:" + await translateEngine.tencent(place, language[1]) @@ -117,7 +119,7 @@ export class tools extends plugin { // 如果有百度 translateResult = await translateEngine.baidu(place, language[1]); } - e.reply(translateResult, true); + e.reply(translateResult.trim(), true); return true; } @@ -385,12 +387,12 @@ export class tools extends plugin { e.reply(segment.video(`${path}temp.mp4`)); }) .catch(err => { - console.log(err); + logger.error(err); e.reply("解析失败,请重试一下"); }); }) .catch(err => { - console.log(err); + logger.error(err); e.reply("解析失败,请重试一下"); }); return true; @@ -541,7 +543,6 @@ export class tools extends plugin { let msgUrl = /(http:|https:)\/\/(xhslink|xiaohongshu).com\/[A-Za-z\d._?%&+\-=\/#@]*/.exec( e.msg, )?.[0] || /(http:|https:)\/\/www\.xiaohongshu\.com\/discovery\/item\/(\w+)/.exec(e.message[0].data)?.[0]; - console.log(msgUrl) let id; if (msgUrl.includes("xhslink")) { await fetch(msgUrl, { @@ -637,7 +638,7 @@ export class tools extends plugin { }); await e.reply(`清理完成!`); } catch (err) { - console.log(err); + logger.log(err); e.reply("清理失败,重试或者自动清理即可"); } } @@ -721,7 +722,7 @@ export class tools extends plugin { title + "-video.m4s", _.throttle( value => - console.log("download-progress", { + logger.mark("download-progress", { type: "video", data: value, }), @@ -733,7 +734,7 @@ export class tools extends plugin { title + "-audio.m4s", _.throttle( value => - console.log("download-progress", { + logger.mark("download-progress", { type: "audio", data: value, }), @@ -843,7 +844,7 @@ export class tools extends plugin { const target = `${groupPath}/temp.mp4`; // 待优化 if (fs.existsSync(target)) { - console.log(`视频已存在`); + logger.mark(`视频已存在`); fs.unlinkSync(target); } let res; @@ -871,7 +872,7 @@ export class tools extends plugin { }); } - console.log(`开始下载: ${url}`); + logger.mark(`开始下载: ${url}`); const writer = fs.createWriteStream(target); res.data.pipe(writer); diff --git a/utils/constant.js b/utils/constant.js index 451f3d0..2a61721 100644 --- a/utils/constant.js +++ b/utils/constant.js @@ -3,7 +3,8 @@ * * @type {{英: string, 日: string, 文: string, 中: string}} */ -export const transMap = { 中: "zh", 日: "jp", 文: "wyw", 英: "en", 俄: "ru" }; +export const transMap = { 中: "zh", 日: "jp", 文: "wyw", 英: "en", 俄: "ru", 韩: "kr" }; +export const transMap2 = { 中: "zh", 日: "ja", 韩: "ko", 英: "en", 俄: "ru" }; /** * 以下为抖音/TikTok类型代码 diff --git a/utils/transStrategy.js b/utils/transStrategy.js index c3cb26f..61397a5 100644 --- a/utils/transStrategy.js +++ b/utils/transStrategy.js @@ -1,4 +1,4 @@ -import {transMap} from "./constant.js"; +import {transMap, transMap2} from "./constant.js"; import md5 from "md5"; import fetch from "node-fetch"; import HttpProxyAgent from "https-proxy-agent"; @@ -21,6 +21,7 @@ export default class Translate { */ proxy: "" } + constructor(config) { this.config = config; } @@ -51,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=${transMap[targetLanguage]}&q=${query}`; + const url = `https://translate.googleapis.com/translate_a/single?client=gtx&dt=t&sl=auto&tl=${transMap2[targetLanguage]}&q=${query}`; return fetch(url, { method: "GET", headers: { @@ -83,7 +84,7 @@ export default class Translate { "fn": "text_analysis", "client_key": "browser-firefox-111.0.0-Mac OS-d35fca23-eb48-45ba-9913-114f1177b02b-1679376552800" }, - "text": "s", + "text": query, "type": "plain", "normalize": { "merge_broken_line": false @@ -118,7 +119,7 @@ export default class Translate { ] }, "target": { - "lang": transMap[targetLanguage] + "lang": transMap2[targetLanguage] } }) }).then(async resp => {