Fix RocketChat (#9908) (#9921)

* 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>
Co-authored-by: Lauris BH <lauris@nix.lv>

diff --git a/modules/webhook/slack.go b/modules/webhook/slack.go
index 74361509d893f0a18c9e7f5ba35f2bc2fd3ae7d5..361e15ece58fa6ac62541c34f126a50d818827ba 100644 (file)
--- 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
 }