From a5e6fef0465345a76bf60197c250cfd4d9dbe3dd Mon Sep 17 00:00:00 2001 From: Clansty Date: Thu, 25 Jul 2024 00:51:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=AF=E8=83=BD=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=86=E8=A1=A8=E6=83=85=E5=92=8C=20at?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- main/src/services/ForwardService.ts | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9053f4f..a71b4e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,7 +41,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ ADD https://github.com/p-ranav/argparse.git#v3.0 /argparse WORKDIR /argparse/build -RUN cmake -DARGPARSE_BUILD_SAMPLES=on -DARGPARSE_BUILD_TESTS=on .. && make && make install +RUN cmake -DARGPARSE_BUILD_SAMPLES=off -DARGPARSE_BUILD_TESTS=off .. && make && make install ADD https://github.com/ed-asriyan/lottie-converter.git#f626548ced4492235b535552e2449be004a3a435 /app WORKDIR /app diff --git a/main/src/services/ForwardService.ts b/main/src/services/ForwardService.ts index bf84da9..a341ff2 100644 --- a/main/src/services/ForwardService.ts +++ b/main/src/services/ForwardService.ts @@ -222,7 +222,7 @@ export default class ForwardService { break; } case 'sface': { - if (!elem.text) { + if (typeof elem.text === 'string') { elem.text = '表情:' + elem.id; } message += `[${helper.htmlEscape(elem.text)}]`; @@ -520,9 +520,17 @@ export default class ForwardService { this.log.error('从 QQ 到 TG 的消息转发失败', e); posthog.capture('从 QQ 到 TG 的消息转发失败', { error: e }); let pbUrl: string; + let error = e; + if (JSON.stringify(error) === '{}') { + error = { + message: e.message, + stack: e.stack, + str: e.toString(), + }; + } try { pbUrl = await pastebin.upload(JSON.stringify({ - error: e, + error, event, })); }