From 38a6b11015b64623d738e95e702ab7b1b3b6e71e Mon Sep 17 00:00:00 2001
From: John Olheiser <42128690+jolheiser@users.noreply.github.com>
Date: Tue, 21 Jan 2020 14:29:24 -0600
Subject: [PATCH] Fix RocketChat (#9908)
* Fix RocketChat??
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Don't send attachment for repo create/delete
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Make fmt
Signed-off-by: jolheiser <john.olheiser@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
---
modules/webhook/slack.go | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/modules/webhook/slack.go b/modules/webhook/slack.go
index 74361509d8..361e15ece5 100644
--- a/modules/webhook/slack.go
+++ b/modules/webhook/slack.go
@@ -232,8 +232,10 @@ func getSlackPushPayload(p *api.PushPayload, slack *SlackMeta) (*SlackPayload, e
Username: slack.Username,
IconURL: slack.IconURL,
Attachments: []SlackAttachment{{
- Color: slack.Color,
- Text: attachmentText,
+ Color: slack.Color,
+ Title: p.Repo.HTMLURL,
+ TitleLink: p.Repo.HTMLURL,
+ Text: attachmentText,
}},
}, nil
}
@@ -289,12 +291,11 @@ func getSlackPullRequestApprovalPayload(p *api.PullRequestPayload, slack *SlackM
func getSlackRepositoryPayload(p *api.RepositoryPayload, slack *SlackMeta) (*SlackPayload, error) {
senderLink := SlackLinkFormatter(setting.AppURL+p.Sender.UserName, p.Sender.UserName)
repoLink := SlackLinkFormatter(p.Repository.HTMLURL, p.Repository.FullName)
- var text, title, attachmentText string
+ var text string
switch p.Action {
case api.HookRepoCreated:
text = fmt.Sprintf("[%s] Repository created by %s", repoLink, senderLink)
- title = p.Repository.HTMLURL
case api.HookRepoDeleted:
text = fmt.Sprintf("[%s] Repository deleted by %s", repoLink, senderLink)
}
@@ -304,12 +305,6 @@ func getSlackRepositoryPayload(p *api.RepositoryPayload, slack *SlackMeta) (*Sla
Text: text,
Username: slack.Username,
IconURL: slack.IconURL,
- Attachments: []SlackAttachment{{
- Color: slack.Color,
- Title: title,
- TitleLink: title,
- Text: attachmentText,
- }},
}, nil
}