From 7f1fa85dbb16838ddb0f5d8c14646f8088626115 Mon Sep 17 00:00:00 2001
From: mol <yunying_mol@163.com>
Date: Mon, 31 Jul 2023 14:04:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 handlers/sendForwardMessage.js | 30 +++++++++++++++---------------
 handlers/sendMessage2.js       | 11 ++++++++---
 package.json                   |  4 ++--
 utils/logger.js                |  6 +++---
 4 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/handlers/sendForwardMessage.js b/handlers/sendForwardMessage.js
index 28d8853..06e10ba 100644
--- a/handlers/sendForwardMessage.js
+++ b/handlers/sendForwardMessage.js
@@ -23,8 +23,8 @@ module.exports = function sendForwardMessage(bot, data) {
     if (imgUrls) {
       Array.isArray(imgUrls)
         ? imgUrls
-            .slice(0, process.env.IMG_NUMBER_IN_ONE_MESSAGE || 1)
-            .forEach((url) => msgContent.addImageUrl(url))
+          .slice(0, process.env.IMG_NUMBER_IN_ONE_MESSAGE || 1)
+          .forEach((url) => msgContent.addImageUrl(url))
         : msgContent.addImageUrl(imgUrls);
     }
     // 添加来源地址
@@ -34,7 +34,7 @@ module.exports = function sendForwardMessage(bot, data) {
     forwardMsgContent.addForwardNode({
       senderId: process.env.QQ,
       time: 0,
-      senderName: process.env.FORWARD_SENDER_NAME || '莉娜·模儿',
+      senderName: from || process.env.FORWARD_SENDER_NAME || '莉娜·模儿',
       messageChain: msgContent,
     });
   }
@@ -42,23 +42,23 @@ module.exports = function sendForwardMessage(bot, data) {
   Array.isArray(groups) &&
     groups.forEach((groupId) => {
       // 添加消息来源
-      if (from) {
-        bot.sendMessageToGroup(
-          groupId,
-          new Message().addText(`${from}更新啦！快来看吧。`),
-        );
-      }
+      // if (from) {
+      //   bot.sendMessageToGroup(
+      //     groupId,
+      //     new Message().addText(`${from}更新啦！快来看吧。`),
+      //   );
+      // }
       bot.sendMessageToGroup(groupId, forwardMsgContent);
     });
   Array.isArray(users) &&
     users.forEach((qq) => {
       // 添加消息来源
-      if (from) {
-        bot.sendMessageToFriend(
-          qq,
-          new Message().addText(`${from}更新啦！快来看吧。`),
-        );
-      }
+      // if (from) {
+      //   bot.sendMessageToFriend(
+      //     qq,
+      //     new Message().addText(`${from}更新啦！快来看吧。`),
+      //   );
+      // }
       bot.sendMessageToFriend(qq, forwardMsgContent);
     });
 };
diff --git a/handlers/sendMessage2.js b/handlers/sendMessage2.js
index 4d108ba..e682e55 100644
--- a/handlers/sendMessage2.js
+++ b/handlers/sendMessage2.js
@@ -5,7 +5,7 @@ module.exports = function sendMessage2(bot, data) {
   logger('开始执行handler: sendMessage2');
   const { from, messages, imgUrls, subs, originUrl, at } = data;
   const subscriptions = subs || defaultSubs;
-  const { groups, users } = subscriptions;
+  let { groups, users } = subscriptions;
   const msgContent = new Message();
   // 添加@信息
   if (at) {
@@ -29,8 +29,8 @@ module.exports = function sendMessage2(bot, data) {
   if (imgUrls) {
     Array.isArray(imgUrls)
       ? imgUrls
-          .slice(0, process.env.IMG_NUMBER_IN_ONE_MESSAGE || 1)
-          .forEach((url) => msgContent.addImageUrl(url))
+        .slice(0, process.env.IMG_NUMBER_IN_ONE_MESSAGE || 1)
+        .forEach((url) => msgContent.addImageUrl(url))
       : msgContent.addImageUrl(imgUrls);
   }
   // 添加来源地址
@@ -38,10 +38,15 @@ module.exports = function sendMessage2(bot, data) {
     msgContent.addText(`点击查看详情：${originUrl}`);
   }
 
+  groups = groups ? groups.split(',') : []
+  logger(groups)
   Array.isArray(groups) &&
     groups.forEach((groupId) => {
       bot.sendMessageToGroup(groupId, msgContent);
     });
+
+  users = users ? users.split(',') : []
+  logger(users)
   Array.isArray(users) &&
     users.forEach((qq) => {
       bot.sendMessageToFriend(qq, msgContent);
diff --git a/package.json b/package.json
index 2f44c39..a1a44d7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mirai-middle-server",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "使用miraijs开发,用于连接kuginn等外部服务与mirai通信的中转服务器",
   "author": "mol",
   "main": "app.js",
@@ -15,4 +15,4 @@
   "devDependencies": {
     "dotenv": "^16.1.1"
   }
-}
+}
\ No newline at end of file
diff --git a/utils/logger.js b/utils/logger.js
index c7af3f4..7e367fb 100644
--- a/utils/logger.js
+++ b/utils/logger.js
@@ -16,10 +16,10 @@ function logger(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;