From 3cec0cad64b0271191f604412fcb66ded5002b18 Mon Sep 17 00:00:00 2001
From: mol <hiiragi10073@163.com>
Date: Wed, 13 Dec 2023 23:59:35 +0800
Subject: [PATCH] test

---
 .drone.yml                     | 2 +-
 app.js                         | 2 --
 handlers/sendForwardMessage.js | 7 ++++---
 handlers/sendMessage.js        | 3 ++-
 handlers/sendMessage2.js       | 7 ++++---
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 41a7af2..190093b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -64,6 +64,6 @@ steps:
         - list=$(docker ps -a | grep mol-robot* | awk '{print $1}')
         - test "$list" = "" && echo "none mol-robot containers running" || docker stop $list && docker container rm $list
         # 过滤出dockerImages的id, 删除none镜像
-        - docker run -d  -p 16808:8080 --name=mirai_robot_${DRONE_BUILD_NUMBER} --env-file /mnt/data/opt/mol-robot/.env git.liliyamol.cn:8081/mol/mol-robot:latest
+        - docker run -d  -p 16808:8080 --name=mol-robot_${DRONE_BUILD_NUMBER} --env-file /mnt/data/opt/mol-robot/.env git.liliyamol.cn:8081/mol/mol-robot:latest
         - docker rmi $(docker images | grep "none" | awk '{print $3}')
         - echo ==-----==部署成功==-----==
diff --git a/app.js b/app.js
index 548e07a..219aff7 100644
--- a/app.js
+++ b/app.js
@@ -1,5 +1,3 @@
-import fs from 'fs';
-import { join } from 'path';
 import CreateBot from '#root/bot/index.js';
 import CreateWebhookServer from '#root/http/index.js';
 import logger from '#root/utils/logger.js';
diff --git a/handlers/sendForwardMessage.js b/handlers/sendForwardMessage.js
index 89d57c6..71820bf 100644
--- a/handlers/sendForwardMessage.js
+++ b/handlers/sendForwardMessage.js
@@ -1,6 +1,7 @@
-import { Message } from 'mirai-js';
+import pkg from 'mirai-js';
 import { defaultSubs } from '#root/config/index.js';
 import logger from '#root/utils/logger.js';
+const { Message } = pkg
 
 export default function sendForwardMessage(bot, data) {
   logger('开始执行handler: sendForwardMessage');
@@ -23,8 +24,8 @@ export default 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);
     }
     // 添加来源地址
diff --git a/handlers/sendMessage.js b/handlers/sendMessage.js
index 62b8b6f..436dae4 100644
--- a/handlers/sendMessage.js
+++ b/handlers/sendMessage.js
@@ -1,6 +1,7 @@
-import { Message } from 'mirai-js';
+import pkg from 'mirai-js';
 import { defaultSubs } from '#root/config/index.js';
 import logger from '#root/utils/logger.js';
+const { Message } = pkg
 
 // 方法已废弃
 export default function sendMessage(bot, data) {
diff --git a/handlers/sendMessage2.js b/handlers/sendMessage2.js
index b40ca65..0c49fcc 100644
--- a/handlers/sendMessage2.js
+++ b/handlers/sendMessage2.js
@@ -1,6 +1,7 @@
-import { Message } from 'mirai-js';
+import pkg from 'mirai-js';
 import { defaultSubs } from '#root/config/index.js';
 import logger from '#root/utils/logger.js';
+const { Message } = pkg
 
 export default function sendMessage2(bot, data) {
   logger('开始执行handler: sendMessage2');
@@ -30,8 +31,8 @@ export default 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);
   }
   // 添加来源地址