From 6f85c0fc89e3e25151dc87bd191273c3545a0f25 Mon Sep 17 00:00:00 2001 From: mlnrDev Date: Mon, 22 Apr 2024 19:03:56 +0200 Subject: [PATCH] address review --- discord/message_create.go | 2 +- discord/message_create_builder.go | 2 +- discord/webhook_message_create.go | 2 +- discord/webhook_message_create_builder.go | 2 +- events/guild_message_poll_events.go | 5 +++++ events/message_poll_events.go | 8 ++++---- gateway/gateway_intents.go | 3 +++ 7 files changed, 16 insertions(+), 8 deletions(-) diff --git a/discord/message_create.go b/discord/message_create.go index 0527ca15..e21cc4cb 100644 --- a/discord/message_create.go +++ b/discord/message_create.go @@ -18,7 +18,7 @@ type MessageCreate struct { MessageReference *MessageReference `json:"message_reference,omitempty"` Flags MessageFlags `json:"flags,omitempty"` EnforceNonce bool `json:"enforce_nonce,omitempty"` - Poll PollCreate `json:"poll,omitempty"` + Poll *PollCreate `json:"poll,omitempty"` } func (MessageCreate) interactionCallbackData() {} diff --git a/discord/message_create_builder.go b/discord/message_create_builder.go index ed570fe9..f4e48634 100644 --- a/discord/message_create_builder.go +++ b/discord/message_create_builder.go @@ -252,7 +252,7 @@ func (b *MessageCreateBuilder) SetSuppressEmbeds(suppressEmbeds bool) *MessageCr } // SetPoll sets the Poll of the Message -func (b *MessageCreateBuilder) SetPoll(poll PollCreate) *MessageCreateBuilder { +func (b *MessageCreateBuilder) SetPoll(poll *PollCreate) *MessageCreateBuilder { b.Poll = poll return b } diff --git a/discord/webhook_message_create.go b/discord/webhook_message_create.go index 40ded2c8..f84e4ea8 100644 --- a/discord/webhook_message_create.go +++ b/discord/webhook_message_create.go @@ -15,7 +15,7 @@ type WebhookMessageCreate struct { Flags MessageFlags `json:"flags,omitempty"` ThreadName string `json:"thread_name,omitempty"` AppliedTags []snowflake.ID `json:"applied_tags,omitempty"` - Poll PollCreate `json:"poll,omitempty"` + Poll *PollCreate `json:"poll,omitempty"` } // ToBody returns the MessageCreate ready for body diff --git a/discord/webhook_message_create_builder.go b/discord/webhook_message_create_builder.go index 0a93a49e..30a4231e 100644 --- a/discord/webhook_message_create_builder.go +++ b/discord/webhook_message_create_builder.go @@ -211,7 +211,7 @@ func (b *WebhookMessageCreateBuilder) SetThreadName(threadName string) *WebhookM } // SetPoll sets the Poll of the webhook Message -func (b *WebhookMessageCreateBuilder) SetPoll(poll PollCreate) *WebhookMessageCreateBuilder { +func (b *WebhookMessageCreateBuilder) SetPoll(poll *PollCreate) *WebhookMessageCreateBuilder { b.Poll = poll return b } diff --git a/events/guild_message_poll_events.go b/events/guild_message_poll_events.go index 591a6981..9c9829ce 100644 --- a/events/guild_message_poll_events.go +++ b/events/guild_message_poll_events.go @@ -20,6 +20,11 @@ func (e *GenericGuildMessagePollVote) Guild() (discord.Guild, bool) { return e.Client().Caches().Guild(e.GuildID) } +// Channel returns the discord.GuildMessageChannel where the GenericGuildMessagePollVote happened +func (e *GenericGuildMessagePollVote) Channel() (discord.GuildMessageChannel, bool) { + return e.Client().Caches().GuildMessageChannel(e.ChannelID) +} + // GuildMessagePollVoteAdd indicates that a discord.User voted on a discord.Poll in a discord.Guild (requires gateway.IntentGuildMessagePolls) type GuildMessagePollVoteAdd struct { *GenericGuildMessagePollVote diff --git a/events/message_poll_events.go b/events/message_poll_events.go index d2f840a4..e6dd7275 100644 --- a/events/message_poll_events.go +++ b/events/message_poll_events.go @@ -5,7 +5,7 @@ import ( "github.com/disgoorg/snowflake/v2" ) -// GenericMessagePollVote is a generic poll vote event (requires gateway.IntentGuildMessagePolls or gateway.IntentDirectMessagePolls) +// GenericMessagePollVote is a generic poll vote event (requires gateway.IntentGuildMessagePolls and/or gateway.IntentDirectMessagePolls) type GenericMessagePollVote struct { *GenericEvent UserID snowflake.ID @@ -15,7 +15,7 @@ type GenericMessagePollVote struct { AnswerID int } -// Guild returns the discord.Guild where the GenericMessagePoll happened or empty if it happened in DMs +// Guild returns the discord.Guild where the GenericMessagePollVote happened or empty if it happened in DMs func (e *GenericMessagePollVote) Guild() (discord.Guild, bool) { if e.GuildID == nil { return discord.Guild{}, false @@ -23,12 +23,12 @@ func (e *GenericMessagePollVote) Guild() (discord.Guild, bool) { return e.Client().Caches().Guild(*e.GuildID) } -// MessagePollVoteAdd indicates that a discord.User voted on a discord.Poll (requires gateway.IntentGuildMessagePolls or gateway.IntentDirectMessagePolls) +// MessagePollVoteAdd indicates that a discord.User voted on a discord.Poll (requires gateway.IntentGuildMessagePolls and/or gateway.IntentDirectMessagePolls) type MessagePollVoteAdd struct { *GenericMessagePollVote } -// MessagePollVoteRemove indicates that a discord.User removed their vote on a discord.Poll (requires gateway.IntentGuildMessagePolls or gateway.IntentDirectMessagePolls) +// MessagePollVoteRemove indicates that a discord.User removed their vote on a discord.Poll (requires gateway.IntentGuildMessagePolls and/or gateway.IntentDirectMessagePolls) type MessagePollVoteRemove struct { *GenericMessagePollVote } diff --git a/gateway/gateway_intents.go b/gateway/gateway_intents.go index 121cf0e4..68f6c4ec 100644 --- a/gateway/gateway_intents.go +++ b/gateway/gateway_intents.go @@ -54,6 +54,9 @@ const ( IntentDirectMessageTyping | IntentDirectMessagePolls + IntentsMessagePolls = IntentGuildMessagePolls | + IntentDirectMessagePolls + IntentsNonPrivileged = IntentGuilds | IntentGuildModeration | IntentGuildEmojisAndStickers |