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

jolheiser · web-flow · commit 41a06d2e824e · 2023-01-10T13:44:18.000-06:00
Backport go-gitea#22393 Signed-off-by: jolheiser <john.olheiser@gmail.com>
diff --git a/services/webhook/discord.go b/services/webhook/discord.go
@@ -55,7 +55,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
`@@ -55,7 +55,7 @@ type (`
`55`	`55`	Wait bool `json:"wait"`
`56`	`56`	Content string `json:"content"`
`57`	`57`	Username string `json:"username"`
`58`		- AvatarURL string `json:"avatar_url"`
	`58`	+ AvatarURL string `json:"avatar_url,omitempty"`
`59`	`59`	TTS bool `json:"tts"`
`60`	`60`	Embeds []DiscordEmbed `json:"embeds"`
`61`	`61`	`}`