Mirrors
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more fixes on #2045

This commit is contained in:
Unknwon 2015-12-04 15:41:56 -05:00
parent bfe6027266
commit e0bae9547a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
models/webhook_slack.go
View File

@ -83,19 +83,19 @@ func getSlackPushPayload(p *api.PushPayload, slack *SlackMeta) (*SlackPayload, e
// n new commits // n new commits
var ( var (
branchName = git.RefEndName(p.Ref) branchName = git.RefEndName(p.Ref)
commitDesc string
commitString string commitString string
) )
if len(p.Commits) == 1 { if len(p.Commits) == 1 {
commitString = "1 new commit" commitDesc = "1 new commit"
if len(p.CompareUrl) > 0 {
commitString = SlackLinkFormatter(p.CompareUrl, commitString)
}
} else { } else {
commitString = fmt.Sprintf("%d new commits", len(p.Commits)) commitDesc = fmt.Sprintf("%d new commits", len(p.Commits))
if p.CompareUrl != "" {
commitString = SlackLinkFormatter(p.CompareUrl, commitString)
} }
if len(p.CompareUrl) > 0 {
commitString = SlackLinkFormatter(p.CompareUrl, commitDesc)
} else {
commitString = commitDesc
} }
repoLink := SlackLinkFormatter(p.Repo.URL, p.Repo.Name) repoLink := SlackLinkFormatter(p.Repo.URL, p.Repo.Name)
@ -114,7 +114,7 @@ func getSlackPushPayload(p *api.PushPayload, slack *SlackMeta) (*SlackPayload, e
slackAttachments := []SlackAttachment{{ slackAttachments := []SlackAttachment{{
Fallback: fmt.Sprintf("%s pushed %s to %s/%s: %s", Fallback: fmt.Sprintf("%s pushed %s to %s/%s: %s",
p.Pusher, commitString, p.Repo.Name, branchName, p.CompareUrl), p.Pusher, commitDesc, p.Repo.Name, branchName, p.CompareUrl),
Color: slack.Color, Color: slack.Color,
Text: attachmentText, Text: attachmentText,
}} }}