From e545d8d1cd1532d1963ef53d4e3cb24f3d304a98 Mon Sep 17 00:00:00 2001
From: linyuchen <lin.yu.chen@foxmail.com>
Date: Tue, 6 Feb 2024 15:17:01 +0800
Subject: [PATCH] fix: report self

---
 manifest.json             | 2 +-
 src/main/main.ts          | 2 +-
 src/ntqqapi/hook.ts       | 2 +-
 src/onebot11/construct.ts | 6 +++---
 src/server/httpserver.ts  | 6 ++++++
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/manifest.json b/manifest.json
index 6ac7571..a35288a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -4,7 +4,7 @@
     "name": "LLOneBot",
     "slug": "LLOneBot",
     "description": "LiteLoaderQQNT的OneBotApi",
-    "version": "2.4.1",
+    "version": "2.5.0",
     "thumbnail": "./icon.png",
     "authors": [{
         "name": "linyuchen",
diff --git a/src/main/main.ts b/src/main/main.ts
index 8bd3457..b7e1f25 100644
--- a/src/main/main.ts
+++ b/src/main/main.ts
@@ -171,7 +171,7 @@ function onLoad() {
         for (const message of payload.msgList) {
             OB11Construct.constructMessage(message).then((msg) => {
                 postMsg(msg);
-            });
+            }).catch(e=>log("constructMessage error: ", e.toString()));
         }
     })
 }
diff --git a/src/ntqqapi/hook.ts b/src/ntqqapi/hook.ts
index 9a077e9..7be53ac 100644
--- a/src/ntqqapi/hook.ts
+++ b/src/ntqqapi/hook.ts
@@ -34,7 +34,7 @@ export function hookNTQQApiReceive(window: BrowserWindow) {
         if (args?.[1] instanceof Array) {
             for (let receiveData of args?.[1]) {
                 const ntQQApiMethodName = receiveData.cmdName;
-                log(`received ntqq api message: ${channel} ${ntQQApiMethodName}`, JSON.stringify(receiveData))
+                // log(`received ntqq api message: ${channel} ${ntQQApiMethodName}`, JSON.stringify(receiveData))
                 for (let hook of receiveHooks) {
                     if (hook.method === ntQQApiMethodName) {
                         hook.hookFunc(receiveData.payload);
diff --git a/src/onebot11/construct.ts b/src/onebot11/construct.ts
index fd32c18..7037408 100644
--- a/src/onebot11/construct.ts
+++ b/src/onebot11/construct.ts
@@ -58,10 +58,10 @@ export class OB11Construct {
                     message_data["data"]["mention"] = "all"
                     message_data["data"]["qq"] = "all"
                 } else {
-                    let uid = element.textElement.atNtUid
+                    let uid = element.textElement.atUid
                     let atMember = getGroupMember(msg.peerUin, uid)
-                    message_data["data"]["mention"] = atMember!.uin
-                    message_data["data"]["qq"] = atMember!.uin
+                    message_data["data"]["mention"] = atMember?.uin
+                    message_data["data"]["qq"] = atMember?.uin
                 }
             } else if (element.textElement) {
                 message_data["type"] = "text"
diff --git a/src/server/httpserver.ts b/src/server/httpserver.ts
index 105aa20..5204853 100644
--- a/src/server/httpserver.ts
+++ b/src/server/httpserver.ts
@@ -267,6 +267,12 @@ export function startExpress(port: number) {
 
 
 export function postMsg(msg: OB11Message) {
+    const {reportSelfMessage} = getConfigUtil().getConfig()
+    if (!reportSelfMessage) {
+        if (msg.user_id == selfInfo.user_id) {
+            return
+        }
+    }
     for (const host of getConfigUtil().getConfig().hosts) {
         fetch(host, {
             method: "POST",