From 4fbc3e088bdd83677cd3dfa58ba38692b92ce4a6 Mon Sep 17 00:00:00 2001 From: Zyy955 <74231782+Zyy955@users.noreply.github.com> Date: Wed, 10 Jan 2024 14:54:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3QQBot=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E4=BD=BF=E7=94=A8`#=E7=BB=91=E5=AE=9A=E4=B8=BB=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=8C=87=E4=BB=A4`=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=97=A5=E5=BF=97=EF=BC=8C=E7=BE=A4=E5=89=8D?= =?UTF-8?q?=E7=BC=80=E6=94=AF=E6=8C=81=E4=B8=BB=E4=BA=BA=E6=97=A0=E8=A7=86?= =?UTF-8?q?=E3=80=82=20(#348)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc.cjs | 4 +- app.js | 8 +-- config/default_config/group.yaml | 2 +- lib/bot.js | 34 ++++++---- lib/common/common.js | 7 ++- lib/plugins/loader.js | 88 +++++++++++++------------- plugins/genshin/apps/user.js | 2 +- plugins/genshin/model/user.js | 104 +++++++++++++++---------------- plugins/other/restart.js | 12 +--- 9 files changed, 132 insertions(+), 129 deletions(-) diff --git a/.eslintrc.cjs b/.eslintrc.cjs index a9b5250..e052c26 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -12,7 +12,9 @@ module.exports = { Bot: true, redis: true, logger: true, - plugin: true + plugin: true, + Renderer: true, + segment: true }, rules: { eqeqeq: ['off'], diff --git a/app.js b/app.js index 177248e..30eeff7 100644 --- a/app.js +++ b/app.js @@ -1,9 +1,3 @@ import Yunzai from './lib/bot.js' -/** 全局变量 bot */ -global.Bot = await Yunzai.run() - -if (Bot.uin == 88888) { - /** 跳过登录后加载插件... */ - await ((await import('./lib/plugins/loader.js')).default).load() -} \ No newline at end of file +await Yunzai.run() diff --git a/config/default_config/group.yaml b/config/default_config/group.yaml index 670a721..4a33c31 100644 --- a/config/default_config/group.yaml +++ b/config/default_config/group.yaml @@ -3,7 +3,7 @@ default: groupGlobalCD: 0 # 群聊中所有指令操作冷却时间，单位毫秒,0则无限制 singleCD: 1000 # 群聊中个人操作冷却时间，单位毫秒 - onlyReplyAt: 0 # 是否只仅关注主动@机器人的消息， 0-否 1-是 + onlyReplyAt: 0 # 是否只仅关注主动@机器人的消息， 0-否 1-是 2-触发用户非主人只回复@机器人的消息及特定前缀的消息，主人免前缀 botAlias: # 开启后则只回复@机器人的消息及特定前缀的消息，支持多个 - 云崽 - 云宝 diff --git a/lib/bot.js b/lib/bot.js index 4f141ae..428ab6e 100644 --- a/lib/bot.js +++ b/lib/bot.js @@ -12,18 +12,28 @@ export default class Yunzai extends Client { /** 登录机器人 */ static async run () { const bot = new Yunzai(cfg.bot) - /** 加载icqq事件监听 */ + /** 加载监听事件 */ await ListenerLoader.load(bot) - if (cfg.bot.skip_login) { - /** 造个假~! */ - bot.uin = 88888 - bot[bot.uin] = bot - return bot - } else { - await bot.login(cfg.qq, cfg.pwd) - bot[bot.uin] = bot - return bot - } + /** 跳过登录 */ + if (cfg.bot.skip_login) return await this.skip_login(bot) + + /** 正常的登录 */ + await bot.login(cfg.qq, cfg.pwd) + bot[bot.uin] = bot + + /** 全局变量 bot */ + global.Bot = bot + return bot } -} \ No newline at end of file + + /** 跳过登录ICQQ */ + static async skip_login (bot) { + bot.uin = 88888 + bot[bot.uin] = bot + /** 全局变量 bot */ + global.Bot = bot + /** 加载插件 */ + return await ((await import('../lib/plugins/loader.js')).default).load() + } +} diff --git a/lib/common/common.js b/lib/common/common.js index 57c5e29..a61bbae 100644 --- a/lib/common/common.js +++ b/lib/common/common.js @@ -8,14 +8,15 @@ import path from 'node:path' * 发送私聊消息，仅给好友发送 * @param userId qq号 * @param msg 消息 + * @param uin 指定bot发送，默认为Bot */ -async function relpyPrivate (userId, msg) { +async function relpyPrivate (userId, msg, uin = Bot.uin) { userId = Number(userId) let friend = Bot.fl.get(userId) if (friend) { logger.mark(`发送好友消息[${friend.nickname}](${userId})`) - return await Bot.pickUser(userId).sendMsg(msg).catch((err) => { + return await Bot[uin].pickUser(userId).sendMsg(msg).catch((err) => { logger.mark(err) }) } @@ -124,7 +125,7 @@ async function makeForwardMsg (e, msg = [], dec = '', msgsscr = false) { } } } catch (err) { } - + return forwardMsg } diff --git a/lib/plugins/loader.js b/lib/plugins/loader.js index cf61bac..bb1150f 100644 --- a/lib/plugins/loader.js +++ b/lib/plugins/loader.js @@ -12,7 +12,7 @@ import common from '../common/common.js' import Runtime from './runtime.js' import Handler from './handler.js' -segment.button = () => "" +segment.button = () => '' /** 全局变量 plugin */ global.plugin = plugin @@ -83,7 +83,7 @@ class PluginsLoader { lodash.forEach(plugin.handler, ({ fn, key, priority }) => { Handler.add({ ns: plugin.namespace || File.name, - key: key, + key, self: plugin, property: priority || plugin.priority || 500, fn: plugin[fn] @@ -164,7 +164,6 @@ class PluginsLoader { /** 监听热更新 */ this.watch(val.name, app.name) - } } @@ -265,50 +264,50 @@ class PluginsLoader { /* eslint-disable no-labels */ a: - for (let plugin of priority) { - /** 正则匹配 */ - if (plugin.rule) { - for (let v of plugin.rule) { - /** 判断事件 */ - if (v.event && !this.filtEvent(e, v)) continue + for (let plugin of priority) { + /** 正则匹配 */ + if (plugin.rule) { + for (let v of plugin.rule) { + /** 判断事件 */ + if (v.event && !this.filtEvent(e, v)) continue - const regExp = new RegExp(v.reg) - /** 匹配消息或者小程序 */ - const messageOrApplet = e.msg || e.message?.[0]?.data - if (regExp.test(messageOrApplet)) { - e.logFnc = `[${plugin.name}][${v.fnc}]` + const regExp = new RegExp(v.reg) + /** 匹配消息或者小程序 */ + const messageOrApplet = e.msg || e.message?.[0]?.data + if (regExp.test(messageOrApplet)) { + e.logFnc = `[${plugin.name}][${v.fnc}]` - if (v.log !== false) { - logger.mark(`${e.logFnc}${e.logText} ${lodash.truncate(e.msg, { length: 80 })}`) - } + if (v.log !== false) { + logger.mark(`${e.logFnc}${e.logText} ${lodash.truncate(e.msg, { length: 80 })}`) + } - /** 判断权限 */ - if (!this.filtPermission(e, v)) break a + /** 判断权限 */ + if (!this.filtPermission(e, v)) break a - try { - let res = plugin[v.fnc] && plugin[v.fnc](e) + try { + let res = plugin[v.fnc] && plugin[v.fnc](e) - let start = Date.now() + let start = Date.now() - if (util.types.isPromise(res)) res = await res + if (util.types.isPromise(res)) res = await res - if (res !== false) { - /** 设置冷却cd */ - this.setLimit(e) - if (v.log !== false) { - logger.info(`${e.logFnc} ${lodash.truncate(e.msg, { length: 80 })} 处理完成 ${Date.now() - start}ms`) - } - break a + if (res !== false) { + /** 设置冷却cd */ + this.setLimit(e) + if (v.log !== false) { + logger.info(`${e.logFnc} ${lodash.truncate(e.msg, { length: 80 })} 处理完成 ${Date.now() - start}ms`) } - } catch (error) { - logger.error(`${e.logFnc}`) - logger.error(error.stack) break a } + } catch (error) { + logger.error(`${e.logFnc}`) + logger.error(error.stack) + break a } } } } + } } /** 过滤事件 */ @@ -465,7 +464,7 @@ class PluginsLoader { e.isGuild = true } - if (e.user_id && cfg.masterQQ.includes(Number(e.user_id) || e.user_id)) { + if (e.user_id && cfg.masterQQ.includes(Number(e.user_id) || String(e.user_id))) { e.isMaster = true } @@ -511,7 +510,7 @@ class PluginsLoader { text = lodash.truncate(e.sender.card, { length: 10 }) } if (at === true) { - at = Number(e.user_id) || e.user_id + at = Number(e.user_id) || String(e.user_id) } else if (!isNaN(at)) { if (e.isGuild) { text = e.sender?.nickname @@ -539,7 +538,7 @@ class PluginsLoader { } logger.error(`发送消息错误:${msg}`) logger.error(err) - if(cfg.bot.sendmsg_error) Bot[Bot.uin].pickUser(cfg.masterQQ[0]).sendMsg(`发送消息错误:${msg}`) + if (cfg.bot.sendmsg_error) Bot[Bot.uin].pickUser(cfg.masterQQ[0]).sendMsg(`发送消息错误:${msg}`) } // 频道一下是不是频道 @@ -705,7 +704,11 @@ class PluginsLoader { let groupCfg = cfg.getGroup(e.group_id) - if (groupCfg.onlyReplyAt != 1 || !groupCfg.botAlias) return true + /** 模式0，未开启前缀 */ + if (groupCfg.onlyReplyAt == 0 || !groupCfg.botAlias) return true + + /** 模式2，非主人需带前缀或at机器人 */ + if (groupCfg.onlyReplyAt == 2 && e.isMaster) return true /** at机器人 */ if (e.atBot) return true @@ -730,10 +733,10 @@ class PluginsLoader { /** 黑名单qq */ if (other.blackQQ) { - if (other.blackQQ.includes(Number(e.user_id) || e.user_id)) { + if (other.blackQQ.includes(Number(e.user_id) || String(e.user_id))) { return false } - if (e.at && other.blackQQ.includes(Number(e.at) || e.at)) { + if (e.at && other.blackQQ.includes(Number(e.at) || String(e.at))) { return false } } @@ -741,11 +744,11 @@ class PluginsLoader { if (e.group_id) { /** 白名单群 */ if (Array.isArray(other.whiteGroup) && other.whiteGroup.length > 0) { - return other.whiteGroup.includes(Number(e.group_id) || e.group_id) + return other.whiteGroup.includes(Number(e.group_id) || String(e.group_id)) } /** 黑名单群 */ if (Array.isArray(other.blackGroup) && other.blackGroup.length > 0) { - return !other.blackGroup.includes(Number(e.group_id) || e.group_id) + return !other.blackGroup.includes(Number(e.group_id) || String(e.group_id)) } } @@ -807,12 +810,11 @@ class PluginsLoader { } } - if (plugin.handler) { lodash.forEach(plugin.handler, ({ fn, key, priority }) => { Handler.add({ ns: plugin.namespace || File.name, - key: key, + key, self: plugin, property: priority || plugin.priority || 500, fn: plugin[fn] diff --git a/plugins/genshin/apps/user.js b/plugins/genshin/apps/user.js index c5fa949..279708b 100644 --- a/plugins/genshin/apps/user.js +++ b/plugins/genshin/apps/user.js @@ -54,7 +54,7 @@ export class user extends plugin { fnc: 'checkCkStatus' }, { - reg: '^#(接受)?绑定(主|子)?(用户|账户|账号)(\\[\\w+\\]){0,2}$', + reg: '^#(接受)?绑定(主|子)?(用户|账户|账号)(\\[[a-zA-Z0-9_\\-:\\]+\\]){0,2}$', fnc: 'bindNoteUser' }, { diff --git a/plugins/genshin/model/user.js b/plugins/genshin/model/user.js index af3df67..f0f420e 100644 --- a/plugins/genshin/model/user.js +++ b/plugins/genshin/model/user.js @@ -137,17 +137,17 @@ export default class User extends base { '【#面板】【#更新面板】面板信息' ) button.push([ - { text: "#uid", callback: "#uid" }, - { text: "#我的ck", callback: "#我的ck" }, - { text: "#删除ck", callback: "#删除ck" }, - ],[ - { text: "#体力", callback: "#体力" }, - { text: "#原石", callback: "#原石" }, - { text: "#原石统计", callback: "#原石统计" }, - ],[ - { text: "#练度统计", callback: "#练度统计" }, - { text: "#面板", callback: "#面板" }, - { text: "#更新面板", callback: "#更新面板" }, + { text: '#uid', callback: '#uid' }, + { text: '#我的ck', callback: '#我的ck' }, + { text: '#删除ck', callback: '#删除ck' } + ], [ + { text: '#体力', callback: '#体力' }, + { text: '#原石', callback: '#原石' }, + { text: '#原石统计', callback: '#原石统计' } + ], [ + { text: '#练度统计', callback: '#练度统计' }, + { text: '#面板', callback: '#面板' }, + { text: '#更新面板', callback: '#更新面板' } ]) } if (mys.hasGame('sr')) { @@ -159,12 +159,12 @@ export default class User extends base { '【*面板】【*更新面板】面板信息' ) button.push([ - { text: "*uid", callback: "*uid" }, - { text: "*删除ck", callback: "*删除ck" }, - { text: "*体力", callback: "*体力" }, - ],[ - { text: "*面板", callback: "*面板" }, - { text: "*更新面板", callback: "*更新面板" }, + { text: '*uid', callback: '*uid' }, + { text: '*删除ck', callback: '*删除ck' }, + { text: '*体力', callback: '*体力' } + ], [ + { text: '*面板', callback: '*面板' }, + { text: '*更新面板', callback: '*更新面板' } ]) } msg = await common.makeForwardMsg(this.e, [[msg.join('\n'), segment.button(...button)]], '绑定成功：使用命令说明') @@ -173,16 +173,16 @@ export default class User extends base { /** 删除绑定ck */ async delCk () { - let game; + let game if (this.e.game) { - game = this.e.game; + game = this.e.game } else { - game = 'gs'; + game = 'gs' } - //判断是原神还是星铁 + // 判断是原神还是星铁 let user = await this.user() // 获取当前uid - let uidData = user.getUidData('' , game=game, this.e) + let uidData = user.getUidData('', game = game, this.e) if (!uidData || uidData.type !== 'ck' || !uidData.ltuid) { return `删除失败：当前的UID${uidData?.uid}无CK信息` } @@ -211,15 +211,15 @@ export default class User extends base { let uidList = user.getUidList(game) if (index > uidList.length) { return await this.e.reply(['uid序号输入错误', segment.button([ - { text: "删除uid", input: "#删除uid" }, - ])]) + { text: '删除uid', input: '#删除uid' } + ])]) } index = Number(index) - 1 let uidObj = uidList[index] if (uidObj.type === 'ck') { return await this.e.reply(['CK对应UID无法直接删除，请通过【#删除ck】命令来删除', segment.button([ - { text: "删除ck", callback: "#删除ck" }, - ])]) + { text: '删除ck', callback: '#删除ck' } + ])]) } await user.delRegUid(uidObj.uid, game) return await this.showUid() @@ -274,25 +274,25 @@ export default class User extends base { } }) }) - return this.e.reply([await this.e.runtime.render('genshin', 'html/user/uid-list', { uids }, { retType: "base64" }), segment.button([ - { text: "绑定UID", input: "#绑定uid" }, - { text: "切换UID", input: "#uid" }, - { text: "删除UID", input: "#删除uid" }, - ],[ - { text: "角色", callback: "#角色" }, - { text: "探索", callback: "#探索" }, - { text: "武器", callback: "#武器" }, - { text: "深渊", callback: "#深渊" }, - ],[ - { text: "统计", callback: "#练度统计" }, - { text: "面板", callback: "#面板" }, - { text: "体力", callback: "#体力" }, - { text: "原石", callback: "#原石" }, - ],[ - { text: "留影", callback: "#留影叙佳期" }, - { text: "七圣", callback: "#七圣召唤查询牌组" }, - { text: "抽卡", callback: "#抽卡记录" }, - { text: "充值", callback: "#充值记录" }, + return this.e.reply([await this.e.runtime.render('genshin', 'html/user/uid-list', { uids }, { retType: 'base64' }), segment.button([ + { text: '绑定UID', input: '#绑定uid' }, + { text: '切换UID', input: '#uid' }, + { text: '删除UID', input: '#删除uid' } + ], [ + { text: '角色', callback: '#角色' }, + { text: '探索', callback: '#探索' }, + { text: '武器', callback: '#武器' }, + { text: '深渊', callback: '#深渊' } + ], [ + { text: '统计', callback: '#练度统计' }, + { text: '面板', callback: '#面板' }, + { text: '体力', callback: '#体力' }, + { text: '原石', callback: '#原石' } + ], [ + { text: '留影', callback: '#留影叙佳期' }, + { text: '七圣', callback: '#七圣召唤查询牌组' }, + { text: '抽卡', callback: '#抽卡记录' }, + { text: '充值', callback: '#充值记录' } ])]) } @@ -303,7 +303,7 @@ export default class User extends base { let uidList = user.getUidList(game) if (index > uidList.length) { return await this.e.reply(['uid序号输入错误', segment.button([ - { text: "切换uid", input: "#uid" }, + { text: '切换uid', input: '#uid' } ])]) } index = Number(index) - 1 @@ -500,7 +500,7 @@ export default class User extends base { let user = await this.user() if (!user.hasCk) { this.e.reply(['当前尚未绑定Cookie', segment.button([ - { text: "帮助", input: "#Cookie帮助" }, + { text: '帮助', input: '#Cookie帮助' } ])]) } let mys = user.getMysUser(this.e) @@ -540,9 +540,9 @@ export default class User extends base { } await this.e.reply([cks.join('\n----\n'), segment.button([ - { text: "绑定UID", input: "#绑定uid" }, - { text: "切换UID", input: "#uid" }, - { text: "删除UID", input: "#删除uid" }, + { text: '绑定UID', input: '#绑定uid' }, + { text: '切换UID', input: '#uid' }, + { text: '删除UID', input: '#删除uid' } ])], false, { at: true }) } @@ -591,13 +591,13 @@ export default class User extends base { e.reply(`已删除${count}个子用户...`) await redis.del(`Yz:NoteUser:subIds:${id}`) } else { - e.reply(`当前用户没有子用户，通过【#绑定用户】可绑定子用户...`) + e.reply('当前用户没有子用户，通过【#绑定用户】可绑定子用户...') } } return true } msg = msg.replace(/^#\s*(接受)?绑定(主|子)?(用户|账户|账号)/, '') - let idRet = /^\[(\w{5,})](?:\[(\w+)])?$/.exec(msg) + let idRet = /^\[([a-zA-Z0-9-]{5,})](?:\[([a-zA-Z0-9-]+)])?$/.exec(msg) if (idRet && idRet[1]) { let mainId = idRet[1] let currId = id.toString() diff --git a/plugins/other/restart.js b/plugins/other/restart.js index 8aa35f6..fb7d077 100644 --- a/plugins/other/restart.js +++ b/plugins/other/restart.js @@ -43,14 +43,8 @@ export class Restart extends plugin { Bot[uin].pickUser(restart.id).sendMsg(msg) } } catch (error) { - /** 发送失败后等待5s重试一次，适配器可能没连接bot */ - await new Promise((resolve) => setTimeout(resolve, 5000)) - msg = `重启成功：耗时${(time + 5).toFixed(2)}秒` - if (restart.isGroup) { - Bot[uin].pickGroup(restart.id).sendMsg(msg) - } else { - Bot[uin].pickUser(restart.id).sendMsg(msg) - } + /** 不发了，发不出去... */ + logger.debug(error) } redis.del(this.key) } @@ -130,4 +124,4 @@ export class Restart extends plugin { } }) } -} \ No newline at end of file +}