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)