diff --git a/apps/events/input.js b/apps/events/input.js index f16ed42..4c1c5a9 100644 --- a/apps/events/input.js +++ b/apps/events/input.js @@ -10,5 +10,5 @@ Bot.on?.("internal.input", async(e) => { `[事件(${e.self_id}) - 对方${e.end ? "输入完毕" : "正在输入"}]\n`, `好友账号:${e.user_id}` ] - await common.sendMasterMsg(msg) + await common.sendMasterMsg(msg, e.bot.uin) }) diff --git a/apps/events/message.js b/apps/events/message.js index a3be394..e119983 100644 --- a/apps/events/message.js +++ b/apps/events/message.js @@ -170,8 +170,8 @@ Bot.on?.("message", async(e) => { return false } // 发送消息 - await common.sendMasterMsg(msg) - if (forwardMsg) await common.sendMasterMsg(forwardMsg) + await common.sendMasterMsg(msg, e.bot.uin) + if (forwardMsg) await common.sendMasterMsg(forwardMsg, e.bot.uin) }) // 特殊消息处理 /** diff --git a/apps/events/notice_friend.js b/apps/events/notice_friend.js index b5ae719..44e3430 100644 --- a/apps/events/notice_friend.js +++ b/apps/events/notice_friend.js @@ -86,8 +86,8 @@ Bot.on?.("notice.friend", async(e) => { default: return false } - await common.sendMasterMsg(msg) - if (forwardMsg) await common.sendMasterMsg(forwardMsg) + await common.sendMasterMsg(msg, e.bot.uin) + if (forwardMsg) await common.sendMasterMsg(forwardMsg, e.bot.uin) } ) diff --git a/apps/events/notice_group.js b/apps/events/notice_group.js index a46bb62..9093667 100644 --- a/apps/events/notice_group.js +++ b/apps/events/notice_group.js @@ -284,6 +284,6 @@ Bot.on?.("notice.group", async(e) => { default: return false } - await common.sendMasterMsg(msg) - if (forwardMsg) await common.sendMasterMsg(forwardMsg) + await common.sendMasterMsg(msg, bot.uin) + if (forwardMsg) await common.sendMasterMsg(forwardMsg, bot.uin) }) diff --git a/apps/events/request.js b/apps/events/request.js index cf3ed9b..46786d1 100644 --- a/apps/events/request.js +++ b/apps/events/request.js @@ -80,5 +80,5 @@ segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${e.user_id}`), } break } - await common.sendMasterMsg(msg) + await common.sendMasterMsg(msg, e.bot.uin) }) diff --git a/components/Config.js b/components/Config.js index c66f1d4..99fa246 100644 --- a/components/Config.js +++ b/components/Config.js @@ -53,6 +53,10 @@ class Config { return cfg.masterQQ } + get master() { + return cfg.master + } + /** 获取全局设置 */ get whole() { return this.getDefOrConfig("whole") diff --git a/lib/common/sendMsgMod.js b/lib/common/sendMsgMod.js index 484cc6d..6c64bf6 100644 --- a/lib/common/sendMsgMod.js +++ b/lib/common/sendMsgMod.js @@ -7,17 +7,23 @@ export default class { /** * 给主人发消息 * @param msg + * @param botUin */ - async sendMasterMsg(msg) { + async sendMasterMsg(msg, botUin = Bot.uin) { + let masterQQ = Config.masterQQ + if (Config.master) { + let master = Config.master[botUin] + masterQQ = (!_.isEmpty(master) && master) || Config.masterQQ + } if (Config.whole.notificationsAll) { // 发送全部管理 - for (let index of Config.masterQQ) { - await common.relpyPrivate(index, msg) + for (let index of masterQQ) { + await common.relpyPrivate(index, msg, botUin) await common.sleep(5000) } } else { // 发给第一个管理 - await common.relpyPrivate(Config.masterQQ[0], msg) + await common.relpyPrivate(masterQQ[0], msg, botUin) } }