Skip to content

Commit ffb2765

Browse files
authored
Adjust appearence of commit status webhook (#33778)
Some visual improvement for the commit status webhook message introduced by #33320 - use short commit SHA as already done in e. g. commit webhook - fix spacing, link text - do not set user link for internal gitea-actions user Before: ![grafik](https://github.com/user-attachments/assets/9c460846-c350-444c-89b5-8a0d5e26cb86) After: ![grafik](https://github.com/user-attachments/assets/05519cd8-6d8f-432b-bd9d-082de558a55a)
1 parent 14be462 commit ffb2765

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

Diff for: services/webhook/general.go

+9-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ import (
99
"net/url"
1010
"strings"
1111

12+
user_model "code.gitea.io/gitea/models/user"
1213
webhook_model "code.gitea.io/gitea/models/webhook"
14+
"code.gitea.io/gitea/modules/base"
1315
"code.gitea.io/gitea/modules/setting"
1416
api "code.gitea.io/gitea/modules/structs"
1517
"code.gitea.io/gitea/modules/util"
@@ -308,12 +310,16 @@ func getPackagePayloadInfo(p *api.PackagePayload, linkFormatter linkFormatter, w
308310
}
309311

310312
func getStatusPayloadInfo(p *api.CommitStatusPayload, linkFormatter linkFormatter, withSender bool) (text string, color int) {
311-
refLink := linkFormatter(p.TargetURL, p.Context+"["+p.SHA+"]:"+p.Description)
313+
refLink := linkFormatter(p.TargetURL, fmt.Sprintf("%s [%s]", p.Context, base.ShortSha(p.SHA)))
312314

313-
text = fmt.Sprintf("Commit Status changed: %s", refLink)
315+
text = fmt.Sprintf("Commit Status changed: %s - %s", refLink, p.Description)
314316
color = greenColor
315317
if withSender {
316-
text += fmt.Sprintf(" by %s", linkFormatter(setting.AppURL+url.PathEscape(p.Sender.UserName), p.Sender.UserName))
318+
if user_model.IsGiteaActionsUserName(p.Sender.UserName) {
319+
text += fmt.Sprintf(" by %s", p.Sender.FullName)
320+
} else {
321+
text += fmt.Sprintf(" by %s", linkFormatter(setting.AppURL+url.PathEscape(p.Sender.UserName), p.Sender.UserName))
322+
}
317323
}
318324

319325
return text, color

Diff for: services/webhook/matrix.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"strings"
1616

1717
webhook_model "code.gitea.io/gitea/models/webhook"
18+
"code.gitea.io/gitea/modules/base"
1819
"code.gitea.io/gitea/modules/git"
1920
"code.gitea.io/gitea/modules/json"
2021
"code.gitea.io/gitea/modules/log"
@@ -245,8 +246,8 @@ func (m matrixConvertor) Package(p *api.PackagePayload) (MatrixPayload, error) {
245246
}
246247

247248
func (m matrixConvertor) Status(p *api.CommitStatusPayload) (MatrixPayload, error) {
248-
refLink := htmlLinkFormatter(p.TargetURL, p.Context+"["+p.SHA+"]:"+p.Description)
249-
text := fmt.Sprintf("Commit Status changed: %s", refLink)
249+
refLink := htmlLinkFormatter(p.TargetURL, fmt.Sprintf("%s [%s]", p.Context, base.ShortSha(p.SHA)))
250+
text := fmt.Sprintf("Commit Status changed: %s - %s", refLink, p.Description)
250251

251252
return m.newPayload(text)
252253
}

0 commit comments

Comments
 (0)