fix: omit avatar_url in discord payload when empty (go-gitea#22393)

jolheiser · jolheiser · commit 27ef58c0127e · 2023-01-10T13:06:05.000-06:00
Fixes go-gitea#22391 This field is optional for Discord, however when it exists in the payload it is now validated. Omitting it entirely just makes Discord use the default for that webhook, which is set on the Discord side. Signed-off-by: jolheiser <john.olheiser@gmail.com>
diff --git a/services/webhook/discord.go b/services/webhook/discord.go
@@ -54,7 +54,7 @@ type (
 		Wait      bool           `json:"wait"`
 		Content   string         `json:"content"`
 		Username  string         `json:"username"`
-		AvatarURL string         `json:"avatar_url"`
+		AvatarURL string         `json:"avatar_url,omitempty"`
 		TTS       bool           `json:"tts"`
 		Embeds    []DiscordEmbed `json:"embeds"`
 	}

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ type (`
`54`	`54`	Wait bool `json:"wait"`
`55`	`55`	Content string `json:"content"`
`56`	`56`	Username string `json:"username"`
`57`		- AvatarURL string `json:"avatar_url"`
	`57`	+ AvatarURL string `json:"avatar_url,omitempty"`
`58`	`58`	TTS bool `json:"tts"`
`59`	`59`	Embeds []DiscordEmbed `json:"embeds"`
`60`	`60`	`}`