diff options
| -rw-r--r-- | gogs.go | 2 | ||||
| -rw-r--r-- | models/webhook_discord.go | 10 | ||||
| -rw-r--r-- | templates/.VERSION | 2 |
3 files changed, 11 insertions, 3 deletions
@@ -16,7 +16,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.9.164.0220 / 0.10 RC" +const APP_VER = "0.9.165.0220 / 0.10 RC" func init() { setting.AppVer = APP_VER diff --git a/models/webhook_discord.go b/models/webhook_discord.go index aa387fe6..8830e85b 100644 --- a/models/webhook_discord.go +++ b/models/webhook_discord.go @@ -12,6 +12,8 @@ import ( "github.com/gogits/git-module" api "github.com/gogits/go-gogs-client" + + "github.com/gogits/gogs/modules/setting" ) type DiscordEmbedFooterObject struct { @@ -56,6 +58,10 @@ func (p *DiscordPayload) JSONPayload() ([]byte, error) { return data, nil } +func DiscordTextFormatter(s string) string { + return strings.Split(s, "\n")[0] +} + func DiscordLinkFormatter(url string, text string) string { return fmt.Sprintf("[%s](%s)", text, url) } @@ -78,6 +84,7 @@ func getDiscordCreatePayload(p *api.CreatePayload, slack *SlackMeta) (*DiscordPa AvatarURL: slack.IconURL, Embeds: []*DiscordEmbedObject{{ Description: content, + URL: setting.AppUrl + p.Sender.UserName, Color: int(color), Author: &DiscordEmbedAuthorObject{ Name: p.Sender.UserName, @@ -113,7 +120,7 @@ func getDiscordPushPayload(p *api.PushPayload, slack *SlackMeta) (*DiscordPayloa // for each commit, generate attachment text for i, commit := range p.Commits { - content += fmt.Sprintf("%s %s - %s", DiscordSHALinkFormatter(commit.URL, commit.ID[:7]), SlackShortTextFormatter(commit.Message), commit.Author.Name) + content += fmt.Sprintf("%s %s - %s", DiscordSHALinkFormatter(commit.URL, commit.ID[:7]), DiscordTextFormatter(commit.Message), commit.Author.Name) // add linebreak to each commit but the last if i < len(p.Commits)-1 { content += "\n" @@ -126,6 +133,7 @@ func getDiscordPushPayload(p *api.PushPayload, slack *SlackMeta) (*DiscordPayloa AvatarURL: slack.IconURL, Embeds: []*DiscordEmbedObject{{ Description: content, + URL: setting.AppUrl + p.Sender.UserName, Color: int(color), Author: &DiscordEmbedAuthorObject{ Name: p.Sender.UserName, diff --git a/templates/.VERSION b/templates/.VERSION index 0564a8d6..e59573ff 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.9.164.0220 / 0.10 RC
\ No newline at end of file +0.9.165.0220 / 0.10 RC
\ No newline at end of file |