mol/mol-robot
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 2 Wiki Activity

优化

Browse Source
This commit is contained in:
mol
2023-07-31 14:04:50 +08:00
parent 9b8dafefb1
commit 7f1fa85dbb
4 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
handlers/sendForwardMessage.js
View File

@ -23,8 +23,8 @@ module.exports = function sendForwardMessage(bot, data) {
if (imgUrls) { if (imgUrls) {
Array.isArray(imgUrls) Array.isArray(imgUrls)
? imgUrls ? imgUrls
.slice(0, process.env.IMG_NUMBER_IN_ONE_MESSAGE || 1) .slice(0, process.env.IMG_NUMBER_IN_ONE_MESSAGE || 1)
.forEach((url) => msgContent.addImageUrl(url)) .forEach((url) => msgContent.addImageUrl(url))
: msgContent.addImageUrl(imgUrls); : msgContent.addImageUrl(imgUrls);
} }
// 添加来源地址 // 添加来源地址
@ -34,7 +34,7 @@ module.exports = function sendForwardMessage(bot, data) {
forwardMsgContent.addForwardNode({ forwardMsgContent.addForwardNode({
senderId: process.env.QQ, senderId: process.env.QQ,
time: 0, time: 0,
senderName: process.env.FORWARD_SENDER_NAME || '莉娜·模儿', senderName: from || process.env.FORWARD_SENDER_NAME || '莉娜·模儿',
messageChain: msgContent, messageChain: msgContent,
}); });
} }
@ -42,23 +42,23 @@ module.exports = function sendForwardMessage(bot, data) {
Array.isArray(groups) && Array.isArray(groups) &&
groups.forEach((groupId) => { groups.forEach((groupId) => {
// 添加消息来源 // 添加消息来源
if (from) { // if (from) {
bot.sendMessageToGroup( // bot.sendMessageToGroup(
groupId, // groupId,
new Message().addText(`${from}更新啦！快来看吧。`), // new Message().addText(`${from}更新啦！快来看吧。`),
); // );
} // }
bot.sendMessageToGroup(groupId, forwardMsgContent); bot.sendMessageToGroup(groupId, forwardMsgContent);
}); });
Array.isArray(users) && Array.isArray(users) &&
users.forEach((qq) => { users.forEach((qq) => {
// 添加消息来源 // 添加消息来源
if (from) { // if (from) {
bot.sendMessageToFriend( // bot.sendMessageToFriend(
qq, // qq,
new Message().addText(`${from}更新啦！快来看吧。`), // new Message().addText(`${from}更新啦！快来看吧。`),
); // );
} // }
bot.sendMessageToFriend(qq, forwardMsgContent); bot.sendMessageToFriend(qq, forwardMsgContent);
}); });
}; };

11
handlers/sendMessage2.js
View File

@ -5,7 +5,7 @@ module.exports = function sendMessage2(bot, data) {
logger('开始执行handler: sendMessage2'); logger('开始执行handler: sendMessage2');
const { from, messages, imgUrls, subs, originUrl, at } = data; const { from, messages, imgUrls, subs, originUrl, at } = data;
const subscriptions = subs || defaultSubs; const subscriptions = subs || defaultSubs;
const { groups, users } = subscriptions; let { groups, users } = subscriptions;
const msgContent = new Message(); const msgContent = new Message();
// 添加@信息 // 添加@信息
if (at) { if (at) {
@ -29,8 +29,8 @@ module.exports = function sendMessage2(bot, data) {
if (imgUrls) { if (imgUrls) {
Array.isArray(imgUrls) Array.isArray(imgUrls)
? imgUrls ? imgUrls
.slice(0, process.env.IMG_NUMBER_IN_ONE_MESSAGE || 1) .slice(0, process.env.IMG_NUMBER_IN_ONE_MESSAGE || 1)
.forEach((url) => msgContent.addImageUrl(url)) .forEach((url) => msgContent.addImageUrl(url))
: msgContent.addImageUrl(imgUrls); : msgContent.addImageUrl(imgUrls);
} }
// 添加来源地址 // 添加来源地址
@ -38,10 +38,15 @@ module.exports = function sendMessage2(bot, data) {
msgContent.addText(`点击查看详情：${originUrl}`); msgContent.addText(`点击查看详情：${originUrl}`);
} }
groups = groups ? groups.split(',') : []
logger(groups)
Array.isArray(groups) && Array.isArray(groups) &&
groups.forEach((groupId) => { groups.forEach((groupId) => {
bot.sendMessageToGroup(groupId, msgContent); bot.sendMessageToGroup(groupId, msgContent);
}); });
users = users ? users.split(',') : []
logger(users)
Array.isArray(users) && Array.isArray(users) &&
users.forEach((qq) => { users.forEach((qq) => {
bot.sendMessageToFriend(qq, msgContent); bot.sendMessageToFriend(qq, msgContent);

4
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "mirai-middle-server", "name": "mirai-middle-server",
"version": "1.1.4", "version": "1.1.5",
"description": "使用miraijs开发,用于连接kuginn等外部服务与mirai通信的中转服务器", "description": "使用miraijs开发,用于连接kuginn等外部服务与mirai通信的中转服务器",
"author": "mol", "author": "mol",
"main": "app.js", "main": "app.js",
@ -15,4 +15,4 @@
"devDependencies": { "devDependencies": {
"dotenv": "^16.1.1" "dotenv": "^16.1.1"
} }
} }

6
utils/logger.js
View File

@ -16,10 +16,10 @@ function logger(message) {
info(message); info(message);
} }
logger.prototype.warning = warning; logger.warning = warning;
logger.prototype.info = info; logger.info = info;
logger.prototype.error = error; logger.error = error;
module.exports = logger; module.exports = logger;