From 4b6bc657dcc2cf58125b69f3fa32bd2acee50d99 Mon Sep 17 00:00:00 2001
From: Juby210 <31005896+Juby210@users.noreply.github.com>
Date: Sun, 8 May 2022 12:33:56 +0200
Subject: [PATCH] discord: Add permission fields to Command (#326)

* api/discord: add DefaultMemberPermissions and DMPermission to commands
* api/discord: invert DMPermission to match NoDefaultPermission
---
 api/application.go    | 6 ++++++
 discord/command.go    | 9 +++++++++
 discord/permission.go | 8 ++++++++
 3 files changed, 23 insertions(+)

diff --git a/api/application.go b/api/application.go
index e5937ae..5bfd08e 100644
--- a/api/application.go
+++ b/api/application.go
@@ -26,6 +26,8 @@ type CreateCommandData struct {
 	Description              string                 `json:"description"`
 	DescriptionLocalizations discord.StringLocales  `json:"description_localizations,omitempty"`
 	Options                  discord.CommandOptions `json:"options,omitempty"`
+	DefaultMemberPermissions *discord.Permissions   `json:"default_member_permissions,string,omitempty"`
+	NoDMPermission           bool                   `json:"-"`
 	NoDefaultPermission      bool                   `json:"-"`
 	Type                     discord.CommandType    `json:"type,omitempty"`
 }
@@ -34,6 +36,7 @@ func (c CreateCommandData) MarshalJSON() ([]byte, error) {
 	type RawCreateCommandData CreateCommandData
 	cmd := struct {
 		RawCreateCommandData
+		DMPermission      bool `json:"dm_permission"`
 		DefaultPermission bool `json:"default_permission"`
 	}{RawCreateCommandData: (RawCreateCommandData)(c)}
 
@@ -41,6 +44,7 @@ func (c CreateCommandData) MarshalJSON() ([]byte, error) {
 	// meaning of the field (>No<DefaultPermission) to match Go's default
 	// value, false.
 	cmd.DefaultPermission = !c.NoDefaultPermission
+	cmd.DMPermission = !c.NoDMPermission
 
 	return json.Marshal(cmd)
 }
@@ -49,6 +53,7 @@ func (c *CreateCommandData) UnmarshalJSON(data []byte) error {
 	type RawCreateCommandData CreateCommandData
 	cmd := struct {
 		*RawCreateCommandData
+		DMPermission      bool `json:"dm_permission"`
 		DefaultPermission bool `json:"default_permission"`
 	}{RawCreateCommandData: (*RawCreateCommandData)(c)}
 	if err := json.Unmarshal(data, &cmd); err != nil {
@@ -59,6 +64,7 @@ func (c *CreateCommandData) UnmarshalJSON(data []byte) error {
 	// meaning of the field (>No<DefaultPermission) to match Go's default
 	// value, false.
 	c.NoDefaultPermission = !cmd.DefaultPermission
+	c.NoDMPermission = !cmd.DMPermission
 
 	// Discord defaults type to 1 if omitted.
 	if c.Type == 0 {
diff --git a/discord/command.go b/discord/command.go
index 0691e41..af31505 100644
--- a/discord/command.go
+++ b/discord/command.go
@@ -52,6 +52,11 @@ type Command struct {
 	//
 	// It is only present on ChatInputCommands.
 	Options CommandOptions `json:"options,omitempty"`
+	// DefaultMemberPermissions is set of permissions.
+	DefaultMemberPermissions *Permissions `json:"default_member_permissions,string,omitempty"`
+	// NoDMPermission indicates whether the command is NOT available in DMs with
+	// the app, only for globally-scoped commands. By default, commands are visible.
+	NoDMPermission bool `json:"-"`
 	// NoDefaultPermissions defines whether the command is NOT enabled by
 	// default when the app is added to a guild.
 	NoDefaultPermission bool `json:"-"`
@@ -112,6 +117,7 @@ func (c *Command) MarshalJSON() ([]byte, error) {
 	type RawCommand Command
 	cmd := struct {
 		*RawCommand
+		DMPermission      bool `json:"dm_permission"`
 		DefaultPermission bool `json:"default_permission"`
 	}{RawCommand: (*RawCommand)(c)}
 
@@ -119,6 +125,7 @@ func (c *Command) MarshalJSON() ([]byte, error) {
 	// meaning of the field (>No<DefaultPermission) to match Go's default
 	// value, false.
 	cmd.DefaultPermission = !c.NoDefaultPermission
+	cmd.DMPermission = !c.NoDMPermission
 
 	return json.Marshal(cmd)
 }
@@ -128,6 +135,7 @@ func (c *Command) UnmarshalJSON(data []byte) error {
 
 	cmd := struct {
 		*rawCommand
+		DMPermission      bool `json:"dm_permission"`
 		DefaultPermission bool `json:"default_permission"`
 	}{
 		rawCommand: (*rawCommand)(c),
@@ -141,6 +149,7 @@ func (c *Command) UnmarshalJSON(data []byte) error {
 	// meaning of the field (>No<DefaultPermission) to match Go's default
 	// value, false.
 	c.NoDefaultPermission = !cmd.DefaultPermission
+	c.NoDMPermission = !cmd.DMPermission
 
 	// Discord defaults type to 1 if omitted.
 	if c.Type == 0 {
diff --git a/discord/permission.go b/discord/permission.go
index 39914b8..b4e83d0 100644
--- a/discord/permission.go
+++ b/discord/permission.go
@@ -144,6 +144,14 @@ const (
 		PermissionManageEvents
 )
 
+func NewPermissions(p ...Permissions) *Permissions {
+	var perm Permissions
+	for _, permission := range p {
+		perm |= permission
+	}
+	return &perm
+}
+
 func (p Permissions) Has(perm Permissions) bool {
 	return HasFlag(uint64(p), uint64(perm))
 }