From f2439b7e4c47de018e1678ceaa434e4b3d734a83 Mon Sep 17 00:00:00 2001
From: Yehonatan Ezron <37303618+jonatan5524@users.noreply.github.com>
Date: Sat, 28 May 2022 23:44:51 +0300
Subject: [PATCH] fix(telegram): fix link bot to release tag (#19830)
* fix(telegram): fix link bot to release tag
* test(webhook): fix matrixPayload Release
* test(webhook): fix TestTelegramPayload Release
---
services/webhook/general.go | 2 +-
services/webhook/matrix_test.go | 4 ++--
services/webhook/slack_test.go | 2 +-
services/webhook/telegram_test.go | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/services/webhook/general.go b/services/webhook/general.go
index 5080cf98dc..e8006fabae 100644
--- a/services/webhook/general.go
+++ b/services/webhook/general.go
@@ -141,7 +141,7 @@ func getPullRequestPayloadInfo(p *api.PullRequestPayload, linkFormatter linkForm
func getReleasePayloadInfo(p *api.ReleasePayload, linkFormatter linkFormatter, withSender bool) (text string, color int) {
repoLink := linkFormatter(p.Repository.HTMLURL, p.Repository.FullName)
- refLink := linkFormatter(p.Repository.HTMLURL+"/src/"+util.PathEscapeSegments(p.Release.TagName), p.Release.TagName)
+ refLink := linkFormatter(p.Repository.HTMLURL+"/releases/tag/"+util.PathEscapeSegments(p.Release.TagName), p.Release.TagName)
switch p.Action {
case api.HookReleasePublished:
diff --git a/services/webhook/matrix_test.go b/services/webhook/matrix_test.go
index 3cc7c7518f..34196aedf0 100644
--- a/services/webhook/matrix_test.go
+++ b/services/webhook/matrix_test.go
@@ -165,8 +165,8 @@ func TestMatrixPayload(t *testing.T) {
require.NotNil(t, pl)
require.IsType(t, &MatrixPayloadUnsafe{}, pl)
- assert.Equal(t, "[[test/repo](http://localhost:3000/test/repo)] Release created: [v1.0](http://localhost:3000/test/repo/src/v1.0) by [user1](https://try.gitea.io/user1)", pl.(*MatrixPayloadUnsafe).Body)
- assert.Equal(t, `[test/repo] Release created: v1.0 by user1`, pl.(*MatrixPayloadUnsafe).FormattedBody)
+ assert.Equal(t, "[[test/repo](http://localhost:3000/test/repo)] Release created: [v1.0](http://localhost:3000/test/repo/releases/tag/v1.0) by [user1](https://try.gitea.io/user1)", pl.(*MatrixPayloadUnsafe).Body)
+ assert.Equal(t, `[test/repo] Release created: v1.0 by user1`, pl.(*MatrixPayloadUnsafe).FormattedBody)
})
}
diff --git a/services/webhook/slack_test.go b/services/webhook/slack_test.go
index 1fa7777328..8278afb69a 100644
--- a/services/webhook/slack_test.go
+++ b/services/webhook/slack_test.go
@@ -154,7 +154,7 @@ func TestSlackPayload(t *testing.T) {
require.NotNil(t, pl)
require.IsType(t, &SlackPayload{}, pl)
- assert.Equal(t, "[] Release created: by ", pl.(*SlackPayload).Text)
+ assert.Equal(t, "[] Release created: by ", pl.(*SlackPayload).Text)
})
}
diff --git a/services/webhook/telegram_test.go b/services/webhook/telegram_test.go
index 6a3682847c..2f83090166 100644
--- a/services/webhook/telegram_test.go
+++ b/services/webhook/telegram_test.go
@@ -154,7 +154,7 @@ func TestTelegramPayload(t *testing.T) {
require.NotNil(t, pl)
require.IsType(t, &TelegramPayload{}, pl)
- assert.Equal(t, `[test/repo] Release created: v1.0 by user1`, pl.(*TelegramPayload).Message)
+ assert.Equal(t, `[test/repo] Release created: v1.0 by user1`, pl.(*TelegramPayload).Message)
})
}