diff --git a/apps/admin.js b/apps/admin.js index 0280f29..6040fba 100644 --- a/apps/admin.js +++ b/apps/admin.js @@ -1,27 +1,37 @@ -import { segment } from "oicq"; +import { + segment +} from "oicq"; import fs from "fs"; import lodash from "lodash"; -import { createRequire } from "module"; -import { exec } from "child_process"; -import { Cfg } from "../components/index.js"; +import { + createRequire +} from "module"; +import { + exec +} from "child_process"; +import { + Cfg +} from "../components/index.js"; import Common from "../components/Common.js"; - +import { + init +} from "../apps/xiaoyao_image.js" const require = createRequire(import.meta.url); export const rule = { - updateRes: { - hashMark: true, - reg: "^#图鉴更新$", - describe: "【#管理】更新素材", - }, - updateMiaoPlugin: { - hashMark: true, - reg: "^#图鉴插件(强制)?更新", - describe: "【#管理】图鉴更新", - }, - + updateRes: { + hashMark: true, + reg: "^#图鉴更新$", + describe: "【#管理】更新素材", + }, + updateMiaoPlugin: { + hashMark: true, + reg: "^#图鉴插件(强制)?更新", + describe: "【#管理】图鉴更新", + }, + }; @@ -29,107 +39,117 @@ const _path = process.cwd(); const resPath = `${_path}/plugins/xiaoyao-cvs-plugin/resources/`; const plusPath = `${resPath}/xiaoyao-plus/`; -const checkAuth = async function (e) { - return await e.checkAuth({ - auth: "master", - replyMsg: `只有主人才能命令喵喵哦~ +const checkAuth = async function(e) { + return await e.checkAuth({ + auth: "master", + replyMsg: `只有主人才能命令喵喵哦~ (*/ω＼*)` - }); + }); } -const getStatus = function (rote, def = true) { - if (Cfg.get(rote, def)) { - return `
已开启
`; - } else { - return `
已关闭
`; - } +const getStatus = function(rote, def = true) { + if (Cfg.get(rote, def)) { + return `
已开启
`; + } else { + return `
已关闭
`; + } } export async function updateRes(e) { - if (!await checkAuth(e)) { - return true; - } - let command = ""; - if (fs.existsSync(`${resPath}/xiaoyao-plus/`)) { - e.reply("开始尝试更新，请耐心等待~"); - command = `git pull`; - exec(command, { cwd: `${resPath}/xiaoyao-plus/` }, function (error, stdout, stderr) { - //console.log(stdout); - if (/Already up to date/.test(stdout)) { - e.reply("目前所有图片都已经是最新了~"); - return true; - } - let numRet = /(\d*) files changed,/.exec(stdout); - if (numRet && numRet[1]) { - e.reply(`报告主人，更新成功，此次更新了${numRet[1]}个图片~`); - return true; - } - if (error) { - e.reply("更新失败！\nError code: " + error.code + "\n" + error.stack + "\n 请稍后重试。"); - } else { - e.reply("图片加量包更新成功~"); - } - }); - } else { - //gitee图床 - command =`git clone https://gitee.com/Ctrlcvs/xiaoyao-plus.git "${resPath}/xiaoyao-plus/"` - // command = `git clone https://github.com/ctrlcvs/xiaoyao_plus.git "${resPath}/xiaoyao-plus/"`;\n此链接为github图床,如异常请请求多次 - e.reply("开始尝试安装图鉴加量包，可能会需要一段时间，请耐心等待~"); - exec(command, function (error, stdout, stderr) { - if (error) { - e.reply("角色图片加量包安装失败！\nError code: " + error.code + "\n" + error.stack + "\n 请稍后重试。"); - } else { - e.reply("角色图片加量包安装成功！您后续也可以通过 #图鉴更新 命令来更新图像"); - } - }); - } - return true; + if (!await checkAuth(e)) { + return true; + } + let command = ""; + if (fs.existsSync(`${resPath}/xiaoyao-plus/`)) { + e.reply("开始尝试更新，请耐心等待~"); + command = `git pull`; + exec(command, { + cwd: `${resPath}/xiaoyao-plus/` + }, function(error, stdout, stderr) { + //console.log(stdout); + if (/Already up to date/.test(stdout)) { + e.reply("目前所有图片都已经是最新了~"); + return true; + } + let numRet = /(\d*) files changed,/.exec(stdout); + if (numRet && numRet[1]) { + init() + e.reply(`报告主人，更新成功，此次更新了${numRet[1]}个图片~`); + return true; + } + if (error) { + e.reply("更新失败！\nError code: " + error.code + "\n" + error.stack + "\n 请稍后重试。"); + } else { + init() + e.reply("图片加量包更新成功~"); + } + }); + } else { + //gitee图床 + command = `git clone https://gitee.com/Ctrlcvs/xiaoyao-plus.git "${resPath}/xiaoyao-plus/"` + // command = `git clone https://github.com/ctrlcvs/xiaoyao_plus.git "${resPath}/xiaoyao-plus/"`;\n此链接为github图床,如异常请请求多次 + e.reply("开始尝试安装图鉴加量包，可能会需要一段时间，请耐心等待~"); + exec(command, function(error, stdout, stderr) { + if (error) { + e.reply("角色图片加量包安装失败！\nError code: " + error.code + "\n" + error.stack + "\n 请稍后重试。"); + } else { + init() + e.reply("角色图片加量包安装成功！您后续也可以通过 #图鉴更新 命令来更新图像"); + } + }); + } + return true; } let timer; export async function updateMiaoPlugin(e) { - if (!await checkAuth(e)) { - return true; - } - let isForce = e.msg.includes("强制"); - let command = "git pull"; - if (isForce) { - command = "git checkout . && git pull"; - e.reply("正在执行强制更新操作，请稍等"); - } else { - e.reply("正在执行更新操作，请稍等"); - } - exec(command, { cwd: `${_path}/plugins/xiaoyao-cvs-plugin/` }, function (error, stdout, stderr) { - //console.log(stdout); - if (/Already up to date/.test(stdout)) { - e.reply("目前已经是最新版图鉴插件了~"); - return true; - } - if (error) { - e.reply("图鉴插件更新失败！\nError code: " + error.code + "\n" + error.stack + "\n 请稍后重试。"); - return true; - } - e.reply("图鉴插件更新成功，尝试重新启动Yunzai以应用更新..."); - timer && clearTimeout(timer); - redis.set("xiaoyao:restart-msg", JSON.stringify({ - msg: "重启成功，新版图鉴插件已经生效", - qq: e.user_id - }), { EX: 30 }); - timer = setTimeout(function () { - let command = "npm run restart"; - exec(command, function (error, stdout, stderr) { - if (error) { - if (/Yunzai not found/.test(error)) { - e.reply("自动重启失败，请手动重启以应用新版图鉴插件。请使用 npm run start 命令启动Yunzai-Bot"); - } else { - e.reply("重启失败！\nError code: " + error.code + "\n" + error.stack + "\n 请稍后重试。"); - } - return true; - } - }) - }, 1000); + if (!await checkAuth(e)) { + return true; + } + let isForce = e.msg.includes("强制"); + let command = "git pull"; + if (isForce) { + command = "git checkout . && git pull"; + e.reply("正在执行强制更新操作，请稍等"); + } else { + e.reply("正在执行更新操作，请稍等"); + } + exec(command, { + cwd: `${_path}/plugins/xiaoyao-cvs-plugin/` + }, function(error, stdout, stderr) { + //console.log(stdout); + if (/Already up to date/.test(stdout)) { + e.reply("目前已经是最新版图鉴插件了~"); + return true; + } + if (error) { + e.reply("图鉴插件更新失败！\nError code: " + error.code + "\n" + error.stack + "\n 请稍后重试。"); + return true; + } + e.reply("图鉴插件更新成功，尝试重新启动Yunzai以应用更新..."); + timer && clearTimeout(timer); + redis.set("xiaoyao:restart-msg", JSON.stringify({ + msg: "重启成功，新版图鉴插件已经生效", + qq: e.user_id + }), { + EX: 30 + }); + timer = setTimeout(function() { + let command = "npm run restart"; + exec(command, function(error, stdout, stderr) { + if (error) { + if (/Yunzai not found/.test(error)) { + e.reply("自动重启失败，请手动重启以应用新版图鉴插件。请使用 npm run start 命令启动Yunzai-Bot"); + } else { + e.reply("重启失败！\nError code: " + error.code + "\n" + error.stack + + "\n 请稍后重试。"); + } + return true; + } + }) + }, 1000); - }); - return true; -} \ No newline at end of file + }); + return true; +} diff --git a/resources/Atlas_alias/yuanmo_tujian.json b/resources/Atlas_alias/yuanmo_tujian.json index b42e7af..d15303e 100644 --- a/resources/Atlas_alias/yuanmo_tujian.json +++ b/resources/Atlas_alias/yuanmo_tujian.json @@ -48,6 +48,7 @@ "丘丘岩盔王": ["岩丘丘王"], "丘丘雷兜王": ["雷丘丘王"], "丘丘霜铠王": ["冰丘丘王"], + "丘丘人":["丘丘人"], "射手丘丘人": ["弓箭丘丘人"], "冰弹丘丘人": ["冰丘丘人"], "冰箭丘丘人": ["冰弓丘丘人"],