diff options
| -rw-r--r-- | gogs.go | 2 | ||||
| -rw-r--r-- | models/webhook.go | 4 | ||||
| -rw-r--r-- | models/webhook_slack.go | 32 | ||||
| -rw-r--r-- | templates/.VERSION | 2 |
4 files changed, 27 insertions, 13 deletions
@@ -16,7 +16,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.9.142.0211" +const APP_VER = "0.9.143.0211" func init() { setting.AppVer = APP_VER diff --git a/models/webhook.go b/models/webhook.go index babb15de..c8e0559e 100644 --- a/models/webhook.go +++ b/models/webhook.go @@ -476,7 +476,9 @@ func PrepareWebhooks(repo *Repository, event HookEventType, p api.Payloader) err // Use separate objects so modifcations won't be made on payload on non-Gogs type hooks. switch w.HookTaskType { case SLACK: - payloader, err = GetSlackPayload(p, event, w.Meta) + // FIXME: dirty fix for buggy support of Discord for Slack-type webhook. + // Should remove this if we want to support Discord fully as its own. + payloader, err = GetSlackPayload(strings.Contains(w.URL, ".discordapp.com/"), p, event, w.Meta) if err != nil { return fmt.Errorf("GetSlackPayload: %v", err) } diff --git a/models/webhook_slack.go b/models/webhook_slack.go index edc26a78..6e4b9408 100644 --- a/models/webhook_slack.go +++ b/models/webhook_slack.go @@ -72,13 +72,21 @@ func SlackLinkFormatter(url string, text string) string { return fmt.Sprintf("<%s|%s>", url, SlackTextFormatter(text)) } -func getSlackCreatePayload(p *api.CreatePayload, slack *SlackMeta) (*SlackPayload, error) { - // created tag/branch +func replaceBadCharsForDiscord(in string) string { + return strings.NewReplacer("[", "", "]", ":", ":", "/").Replace(in) +} + +func getSlackCreatePayload(isDiscord bool, p *api.CreatePayload, slack *SlackMeta) (*SlackPayload, error) { + // Created tag/branch refName := git.RefEndName(p.Ref) repoLink := SlackLinkFormatter(p.Repo.HTMLURL, p.Repo.Name) refLink := SlackLinkFormatter(p.Repo.HTMLURL+"/src/"+refName, refName) - text := fmt.Sprintf("[%s:%s] %s created by %s", repoLink, refLink, p.RefType, p.Sender.UserName) + format := "[%s:%s] %s created by %s" + if isDiscord { + format = replaceBadCharsForDiscord(format) + } + text := fmt.Sprintf(format, repoLink, refLink, p.RefType, p.Sender.UserName) return &SlackPayload{ Channel: slack.Channel, @@ -88,7 +96,7 @@ func getSlackCreatePayload(p *api.CreatePayload, slack *SlackMeta) (*SlackPayloa }, nil } -func getSlackPushPayload(p *api.PushPayload, slack *SlackMeta) (*SlackPayload, error) { +func getSlackPushPayload(isDiscord bool, p *api.PushPayload, slack *SlackMeta) (*SlackPayload, error) { // n new commits var ( branchName = git.RefEndName(p.Ref) @@ -109,7 +117,11 @@ func getSlackPushPayload(p *api.PushPayload, slack *SlackMeta) (*SlackPayload, e repoLink := SlackLinkFormatter(p.Repo.HTMLURL, p.Repo.Name) branchLink := SlackLinkFormatter(p.Repo.HTMLURL+"/src/"+branchName, branchName) - text := fmt.Sprintf("[%s:%s] %s pushed by %s", repoLink, branchLink, commitString, p.Pusher.UserName) + format := "[%s:%s] %s pushed by %s" + if isDiscord { + format = replaceBadCharsForDiscord(format) + } + text := fmt.Sprintf(format, repoLink, branchLink, commitString, p.Pusher.UserName) var attachmentText string // for each commit, generate attachment text @@ -133,7 +145,7 @@ func getSlackPushPayload(p *api.PushPayload, slack *SlackMeta) (*SlackPayload, e }, nil } -func getSlackPullRequestPayload(p *api.PullRequestPayload, slack *SlackMeta) (*SlackPayload, error) { +func getSlackPullRequestPayload(isDiscord bool, p *api.PullRequestPayload, slack *SlackMeta) (*SlackPayload, error) { senderLink := SlackLinkFormatter(setting.AppUrl+p.Sender.UserName, p.Sender.UserName) titleLink := SlackLinkFormatter(fmt.Sprintf("%s/pulls/%d", p.Repository.HTMLURL, p.Index), fmt.Sprintf("#%d %s", p.Index, p.PullRequest.Title)) @@ -181,7 +193,7 @@ func getSlackPullRequestPayload(p *api.PullRequestPayload, slack *SlackMeta) (*S }, nil } -func GetSlackPayload(p api.Payloader, event HookEventType, meta string) (*SlackPayload, error) { +func GetSlackPayload(isDiscord bool, p api.Payloader, event HookEventType, meta string) (*SlackPayload, error) { s := new(SlackPayload) slack := &SlackMeta{} @@ -191,11 +203,11 @@ func GetSlackPayload(p api.Payloader, event HookEventType, meta string) (*SlackP switch event { case HOOK_EVENT_CREATE: - return getSlackCreatePayload(p.(*api.CreatePayload), slack) + return getSlackCreatePayload(isDiscord, p.(*api.CreatePayload), slack) case HOOK_EVENT_PUSH: - return getSlackPushPayload(p.(*api.PushPayload), slack) + return getSlackPushPayload(isDiscord, p.(*api.PushPayload), slack) case HOOK_EVENT_PULL_REQUEST: - return getSlackPullRequestPayload(p.(*api.PullRequestPayload), slack) + return getSlackPullRequestPayload(isDiscord, p.(*api.PullRequestPayload), slack) } return s, nil diff --git a/templates/.VERSION b/templates/.VERSION index c2425b81..ca81beab 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.9.142.0211
\ No newline at end of file +0.9.143.0211
\ No newline at end of file |