diff options
Diffstat (limited to 'models')
| -rw-r--r-- | models/admin.go | 10 | ||||
| -rw-r--r-- | models/webhook_slack.go | 12 |
2 files changed, 19 insertions, 3 deletions
diff --git a/models/admin.go b/models/admin.go index e24e0026..f2ddf11e 100644 --- a/models/admin.go +++ b/models/admin.go @@ -61,3 +61,13 @@ func DeleteNotice(id int64) error { _, err := x.Id(id).Delete(new(Notice)) return err } + +// DeleteNotices deletes all notices with ID from start to end (inclusive). +func DeleteNotices(start, end int64) error { + sess := x.Where("id >= ?", start) + if end > 0 { + sess.And("id <= ?", end) + } + _, err := sess.Delete(new(Notice)) + return err +} diff --git a/models/webhook_slack.go b/models/webhook_slack.go index 45766a51..9f12738a 100644 --- 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, |