diff options
| author | ᴜɴᴋɴᴡᴏɴ <u@gogs.io> | 2020-02-22 09:05:26 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-22 09:05:26 +0800 |
| commit | 648d9e253c1924b832248f26fee42b2fb64dc3bc (patch) | |
| tree | 51649fad974cd7284a47d30e412c90e7ab72cd2c /internal/db/webhook_discord.go | |
| parent | 5b14cc6f0b7b661beb2640a94bd15660cdb48587 (diff) | |
conf: overhaul server settings (#5928)
* conf: rename package
* Requires Go 1.12
* Fix lint
* Fix lint
* Overhaul
* db: fix tests
* Save my work
* Fix tests
* Server.UnixSocketPermission
* Server.LocalRootURL
* SSH settings
* Server.OfflineMode
* Save my work
* App.Version
* Remove [server] STATIC_ROOT_PATH
* Server.LandingURL
Diffstat (limited to 'internal/db/webhook_discord.go')
| -rw-r--r-- | internal/db/webhook_discord.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/internal/db/webhook_discord.go b/internal/db/webhook_discord.go index 35b7d9b1..7442a557 100644 --- a/internal/db/webhook_discord.go +++ b/internal/db/webhook_discord.go @@ -14,7 +14,7 @@ import ( "github.com/gogs/git-module" api "github.com/gogs/go-gogs-client" - "gogs.io/gogs/internal/setting" + "gogs.io/gogs/internal/conf" ) type DiscordEmbedFooterObject struct { @@ -78,7 +78,7 @@ func getDiscordCreatePayload(p *api.CreatePayload) (*DiscordPayload, error) { return &DiscordPayload{ Embeds: []*DiscordEmbedObject{{ Description: content, - URL: setting.AppURL + p.Sender.UserName, + URL: conf.Server.ExternalURL + p.Sender.UserName, Author: &DiscordEmbedAuthorObject{ Name: p.Sender.UserName, IconURL: p.Sender.AvatarUrl, @@ -95,7 +95,7 @@ func getDiscordDeletePayload(p *api.DeletePayload) (*DiscordPayload, error) { return &DiscordPayload{ Embeds: []*DiscordEmbedObject{{ Description: content, - URL: setting.AppURL + p.Sender.UserName, + URL: conf.Server.ExternalURL + p.Sender.UserName, Author: &DiscordEmbedAuthorObject{ Name: p.Sender.UserName, IconURL: p.Sender.AvatarUrl, @@ -112,7 +112,7 @@ func getDiscordForkPayload(p *api.ForkPayload) (*DiscordPayload, error) { return &DiscordPayload{ Embeds: []*DiscordEmbedObject{{ Description: content, - URL: setting.AppURL + p.Sender.UserName, + URL: conf.Server.ExternalURL + p.Sender.UserName, Author: &DiscordEmbedAuthorObject{ Name: p.Sender.UserName, IconURL: p.Sender.AvatarUrl, @@ -160,7 +160,7 @@ func getDiscordPushPayload(p *api.PushPayload, slack *SlackMeta) (*DiscordPayloa AvatarURL: slack.IconURL, Embeds: []*DiscordEmbedObject{{ Description: content, - URL: setting.AppURL + p.Sender.UserName, + URL: conf.Server.ExternalURL + p.Sender.UserName, Color: int(color), Author: &DiscordEmbedAuthorObject{ Name: p.Sender.UserName, @@ -361,7 +361,7 @@ func getDiscordReleasePayload(p *api.ReleasePayload) (*DiscordPayload, error) { return &DiscordPayload{ Embeds: []*DiscordEmbedObject{{ Description: content, - URL: setting.AppURL + p.Sender.UserName, + URL: conf.Server.ExternalURL + p.Sender.UserName, Author: &DiscordEmbedAuthorObject{ Name: p.Sender.UserName, IconURL: p.Sender.AvatarUrl, |