From 91c686225e43f57549739206c6680d0f96f0a434 Mon Sep 17 00:00:00 2001 From: caneleex Date: Thu, 8 Dec 2022 14:33:53 +0100 Subject: [PATCH 1/4] add DefaultForumLayout --- discord/channel.go | 11 +++++++++++ discord/channel_create.go | 1 + discord/channel_update.go | 1 + discord/channels_raw.go | 1 + 4 files changed, 14 insertions(+) diff --git a/discord/channel.go b/discord/channel.go index 6ec0838c..e148e347 100644 --- a/discord/channel.go +++ b/discord/channel.go @@ -1055,6 +1055,7 @@ type GuildForumChannel struct { DefaultReactionEmoji *DefaultReactionEmoji DefaultThreadRateLimitPerUser int DefaultSortOrder *DefaultSortOrder + DefaultForumLayout DefaultForumLayout } func (c *GuildForumChannel) UnmarshalJSON(data []byte) error { @@ -1078,6 +1079,7 @@ func (c *GuildForumChannel) UnmarshalJSON(data []byte) error { c.DefaultReactionEmoji = v.DefaultReactionEmoji c.DefaultThreadRateLimitPerUser = v.DefaultThreadRateLimitPerUser c.DefaultSortOrder = v.DefaultSortOrder + c.DefaultForumLayout = v.DefaultForumLayout return nil } @@ -1099,6 +1101,7 @@ func (c GuildForumChannel) MarshalJSON() ([]byte, error) { DefaultReactionEmoji: c.DefaultReactionEmoji, DefaultThreadRateLimitPerUser: c.DefaultThreadRateLimitPerUser, DefaultSortOrder: c.DefaultSortOrder, + DefaultForumLayout: c.DefaultForumLayout, }) } @@ -1191,6 +1194,14 @@ const ( CreationDate ) +type DefaultForumLayout int + +const ( + Default DefaultForumLayout = iota + List + Grid +) + type AutoArchiveDuration int const ( diff --git a/discord/channel_create.go b/discord/channel_create.go index c8d8a849..edf84eb7 100644 --- a/discord/channel_create.go +++ b/discord/channel_create.go @@ -190,6 +190,7 @@ type GuildForumChannelCreate struct { DefaultReactionEmoji DefaultReactionEmoji `json:"default_reaction_emoji"` AvailableTags []ForumTag `json:"available_tags"` DefaultSortOrder DefaultSortOrder `json:"default_sort_order"` + DefaultForumLayout DefaultForumLayout `json:"default_forum_layout"` } func (c GuildForumChannelCreate) Type() ChannelType { diff --git a/discord/channel_update.go b/discord/channel_update.go index 966b5557..4b4302e1 100644 --- a/discord/channel_update.go +++ b/discord/channel_update.go @@ -107,6 +107,7 @@ type GuildForumChannelUpdate struct { DefaultReactionEmoji *json.Nullable[DefaultReactionEmoji] `json:"default_reaction_emoji,omitempty"` DefaultThreadRateLimitPerUser *int `json:"default_thread_rate_limit_per_user,omitempty"` DefaultSortOrder *json.Nullable[DefaultSortOrder] `json:"default_sort_order,omitempty"` + DefaultForumLayout *DefaultForumLayout `json:"default_forum_layout,omitempty"` } func (GuildForumChannelUpdate) channelUpdate() {} diff --git a/discord/channels_raw.go b/discord/channels_raw.go index b92e8b8d..d2a0667f 100644 --- a/discord/channels_raw.go +++ b/discord/channels_raw.go @@ -192,6 +192,7 @@ type guildForumChannel struct { DefaultReactionEmoji *DefaultReactionEmoji `json:"default_reaction_emoji"` DefaultThreadRateLimitPerUser int `json:"default_thread_rate_limit_per_user"` DefaultSortOrder *DefaultSortOrder `json:"default_sort_order"` + DefaultForumLayout DefaultForumLayout `json:"default_forum_layout"` // idk discord name your shit correctly LastThreadID *snowflake.ID `json:"last_message_id"` From 08f8ef85bdf510efd60d804f8451a440c55a12d3 Mon Sep 17 00:00:00 2001 From: caneleex Date: Tue, 13 Dec 2022 07:20:12 +0100 Subject: [PATCH 2/4] prefix consistency --- discord/channel.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/discord/channel.go b/discord/channel.go index e148e347..99f7466d 100644 --- a/discord/channel.go +++ b/discord/channel.go @@ -1197,9 +1197,9 @@ const ( type DefaultForumLayout int const ( - Default DefaultForumLayout = iota - List - Grid + DefaultForumLayoutDefault DefaultForumLayout = iota + DefaultForumLayoutList + DefaultForumLayoutGrid ) type AutoArchiveDuration int From a2c16f1ef36c977f97b75a33aca712f81eba0a51 Mon Sep 17 00:00:00 2001 From: caneleex Date: Tue, 13 Dec 2022 18:37:37 +0100 Subject: [PATCH 3/4] match the new docs --- discord/channel.go | 8 ++++---- discord/channels_raw.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/discord/channel.go b/discord/channel.go index 99f7466d..f06041eb 100644 --- a/discord/channel.go +++ b/discord/channel.go @@ -1055,7 +1055,7 @@ type GuildForumChannel struct { DefaultReactionEmoji *DefaultReactionEmoji DefaultThreadRateLimitPerUser int DefaultSortOrder *DefaultSortOrder - DefaultForumLayout DefaultForumLayout + DefaultForumLayout *DefaultForumLayout } func (c *GuildForumChannel) UnmarshalJSON(data []byte) error { @@ -1197,9 +1197,9 @@ const ( type DefaultForumLayout int const ( - DefaultForumLayoutDefault DefaultForumLayout = iota - DefaultForumLayoutList - DefaultForumLayoutGrid + DefaultForumLayoutNotSet DefaultForumLayout = iota + DefaultForumLayoutListView + DefaultForumLayoutGalleryView ) type AutoArchiveDuration int diff --git a/discord/channels_raw.go b/discord/channels_raw.go index d2a0667f..b28ec077 100644 --- a/discord/channels_raw.go +++ b/discord/channels_raw.go @@ -192,7 +192,7 @@ type guildForumChannel struct { DefaultReactionEmoji *DefaultReactionEmoji `json:"default_reaction_emoji"` DefaultThreadRateLimitPerUser int `json:"default_thread_rate_limit_per_user"` DefaultSortOrder *DefaultSortOrder `json:"default_sort_order"` - DefaultForumLayout DefaultForumLayout `json:"default_forum_layout"` + DefaultForumLayout *DefaultForumLayout `json:"default_forum_layout"` // idk discord name your shit correctly LastThreadID *snowflake.ID `json:"last_message_id"` From d0fffb59bf5eafed244440cec83c8418fd8a2e10 Mon Sep 17 00:00:00 2001 From: caneleex Date: Tue, 13 Dec 2022 18:39:42 +0100 Subject: [PATCH 4/4] make DefaultForumLayout nullable --- discord/channel_update.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/discord/channel_update.go b/discord/channel_update.go index 4b4302e1..d49a0e5d 100644 --- a/discord/channel_update.go +++ b/discord/channel_update.go @@ -107,7 +107,7 @@ type GuildForumChannelUpdate struct { DefaultReactionEmoji *json.Nullable[DefaultReactionEmoji] `json:"default_reaction_emoji,omitempty"` DefaultThreadRateLimitPerUser *int `json:"default_thread_rate_limit_per_user,omitempty"` DefaultSortOrder *json.Nullable[DefaultSortOrder] `json:"default_sort_order,omitempty"` - DefaultForumLayout *DefaultForumLayout `json:"default_forum_layout,omitempty"` + DefaultForumLayout *json.Nullable[DefaultForumLayout] `json:"default_forum_layout,omitempty"` } func (GuildForumChannelUpdate) channelUpdate() {}