gogs#2045 add short version as fallback to Slack payload

unknwon · unknwon · commit 834d38a8fbb4 · 2015-12-01T21:16:19.000-05:00
diff --git a/models/webhook_slack.go b/models/webhook_slack.go
@@ -33,8 +33,9 @@ type SlackPayload struct {
 }
 
 type SlackAttachment struct {
-	Color string `json:"color"`
-	Text  string `json:"text"`
+	Fallback string `json:"fallback"`
+	Color    string `json:"color"`
+	Text     string `json:"text"`
 }
 
 func (p *SlackPayload) SetSecret(_ string) {}
@@ -111,7 +112,12 @@ func getSlackPushPayload(p *api.PushPayload, slack *SlackMeta) (*SlackPayload, e
 		}
 	}
 
-	slackAttachments := []SlackAttachment{{Color: slack.Color, Text: attachmentText}}
+	slackAttachments := []SlackAttachment{{
+		Fallback: fmt.Sprintf("%s pushed %s to %s/%s: %s",
+			p.Pusher, commitString, p.Repo.Name, branchName, p.CompareUrl),
+		Color: slack.Color,
+		Text:  attachmentText,
+	}}
 
 	return &SlackPayload{
 		Channel:     slack.Channel,

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,9 @@ type SlackPayload struct {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`type SlackAttachment struct {`
`36`		- Color string `json:"color"`
`37`		- Text string `json:"text"`
	`36`	+ Fallback string `json:"fallback"`
	`37`	+ Color string `json:"color"`
	`38`	+ Text string `json:"text"`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`func (p *SlackPayload) SetSecret(_ string) {}`
`@@ -111,7 +112,12 @@ func getSlackPushPayload(p api.PushPayload, slack SlackMeta) (*SlackPayload, e`
`111`	`112`	`}`
`112`	`113`	`}`
`113`	`114`
`114`		`- slackAttachments := []SlackAttachment{{Color: slack.Color, Text: attachmentText}}`
	`115`	`+ slackAttachments := []SlackAttachment{{`
	`116`	`+ Fallback: fmt.Sprintf("%s pushed %s to %s/%s: %s",`
	`117`	`+ p.Pusher, commitString, p.Repo.Name, branchName, p.CompareUrl),`
	`118`	`+ Color: slack.Color,`
	`119`	`+ Text: attachmentText,`
	`120`	`+ }}`
`115`	`121`
`116`	`122`	`return &SlackPayload{`
`117`	`123`	`Channel: slack.Channel,`