diff --git a/apps/reportBots.js b/apps/reportBots.js index 88a3b96..eb1b4ee 100644 --- a/apps/reportBots.js +++ b/apps/reportBots.js @@ -55,9 +55,9 @@ export default class ReportBots extends plugin { message: msg.toString(), }; const url = configControl.get('coreConfig')?.coreUrl; - const returnData = await axios.post(url, sendData); - if (returnData?.success) { - return await e.reply(`操作成功:${returnData?.data.toString()}`); + const returnData = await axios.post(`${url}/api/bot/broadcast`, sendData); + if (returnData?.data?.success) { + return await e.reply(`操作成功:${returnData?.data.data?.toString()}`); } else { return await e.reply(`广播出现错误,请检查日志..`); } diff --git a/models/ws/handler.js b/models/ws/handler.js index 4a3b5c7..89a02a7 100644 --- a/models/ws/handler.js +++ b/models/ws/handler.js @@ -10,7 +10,6 @@ class Handler { ['error', this.handleError.bind(this)], ['getGroupInfo', this.handleGetGroupInfo.bind(this)], ['sendMessage', this.handleSendMessage.bind(this)], - ['broadcastMessage', this.broadcastMessage.bind(this)], ['reportBots', this.reportBots.bind(this)], ]); } @@ -81,23 +80,12 @@ class Handler { */ // TODO 测试可用性 async handleSendMessage(client, msg) { - const botId = msg.data?.botId; - const groupId = msg.data?.groupId; - const message = msg.data?.message; + const botId = Number(msg.data?.botId); + const groupId = Number(msg.data?.groupId); + const message = msg.data?.message?.toString(); await botControl.sendMessage(botId, message, groupId); } - /** - * 广播消息,感觉没啥用,用core的广播代替了 - * @param client - * @param msg - * @returns {Promise} - */ - async broadcastMessage(client, msg) { - const message = msg.data?.message; - await botControl.broadcastMessage(message); - } - async reportBots(client, msg) { await botControl.reportBots(); }