fix AnswerID type

disgoorg · Mar 21, 2024 · 05382f1 · 05382f1
1 parent f842904
commit 05382f1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/discord/poll.go b/discord/poll.go
@@ -12,7 +12,7 @@ type Poll struct {
 	Expiry           time.Time      `json:"expiry"`
 	AllowMultiselect bool           `json:"allow_multiselect"`
 	LayoutType       PollLayoutType `json:"layout_type"`
-	Results          []PollResults  `json:"results"`
+	Results          []PollResults  `json:"results,omitempty"`
 }
 
 type PollMedia struct {
@@ -21,8 +21,8 @@ type PollMedia struct {
 }
 
 type PollAnswer struct {
-	AnswerID  *snowflake.ID `json:"answer_id"`
-	PollMedia PollMedia     `json:"poll_media"`
+	AnswerID  *int      `json:"answer_id"`
+	PollMedia PollMedia `json:"poll_media"`
 }
 
 type PollResults struct {

diff --git a/events/message_events.go b/events/message_events.go
@@ -51,7 +51,7 @@ type GenericMessagePoll struct {
 	ChannelID snowflake.ID
 	MessageID snowflake.ID
 	GuildID   *snowflake.ID
-	AnswerID  snowflake.ID
+	AnswerID  int
 }
 
 // MessagePollVoteAdd indicates that a discord.User voted on a discord.Poll

diff --git a/gateway/gateway_events.go b/gateway/gateway_events.go
@@ -512,7 +512,7 @@ type EventMessagePollVoteAdd struct {
 	ChannelID snowflake.ID  `json:"channel_id"`
 	MessageID snowflake.ID  `json:"message_id"`
 	GuildID   *snowflake.ID `json:"guild_id"`
-	AnswerID  snowflake.ID  `json:"answer_id"`
+	AnswerID  int           `json:"answer_id"`
 }
 
 func (EventMessagePollVoteAdd) messageData() {}
@@ -523,7 +523,7 @@ type EventMessagePollVoteRemove struct {
 	ChannelID snowflake.ID  `json:"channel_id"`
 	MessageID snowflake.ID  `json:"message_id"`
 	GuildID   *snowflake.ID `json:"guild_id"`
-	AnswerID  snowflake.ID  `json:"answer_id"`
+	AnswerID  int           `json:"answer_id"`
 }
 
 func (EventMessagePollVoteRemove) messageData() {}

diff --git a/rest/channels.go b/rest/channels.go
@@ -48,7 +48,7 @@ type Channels interface {
 	UnpinMessage(channelID snowflake.ID, messageID snowflake.ID, opts ...RequestOpt) error
 	Follow(channelID snowflake.ID, targetChannelID snowflake.ID, opts ...RequestOpt) (*discord.FollowedChannel, error)
 
-	GetPollAnswerVotes(channelID snowflake.ID, messageID snowflake.ID, answerID snowflake.ID, after snowflake.ID, limit int, opts ...RequestOpt) ([]discord.User, error)
+	GetPollAnswerVotes(channelID snowflake.ID, messageID snowflake.ID, answerID int, after snowflake.ID, limit int, opts ...RequestOpt) ([]discord.User, error)
 	ExpirePoll(channelID snowflake.ID, messageID snowflake.ID, opts ...RequestOpt) (*discord.Message, error)
 }
 
@@ -226,7 +226,7 @@ func (s *channelImpl) Follow(channelID snowflake.ID, targetChannelID snowflake.I
 	return
 }
 
-func (s *channelImpl) GetPollAnswerVotes(channelID snowflake.ID, messageID snowflake.ID, answerID snowflake.ID, after snowflake.ID, limit int, opts ...RequestOpt) (users []discord.User, err error) {
+func (s *channelImpl) GetPollAnswerVotes(channelID snowflake.ID, messageID snowflake.ID, answerID int, after snowflake.ID, limit int, opts ...RequestOpt) (users []discord.User, err error) {
 	values := discord.QueryValues{}
 	if after != 0 {
 		values["after"] = after