migan/discordmuffin
1
0
Fork 0
forked from pothtonswer/discordmuffin
Code Pull requests Activity

fix error shadowing in InteractionRespond (#1030)

Browse source
This commit is contained in:
Dan Brakeley 2022-04-14 15:30:21 -04:00 committed by GitHub
parent 4d72c306b4
commit 2b359776da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
restapi.go
View file

@ -2806,7 +2806,7 @@ func (s *Session) ApplicationCommandPermissionsBatchEdit(appID, guildID string,
// InteractionRespond creates the response to an interaction. // InteractionRespond creates the response to an interaction.
// interaction : Interaction instance. // interaction : Interaction instance.
// resp : Response message data. // resp : Response message data.
func (s *Session) InteractionRespond(interaction *Interaction, resp *InteractionResponse) (err error) { func (s *Session) InteractionRespond(interaction *Interaction, resp *InteractionResponse) error {
endpoint := EndpointInteractionResponse(interaction.ID, interaction.Token) endpoint := EndpointInteractionResponse(interaction.ID, interaction.Token)
if resp.Data != nil && len(resp.Data.Files) > 0 { if resp.Data != nil && len(resp.Data.Files) > 0 {
@ -2816,9 +2816,10 @@ func (s *Session) InteractionRespond(interaction *Interaction, resp *Interaction
} }
_, err = s.request("POST", endpoint, contentType, body, endpoint, 0) _, err = s.request("POST", endpoint, contentType, body, endpoint, 0)
} else { return err
_, err = s.RequestWithBucketID("POST", endpoint, *resp, endpoint)
} }
_, err := s.RequestWithBucketID("POST", endpoint, *resp, endpoint)
return err return err
} }

6
state.go
View file

@ -979,8 +979,9 @@ func (s *State) OnInterface(se *Session, i interface{}) (err error) {
err = s.GuildRemove(t.Guild) err = s.GuildRemove(t.Guild)
case *GuildMemberAdd: case *GuildMemberAdd:
var guild *Guild
// Updates the MemberCount of the guild. // Updates the MemberCount of the guild.
guild, err := s.Guild(t.Member.GuildID) guild, err = s.Guild(t.Member.GuildID)
if err != nil { if err != nil {
return err return err
} }
@ -995,8 +996,9 @@ func (s *State) OnInterface(se *Session, i interface{}) (err error) {
err = s.MemberAdd(t.Member) err = s.MemberAdd(t.Member)
} }
case *GuildMemberRemove: case *GuildMemberRemove:
var guild *Guild
// Updates the MemberCount of the guild. // Updates the MemberCount of the guild.
guild, err := s.Guild(t.Member.GuildID) guild, err = s.Guild(t.Member.GuildID)
if err != nil { if err != nil {
return err return err
} }