From 96b3725b7e3a6f6791a9b93fbd3caaa56e4f5c97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9F=8C=8C?= <Time.Rain.Star.Sky@Gmail.com>
Date: Wed, 26 Jul 2023 10:35:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                 | 2 +-
 plugins/adapter/ComWeChat.js | 4 ++++
 plugins/other/update.js      | 9 +++------
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 2e4363e..7a9d301 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "log4js": "^6.9.1",
     "md5": "^2.3.0",
     "moment": "^2.29.4",
-    "node-fetch": "^3.3.1",
+    "node-fetch": "^3.3.2",
     "node-schedule": "^2.1.1",
     "node-xlsx": "^0.23.0",
     "oicq": "link:lib/modules/oicq",
diff --git a/plugins/adapter/ComWeChat.js b/plugins/adapter/ComWeChat.js
index fd45963..25fede0 100644
--- a/plugins/adapter/ComWeChat.js
+++ b/plugins/adapter/ComWeChat.js
@@ -108,6 +108,10 @@ Bot.adapter.push(new class ComWeChatAdapter {
         case "reply":
           continue
           break
+        case "wx.emoji":
+          break
+        case "wx.link":
+          break
         default:
           i = { type: "text", data: { text: JSON.stringify(i) }}
       }
diff --git a/plugins/other/update.js b/plugins/other/update.js
index e168f8c..e43e1e5 100644
--- a/plugins/other/update.js
+++ b/plugins/other/update.js
@@ -105,12 +105,9 @@ export class update extends plugin {
       cm = `git reset --hard && git pull --rebase --allow-unrelated-histories`
     }
 
-    if (plugin) {
-      if (type == '强制更新')
-        cm = `cd "plugins/${plugin}" && git reset --hard && git pull --rebase --allow-unrelated-histories`
-      else
-        cm = `cd "plugins/${plugin}" && git pull --no-rebase`
-    }
+    if (plugin)
+      cm = `cd "plugins/${plugin}" && ${cm}`
+
 
     this.oldCommitId = await this.getcommitId(plugin)