fix: json 后面出现 string 内容

clansty · Jul 24, 2024 · 7d417b7 · 7d417b7
1 parent cb81e37
commit 7d417b7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/main/src/helpers/forwardHelper.ts b/main/src/helpers/forwardHelper.ts
@@ -96,7 +96,7 @@ export default {
         const resId = jsonObj.meta?.detail?.resid;
         const fileName = jsonObj.meta?.detail?.uniseq;
         if (resId) {
-          return { type: 'forward', resId };
+          return { type: 'forward', resId, fileName };
         }
         else {
           return { type: 'text', text: '[解析转发消息时出错：没有 resId]' };

diff --git a/main/src/services/ForwardService.ts b/main/src/services/ForwardService.ts
@@ -151,10 +151,10 @@ export default class ForwardService {
           messageHeader = '';
         }
       };
-      const useForward = async (resId: string) => {
+      const useForward = async (resId: string, fileName?: string) => {
         if (env.CRV_API) {
           try {
-            const messages = await pair.qq.getForwardMsg(resId);
+            const messages = await pair.qq.getForwardMsg(resId, fileName);
             message = helper.generateForwardBrief(messages);
             const hash = md5Hex(resId);
             const viewerUrl = env.CRV_VIEWER_APP ? `${env.CRV_VIEWER_APP}?startapp=${hash}` : `${env.CRV_API}/?hash=${hash}`;
@@ -188,7 +188,8 @@ export default class ForwardService {
             type: 'image',
           };
         }
-        let url: string;
+        let url: string,
+          shouldBreak = false;
         switch (elem.type) {
           case 'text': {
             // 判断微信文章
@@ -367,9 +368,10 @@ export default class ForwardService {
                 message = helper.htmlEscape(result.text);
                 break;
               case 'forward':
-                await useForward(result.resId);
+                await useForward(result.resId, result.fileName);
                 break;
             }
+            shouldBreak = true;
             break;
           }
           case 'xml': {
@@ -393,6 +395,7 @@ export default class ForwardService {
                 await useForward(result.resId);
                 break;
             }
+            shouldBreak = true;
             break;
           }
           case 'rps':
@@ -406,6 +409,7 @@ export default class ForwardService {
             message = `[<i>位置</i>] ${helper.htmlEscape(elem.name)}\n${helper.htmlEscape(elem.address)}`;
             break;
         }
+        if (shouldBreak) break;
       }
       message = message.trim();