From 83eee9ef91989c28e3a154161329737b1b081545 Mon Sep 17 00:00:00 2001
From: moonrailgun <moonrailgun@gmail.com>
Date: Fri, 2 Sep 2022 21:11:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dgithub=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=20pull=5Frequest/issue=20=E4=B8=8D=E8=83=BD=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8=E6=98=BE=E7=A4=BA=E5=90=8D=E5=AD=97=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

并增加了关闭提示
---
 .../services/subscribe.service.ts             | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/server/plugins/com.msgbyte.github/services/subscribe.service.ts b/server/plugins/com.msgbyte.github/services/subscribe.service.ts
index 6ae00dc9..062319f5 100644
--- a/server/plugins/com.msgbyte.github/services/subscribe.service.ts
+++ b/server/plugins/com.msgbyte.github/services/subscribe.service.ts
@@ -162,28 +162,34 @@ class GithubSubscribeService extends TcService {
 
       await this.sendMessageToSubscribes(ctx, repo, message);
     } else if ('pull_request' in event) {
-      const name = event.sender.name;
+      const name = event.sender.login;
+      const userUrl = event.sender.html_url;
       const repo = event.repository.full_name;
-      const url = event.pull_request.url;
+      const url = event.pull_request.html_url;
       const title = event.pull_request.title;
       const body = event.pull_request.body;
 
-      let message = `${name} 在 ${repo} 更新了PR请求:\n网址: ${url}`;
+      let message = `[url=${userUrl}]${name}[/url] 在 ${repo} 更新了PR请求:\n网址: ${url}`;
       if (event.action === 'created') {
-        message = `${name} 在 ${repo} 创建了PR请求:\n${title}\n${body}\n\n网址: ${url}`;
+        message = `[url=${userUrl}]${name}[/url] 在 ${repo} 创建了PR请求:\n${title}\n${body}\n\n网址: ${url}`;
+      } else if (event.action === 'closed') {
+        message = `[url=${userUrl}]${name}[/url] 在 ${repo} 关闭了PR请求:\n${title}\n${body}\n\n网址: ${url}`;
       }
 
       await this.sendMessageToSubscribes(ctx, repo, message);
     } else if ('issue' in event) {
-      const name = event.sender.name;
+      const name = event.sender.login;
+      const userUrl = event.sender.html_url;
       const repo = event.repository.full_name;
-      const url = event.issue.url;
+      const url = event.issue.html_url;
       const title = event.issue.title;
       const body = event.issue.body;
 
-      let message = `${name} 在 ${repo} 更新了Issue:\n网址: ${url}`;
+      let message = `[url=${userUrl}]${name}[/url] 在 ${repo} 更新了Issue:\n网址: ${url}`;
       if (event.action === 'created') {
-        message = `${name} 在 ${repo} 创建了Issue:\n${title}\n${body}\n\n网址: ${url}`;
+        message = `[url=${userUrl}]${name}[/url] 在 ${repo} 创建了Issue:\n${title}\n${body}\n\n网址: ${url}`;
+      } else if (event.action === 'closed') {
+        message = `[url=${userUrl}]${name}[/url] 在 ${repo} 关闭了Issue:\n${title}\n${body}\n\n网址: ${url}`;
       }
 
       await this.sendMessageToSubscribes(ctx, repo, message);