Fix panics in emoji rest calls

mlnrDev · mlnrDev · commit 1c2e34f76c43 · 2024-04-12T14:07:02.000+02:00
diff --git a/rest/emojis.go b/rest/emojis.go
@@ -34,23 +34,23 @@ func (s *emojiImpl) GetEmojis(guildID snowflake.ID, opts ...RequestOpt) (emojis
 
 func (s *emojiImpl) GetEmoji(guildID snowflake.ID, emojiID snowflake.ID, opts ...RequestOpt) (emoji *discord.Emoji, err error) {
 	err = s.client.Do(GetEmoji.Compile(nil, guildID, emojiID), nil, &emoji, opts...)
-	if err != nil {
+	if emoji != nil {
 		emoji.GuildID = guildID
 	}
 	return
 }
 
 func (s *emojiImpl) CreateEmoji(guildID snowflake.ID, emojiCreate discord.EmojiCreate, opts ...RequestOpt) (emoji *discord.Emoji, err error) {
 	err = s.client.Do(CreateEmoji.Compile(nil, guildID), emojiCreate, &emoji, opts...)
-	if err != nil {
+	if emoji != nil {
 		emoji.GuildID = guildID
 	}
 	return
 }
 
 func (s *emojiImpl) UpdateEmoji(guildID snowflake.ID, emojiID snowflake.ID, emojiUpdate discord.EmojiUpdate, opts ...RequestOpt) (emoji *discord.Emoji, err error) {
 	err = s.client.Do(UpdateEmoji.Compile(nil, guildID, emojiID), emojiUpdate, &emoji, opts...)
-	if err != nil {
+	if emoji != nil {
 		emoji.GuildID = guildID
 	}
 	return

Original file line number	Diff line number	Diff line change
`@@ -34,23 +34,23 @@ func (s *emojiImpl) GetEmojis(guildID snowflake.ID, opts ...RequestOpt) (emojis`
`34`	`34`
`35`	`35`	`func (s emojiImpl) GetEmoji(guildID snowflake.ID, emojiID snowflake.ID, opts ...RequestOpt) (emoji discord.Emoji, err error) {`
`36`	`36`	`err = s.client.Do(GetEmoji.Compile(nil, guildID, emojiID), nil, &emoji, opts...)`
`37`		`- if err != nil {`
	`37`	`+ if emoji != nil {`
`38`	`38`	`emoji.GuildID = guildID`
`39`	`39`	`}`
`40`	`40`	`return`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`func (s emojiImpl) CreateEmoji(guildID snowflake.ID, emojiCreate discord.EmojiCreate, opts ...RequestOpt) (emoji discord.Emoji, err error) {`
`44`	`44`	`err = s.client.Do(CreateEmoji.Compile(nil, guildID), emojiCreate, &emoji, opts...)`
`45`		`- if err != nil {`
	`45`	`+ if emoji != nil {`
`46`	`46`	`emoji.GuildID = guildID`
`47`	`47`	`}`
`48`	`48`	`return`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`func (s emojiImpl) UpdateEmoji(guildID snowflake.ID, emojiID snowflake.ID, emojiUpdate discord.EmojiUpdate, opts ...RequestOpt) (emoji discord.Emoji, err error) {`
`52`	`52`	`err = s.client.Do(UpdateEmoji.Compile(nil, guildID, emojiID), emojiUpdate, &emoji, opts...)`
`53`		`- if err != nil {`
	`53`	`+ if emoji != nil {`
`54`	`54`	`emoji.GuildID = guildID`
`55`	`55`	`}`
`56`	`56`	`return`