From e532a90fcd340f1c75b2d0fb3466bc5253885ba2 Mon Sep 17 00:00:00 2001
From: zhiyu1998 <542716863@qq.com>
Date: Wed, 8 May 2024 16:33:40 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix:=20V1.6.7-lts=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Dnetease=E4=B8=8B=E8=BD=BD=E9=83=A8=E5=88=86=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 修复函数`downloadMp3`导致的一系列下载问题
2. 修复netease music下载
3. 修复皮皮虾的问题
4. 修正部分注释
---
 apps/tools.js | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/apps/tools.js b/apps/tools.js
index b3db361..fda850d 100644
--- a/apps/tools.js
+++ b/apps/tools.js
@@ -1057,11 +1057,7 @@ export class tools extends plugin {
                 // 发送语音
                 // e.reply(segment.record(path));
                 // 判断是不是icqq
-                if (e.bot?.sendUni) {
-                    e.group.fs.upload(path);
-                } else {
-                    e.group.sendFile(path);
-                }
+                await this.uploadGroupFile(e, path);
                 await checkAndRemoveFile(path);
             }).catch(err => {
                 logger.error(`下载音乐失败，错误信息为: ${ err.message }`);
@@ -1782,14 +1778,23 @@ export class tools extends plugin {
         const videoSize = (stats.size / (1024 * 1024)).toFixed(2);
         if (videoSize > videoSizeLimit) {
             e.reply(`当前视频大小：${ videoSize }MB，\n大于设置的最大限制，\n改为上传群文件`);
-            // 判断是不是icqq
-            if (e.bot?.sendUni) {
-                e.group.fs.upload(path);
-            } else {
-                e.group.sendFile(path);
-            }
+            await this.uploadGroupFile(e, path);
         } else {
             e.reply(segment.video(path));
         }
     }
+
+    /**
+     * 上传到群文件
+     * @param e             交互事件
+     * @param path          上传的文件所在路径
+     * @return {Promise<void>}
+     */
+    async uploadGroupFile(e, path) {
+        if (e.bot?.sendUni) {
+            e.group.fs.upload(path);
+        } else {
+            e.group.sendFile(path);
+        }
+    }
 }