From 71077d4877cd5a1fec62099bbed690701bf9fe4d Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Fri, 13 Jan 2023 00:45:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dgithub=20webhook?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89body=E4=BC=9A=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=B8=B2=E6=9F=93=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/subscribe.service.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/server/plugins/com.msgbyte.github/services/subscribe.service.ts b/server/plugins/com.msgbyte.github/services/subscribe.service.ts index d4bba408..966ddd2f 100644 --- a/server/plugins/com.msgbyte.github/services/subscribe.service.ts +++ b/server/plugins/com.msgbyte.github/services/subscribe.service.ts @@ -190,10 +190,14 @@ class GithubSubscribeService extends TcService { let message = `[url=${userUrl}]${name}[/url] 在 ${repo} 更新了PR请求:\n网址: ${url}`; if (event.action === 'opened') { - message = `[url=${userUrl}]${name}[/url] 在 ${repo} 创建了PR请求:\n${title}\n[markdown]${body}[/markdown]\n网址: ${url}`; + message = `[url=${userUrl}]${name}[/url] 在 ${repo} 创建了PR请求:\n${title}\n[markdown]${ + body ?? '' + }[/markdown]\n网址: ${url}`; } else if (event.action === 'created') { const comment = event.comment; - message = `[url=${userUrl}]${name}[/url] 在 ${repo} 回复了PR请求:\n${title}\n[markdown]${comment.body}[/markdown]\n网址: ${url}`; + message = `[url=${userUrl}]${name}[/url] 在 ${repo} 回复了PR请求:\n${title}\n[markdown]${ + comment.body ?? '' + }[/markdown]\n网址: ${url}`; } else if (event.action === 'closed') { message = `[url=${userUrl}]${name}[/url] 在 ${repo} 关闭了PR请求:\n${title}\n\n网址: ${url}`; } @@ -210,10 +214,14 @@ class GithubSubscribeService extends TcService { if (event.action === 'opened') { // @ts-ignore 这里不知道为什么判断issue为never 跳过 const body = event.issue.body; - message = `[url=${userUrl}]${name}[/url] 在 ${repo} 创建了Issue:\n${title}\n[markdown]${body}[/markdown]\n网址: ${url}`; + message = `[url=${userUrl}]${name}[/url] 在 ${repo} 创建了Issue:\n${title}\n[markdown]${ + body ?? '' + }[/markdown]\n网址: ${url}`; } else if (event.action === 'created') { const comment = event.comment; - message = `[url=${userUrl}]${name}[/url] 在 ${repo} 回复了Issue:\n${title}\n回复内容:[markdown]${comment.body}[/markdown]\n网址: ${url}`; + message = `[url=${userUrl}]${name}[/url] 在 ${repo} 回复了Issue:\n${title}\n回复内容:[markdown]${ + comment.body ?? '' + }[/markdown]\n网址: ${url}`; } else if (event.action === 'closed') { message = `[url=${userUrl}]${name}[/url] 在 ${repo} 关闭了Issue:\n${title}\n\n网址: ${url}`; }