diff --git a/app/Tasks/BotReceiveMsgTask.php b/app/Tasks/BotReceiveMsgTask.php
index cec726633..c3e172a20 100644
--- a/app/Tasks/BotReceiveMsgTask.php
+++ b/app/Tasks/BotReceiveMsgTask.php
@@ -66,7 +66,7 @@ class BotReceiveMsgTask extends AbstractTask
         }
 
         // 判断消息是否存在
-        $msg = WebSocketDialogMsg::with(['user', 'webSocketDialog'])->find($this->msgId);
+        $msg = WebSocketDialogMsg::with(['user'])->find($this->msgId);
         if (empty($msg)) {
             return;
         }
diff --git a/app/Tasks/WebSocketDialogMsgTask.php b/app/Tasks/WebSocketDialogMsgTask.php
index fd3507aa3..cd00242b9 100644
--- a/app/Tasks/WebSocketDialogMsgTask.php
+++ b/app/Tasks/WebSocketDialogMsgTask.php
@@ -138,11 +138,11 @@ class WebSocketDialogMsgTask extends AbstractTask
                     'dot' => $dot,
                     'updated' => $updated,
                 ];
-            }
-            // 机器人收到消处理
-            $botUser = User::whereUserid($userid)->whereBot(1)->first();
-            if ($botUser) {  // 避免机器人处理自己发送的消息
-                $this->endArray[] = new BotReceiveMsgTask($botUser->userid, $msg->id, $mentions, $this->client);
+                // 机器人收到消处理
+                $botUser = User::whereUserid($userid)->whereBot(1)->first();
+                if ($botUser) {  // 避免机器人处理自己发送的消息
+                    $this->endArray[] = new BotReceiveMsgTask($botUser->userid, $msg->id, $mentions, $this->client);
+                }
             }
         }
         // 更新已发送数量
diff --git a/resources/assets/js/pages/manage/application.vue b/resources/assets/js/pages/manage/application.vue
index ce051bae0..9c677af75 100644
--- a/resources/assets/js/pages/manage/application.vue
+++ b/resources/assets/js/pages/manage/application.vue
@@ -359,6 +359,7 @@ import SystemAiAssistant from "./setting/components/SystemAiAssistant";
 import emitter from "../../store/events";
 import {AIBotList, AIModelNames} from "../../utils/ai";
 import ImgUpload from "../../components/ImgUpload.vue";
+import {webhookEventOptions} from "../../utils/other";
 
 export default {
     components: {
@@ -385,12 +386,7 @@ export default {
             mybotModifyShow: false,
             mybotModifyData: {},
             mybotModifyLoad: 0,
-            webhookEventOptions: [
-                {value: 'message', label: '接收消息'},
-                {value: 'dialog_open', label: '打开会话'},
-                {value: 'member_join', label: '成员加入'},
-                {value: 'member_leave', label: '成员退出'},
-            ],
+            webhookEventOptions,
             //
             aibotShow: false,
             aibotList: AIBotList,
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index abe39b040..92e366866 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -690,6 +690,7 @@ import emitter from "../../../store/events";
 import Forwarder from "./Forwarder/index.vue";
 import {throttle} from "lodash";
 import transformEmojiToHtml from "../../../utils/emoji";
+import {webhookEventOptions} from "../../../utils/other";
 
 export default {
     name: "DialogWrapper",
@@ -775,12 +776,7 @@ export default {
             modifyAiShow: false,
             modifyData: {},
             modifyLoad: 0,
-            webhookEventOptions: [
-                {value: 'message', label: '接收消息'},
-                {value: 'dialog_open', label: '打开会话'},
-                {value: 'member_join', label: '成员加入'},
-                {value: 'member_leave', label: '成员退出'},
-            ],
+            webhookEventOptions,
             webhookEvents: [],
 
             openId: 0,
diff --git a/resources/assets/js/utils/other.js b/resources/assets/js/utils/other.js
new file mode 100644
index 000000000..11490ba95
--- /dev/null
+++ b/resources/assets/js/utils/other.js
@@ -0,0 +1,8 @@
+const webhookEventOptions = [
+    { value: "message", label: "接收消息" },
+    { value: "dialog_open", label: "打开会话" },
+    { value: "member_join", label: "成员加入" },
+    { value: "member_leave", label: "成员退出" },
+];
+
+export { webhookEventOptions };