diff --git a/apps/assistant.js b/apps/assistant.js index 3ff403d..8fb0dd0 100644 --- a/apps/assistant.js +++ b/apps/assistant.js @@ -719,7 +719,7 @@ export class example extends plugin { if (e.isGroup) { //群聊判断权限 if (!e.isMaster && !e.member.is_owner && !e.member.is_admin) { - return logger.warn("[椰奶撤回]群聊权限不足") + return logger.warn("[椰奶撤回]该群员权限不足") } } else { //私聊判断是否为Bot消息 diff --git a/apps/fun.js b/apps/fun.js index f8004e3..9a61a39 100644 --- a/apps/fun.js +++ b/apps/fun.js @@ -104,8 +104,7 @@ export class example extends plugin { /**有道翻译 */ async youdao(e) { - - let msg = ""; + let msg = e.msg if (e.source) { let source; if (e.isGroup) { @@ -113,10 +112,9 @@ export class example extends plugin { } else { source = (await e.friend.getChatHistory(e.source.time, 1)).pop(); } - msg = source.raw_message; - } else { - msg = e.msg + msg = source.message.filter(item => item.type == 'text').map(item => item.text).join(""); } + msg = msg.replace(/#|翻译/g, "").trim() if (!msg) return; let results = await Interface.youdao(msg); @@ -305,7 +303,7 @@ export class example extends plugin { if (/#?来点神秘图s/.test(e.msg)) { let keywords = e.msg.match(/#?来点神秘图s(.*)/) let mengduipage = JSON.parse(await redis.get('yenai:mengduipage')) || {} - + let searcjurl = `https://b8s6.com/search.php?mdact=community&q=${keywords[1]}&page=${lodash.random(1, mengduipage[keywords[1]] || 1)}` let search = await fetch(searcjurl).then(res => res.text()); let searchList = search.match(/https:\/\/b8s6.com\/post\/\d+.html/g) diff --git a/model/Interface.js b/model/Interface.js index e10605c..099ce65 100644 --- a/model/Interface.js +++ b/model/Interface.js @@ -48,7 +48,7 @@ export default new class Interface { headers }).then(res => res.json()).catch(err => console.error(err)); if (errorCode != 0) return API_ERROR; - translateResult = lodash.flattenDeep(translateResult)[0].tgt + translateResult = lodash.flattenDeep(translateResult)?.map(item => item.tgt).join("\n"); if (!translateResult) return RESULT_ERROR return translateResult } catch (e) { @@ -56,6 +56,7 @@ export default new class Interface { return API_ERROR } } + /**随机唱歌/唱鸭 */ async randomSinging() { try {