From 0a9da6d6baf69d243ceddada322299e6318d5343 Mon Sep 17 00:00:00 2001
From: zhiyu1998 <renzhiyu0416@qq.com>
Date: Wed, 15 Feb 2023 14:36:59 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix:=20#R=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/update.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/apps/update.js b/apps/update.js
index efa43b7..c0403d9 100644
--- a/apps/update.js
+++ b/apps/update.js
@@ -130,4 +130,22 @@ export class update extends plugin {
         logger.info(`${pluginName || "Yunzai-Bot"}更新日志，共${line}条\n${log}`);
         return log;
     }
+
+    async gitErr (err, stdout) {
+        let msg = '更新失败！'
+        let errMsg = err.toString()
+        stdout = stdout.toString()
+        if (errMsg.includes('Timed out')) {
+            await this.reply(msg + `\n连接超时：${errMsg.match(/'(.+?)'/g)[0].replace(/'/g, '')}`)
+        } else if (/Failed to connect|unable to access/g.test(errMsg)) {
+            await this.reply(msg + `\n连接失败：${errMsg.match(/'(.+?)'/g)[0].replace(/'/g, '')}`)
+        } else if (errMsg.includes('be overwritten by merge')) {
+            await this.reply(msg + `存在冲突：\n${errMsg}\n` + '请解决冲突后再更新，或者执行#强制更新，放弃本地修改')
+        } else if (stdout.includes('CONFLICT')) {
+            await this.reply([msg + '存在冲突\n', errMsg, stdout, '\n请解决冲突后再更新，或者执行#强制更新，放弃本地修改'])
+        } else {
+            await this.reply([errMsg, stdout])
+        }
+    }
+
 }