pothtonswer/discordmuffin
1
0
Fork 1
Code Issues 2 Pull requests 1 Projects 2 Releases Packages Wiki Activity Actions

Use MessageFlags in InteractionResponseData and WebhookParams (#1178)

Browse source
This commit is contained in:
Andres Perez 2022-05-22 17:32:52 -04:00 committed by nitroflap
parent e455362760
commit d7b4a482b5
No known key found for this signature in database
GPG key ID: 810F53DB0E0F81A8
6 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
examples/components/main.go
View file

@ -40,7 +40,7 @@ var (
Type: discordgo.InteractionResponseChannelMessageWithSource,
Data: &discordgo.InteractionResponseData{
Content: "Huh. I see, maybe some of these resources might help you?",
Flags: 1 << 6,
Flags: discordgo.MessageFlagsEphemeral,
Components: []discordgo.MessageComponent{
discordgo.ActionsRow{
Components: []discordgo.MessageComponent{
@ -83,7 +83,7 @@ var (
Data: &discordgo.InteractionResponseData{
Content: "Great! If you wanna know more or just have questions, feel free to visit Discord Devs and Discord Gophers server. " +
"But now, when you know how buttons work, let's move onto select menus (execute `/selects single`)",
Flags: 1 << 6,
Flags: discordgo.MessageFlagsEphemeral,
Components: []discordgo.MessageComponent{
discordgo.ActionsRow{
Components: []discordgo.MessageComponent{
@ -122,7 +122,7 @@ var (
Type: discordgo.InteractionResponseChannelMessageWithSource,
Data: &discordgo.InteractionResponseData{
Content: "This is the way.",
Flags: 1 << 6,
Flags: discordgo.MessageFlagsEphemeral,
},
}
default:
@ -130,7 +130,7 @@ var (
Type: discordgo.InteractionResponseChannelMessageWithSource,
Data: &discordgo.InteractionResponseData{
Content: "It is not the way to go.",
Flags: 1 << 6,
Flags: discordgo.MessageFlagsEphemeral,
},
}
}
@ -142,7 +142,7 @@ var (
_, err = s.FollowupMessageCreate(i.Interaction, true, &discordgo.WebhookParams{
Content: "Anyways, now when you know how to use single select menus, let's see how multi select menus work. " +
"Try calling `/selects multi` command.",
Flags: 1 << 6,
Flags: discordgo.MessageFlagsEphemeral,
})
if err != nil {
panic(err)
@ -157,7 +157,7 @@ var (
Type: discordgo.InteractionResponseChannelMessageWithSource,
Data: &discordgo.InteractionResponseData{
Content: "Here is your stackoverflow URL: " + fmt.Sprintf(stackoverflowFormat, strings.Join(data.Values, "+")),
Flags: 1 << 6,
Flags: discordgo.MessageFlagsEphemeral,
},
})
if err != nil {
@ -196,7 +196,7 @@ var (
},
},
},
Flags: 1 << 6,
Flags: discordgo.MessageFlagsEphemeral,
})
if err != nil {
panic(err)
@ -209,7 +209,7 @@ var (
Type: discordgo.InteractionResponseChannelMessageWithSource,
Data: &discordgo.InteractionResponseData{
Content: "Are you comfortable with buttons and other message components?",
Flags: 1 << 6,
Flags: discordgo.MessageFlagsEphemeral,
// Buttons and other components are specified in Components field.
Components: []discordgo.MessageComponent{
// ActionRow is a container of all buttons within the same row.
@ -269,7 +269,7 @@ var (
Type: discordgo.InteractionResponseChannelMessageWithSource,
Data: &discordgo.InteractionResponseData{
Content: "Now let's take a look on selects. This is single item select menu.",
Flags: 1 << 6,
Flags: discordgo.MessageFlagsEphemeral,
Components: []discordgo.MessageComponent{
discordgo.ActionsRow{
Components: []discordgo.MessageComponent{
@ -320,7 +320,7 @@ var (
Data: &discordgo.InteractionResponseData{
Content: "The tastiest things are left for the end. Let's see how the multi-item select menu works: " +
"try generating your own stackoverflow search link",
Flags: 1 << 6,
Flags: discordgo.MessageFlagsEphemeral,
Components: []discordgo.MessageComponent{
discordgo.ActionsRow{
Components: []discordgo.MessageComponent{

14
examples/context_menus/main.go
View file

@ -74,7 +74,7 @@ var (
Type: discordgo.InteractionResponseChannelMessageWithSource,
Data: &discordgo.InteractionResponseData{
Content: "Operation rickroll has begun",
Flags: 1 << 6,
Flags: discordgo.MessageFlagsEphemeral,
},
})
if err != nil {
@ -87,7 +87,7 @@ var (
if err != nil {
_, err = s.FollowupMessageCreate(i.Interaction, true, &discordgo.WebhookParams{
Content: fmt.Sprintf("Mission failed. Cannot send a message to this user: %q", err.Error()),
Flags: 1 << 6,
Flags: discordgo.MessageFlagsEphemeral,
})
if err != nil {
panic(err)
@ -108,7 +108,7 @@ var (
Content: searchLink(
i.ApplicationCommandData().Resolved.Messages[i.ApplicationCommandData().TargetID].Content,
"https://google.com/search?q=%s", "+"),
Flags: 1 << 6,
Flags: discordgo.MessageFlagsEphemeral,
},
})
if err != nil {
@ -122,7 +122,7 @@ var (
Content: searchLink(
i.ApplicationCommandData().Resolved.Messages[i.ApplicationCommandData().TargetID].Content,
"https://stackoverflow.com/search?q=%s", "+"),
Flags: 1 << 6,
Flags: discordgo.MessageFlagsEphemeral,
},
})
if err != nil {
@ -136,7 +136,7 @@ var (
Content: searchLink(
i.ApplicationCommandData().Resolved.Messages[i.ApplicationCommandData().TargetID].Content,
"https://pkg.go.dev/search?q=%s", "+"),
Flags: 1 << 6,
Flags: discordgo.MessageFlagsEphemeral,
},
})
if err != nil {
@ -150,7 +150,7 @@ var (
Content: searchLink(
i.ApplicationCommandData().Resolved.Messages[i.ApplicationCommandData().TargetID].Content,
"https://discord.js.org/#/docs/main/stable/search?query=%s", "+"),
Flags: 1 << 6,
Flags: discordgo.MessageFlagsEphemeral,
},
})
if err != nil {
@ -164,7 +164,7 @@ var (
Content: searchLink(
i.ApplicationCommandData().Resolved.Messages[i.ApplicationCommandData().TargetID].Content,
"https://discordpy.readthedocs.io/en/stable/search.html?q=%s", "+"),
Flags: 1 << 6,
Flags: discordgo.MessageFlagsEphemeral,
},
})
if err != nil {

2
examples/modals/main.go
View file

@ -99,7 +99,7 @@ func main() {
Type: discordgo.InteractionResponseChannelMessageWithSource,
Data: &discordgo.InteractionResponseData{
Content: "Thank you for taking your time to fill this survey",
Flags: 1 << 6,
Flags: discordgo.MessageFlagsEphemeral,
},
})
if err != nil {

2
examples/slash_commands/main.go
View file

@ -503,7 +503,7 @@ var (
// Note: this isn't documented, but you can use that if you want to.
// This flag just allows you to create messages visible only for the caller of the command
// (user who triggered the command)
Flags: 1 << 6,
Flags: discordgo.MessageFlagsEphemeral,
Content: "Surprise!",
},
})

4
interactions.go
View file

@ -534,9 +534,11 @@ type InteractionResponseData struct {
Components []MessageComponent `json:"components"`
Embeds []*MessageEmbed `json:"embeds"`
AllowedMentions *MessageAllowedMentions `json:"allowed_mentions,omitempty"`
Flags uint64 `json:"flags,omitempty"`
Files []*File `json:"-"`
// NOTE: only MessageFlagsSuppressEmbeds and MessageFlagsEphemeral can be set.
Flags MessageFlags `json:"flags,omitempty"`
// NOTE: autocomplete interaction only.
Choices []*ApplicationCommandOptionChoice `json:"choices,omitempty"`

5
webhook.go
View file

@ -35,8 +35,9 @@ type WebhookParams struct {
Components []MessageComponent `json:"components"`
Embeds []*MessageEmbed `json:"embeds,omitempty"`
AllowedMentions *MessageAllowedMentions `json:"allowed_mentions,omitempty"`
// NOTE: Works only for followup messages.
Flags uint64 `json:"flags,omitempty"`
// Only MessageFlagsSuppressEmbeds and MessageFlagsEphemeral can be set.
// MessageFlagsEphemeral can only be set when using Followup Message Create endpoint.
Flags MessageFlags `json:"flags,omitempty"`
}
// WebhookEdit stores data for editing of a webhook message.