From 7b1fe3e40242f0a12da568a867fc126314b300f8 Mon Sep 17 00:00:00 2001
From: Jerryplusy <Jerryplusy@outlook.com>
Date: Sun, 5 Oct 2025 11:46:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/welcome.js | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/apps/welcome.js b/apps/welcome.js
index d07d329..32341bf 100644
--- a/apps/welcome.js
+++ b/apps/welcome.js
@@ -15,17 +15,21 @@ export class welcomeNewcomer extends plugin {
    * @returns {Promise<void>}
    */
   async accept(e) {
-    if (e.user_id === e.self_id) return;
-    const groupId = e.group_id;
-    const cdKey = `Yz:newcomers:${groupId}`;
-    if (await redis.get(cdKey)) return;
-    await redis.set(cdKey, '1', { EX: 30 });
-    const allCfg = configControl.get('newcomer') || {};
-    const cfg = allCfg[groupId] || {};
-    const msgList = [segment.at(e.user_id)];
-    if (cfg.text) msgList.push(cfg.text);
-    if (cfg.image) msgList.push(segment.image(cfg.image));
-    if (!cfg.text && !cfg.image) msgList.push('欢迎新人~！');
-    await e.reply(msgList);
+    try {
+      if (e.user_id === e.self_id) return;
+      const groupId = e.group_id;
+      const cdKey = `Yz:newcomers:${groupId}`;
+      if (await redis.get(cdKey)) return;
+      await redis.set(cdKey, '1', { EX: 30 });
+      const allCfg = configControl.get('newcomer') || {};
+      const cfg = allCfg[groupId] || {};
+      const msgList = [segment.at(e.user_id)];
+      if (cfg.text) msgList.push(cfg.text);
+      if (cfg.image) msgList.push(segment.image(cfg.image));
+      if (!cfg.text && !cfg.image) msgList.push('欢迎新人~！');
+      await e.reply(msgList);
+    } catch (e) {
+      return e.reply('加群欢迎出现错误，请重新设置加群欢迎', true);
+    }
   }
 }