From afd955d06f81496528465178a2aa6d5e86257811 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Mon, 30 Dec 2024 20:14:51 +0800
Subject: [PATCH] fix: error

---
 src/common/umami.ts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/common/umami.ts b/src/common/umami.ts
index 1cbeeb1a..b2146003 100644
--- a/src/common/umami.ts
+++ b/src/common/umami.ts
@@ -46,22 +46,25 @@ export class UmamiTraceCore {
             guid: guid,
             workname: this.workname,
         };
-        this.sendRequest({ website: this.website, ...data }, 'identify');
+        this.sendRequest({ website: this.website, data}, 'identify');
     }
 
-    sendEvent(event: string, data?: object) {
+    sendEvent(event: string | object, data?: object) {
         const env = process.env;
         const language = env.LANG || env.LANGUAGE || env.LC_ALL || env.LC_MESSAGES;
         const payload = {
-            name: event,
+            ...(typeof event === 'string' ? { event } : event),
             hostname: this.hostname,
             referrer: this.referrer,
             website: this.website,
             language: language || 'en-US',
-            napcat_version: this.napcatVersion,
-            qq_version: this.qqversion,
-            workname: this.workname,
-            ...data
+            data: {
+                ...data,
+                napcat_version: this.napcatVersion,
+                qq_version: this.qqversion,
+                workname: this.workname,
+                guid: this.guid
+            }
         };
         this.sendRequest(payload);
     }
@@ -108,13 +111,10 @@ export class UmamiTraceCore {
             clearInterval(this.heartbeatInterval);
         }
         this.heartbeatInterval = setInterval(() => {
-            this.sendEvent('heartbeat', {
+            this.sendEvent({
+                name: 'heartbeat',
                 title: 'NapCat ' + this.napcatVersion,
-                language: process.env.LANG || 'en-US',
                 url: `/${this.qqversion}/${this.napcatVersion}/${this.workname}/heartbeat`,
-                version: this.napcatVersion,
-                qq_version: this.qqversion,
-                user_id: this.guid
             });
         }, 5 * 60 * 1000);
     }