Add missing properties for channel builders (#712)

* Add missing properties for create forum channel * api dump * add missing fields in the other builders * api dump * move flags to forum threads * apply suggestions * Small fixes Co-authored-by: Lukellmann <[email protected]>
kordlib · Nov 16, 2022 · 329592d · 329592d
1 parent 0d2cdb5
commit 329592d
Show file tree

Hide file tree

Showing 7 changed files with 151 additions and 11 deletions.
diff --git a/rest/api/rest.api b/rest/api/rest.api
diff --git a/rest/src/main/kotlin/builder/channel/EditGuildChannelBuilder.kt b/rest/src/main/kotlin/builder/channel/EditGuildChannelBuilder.kt
@@ -2,14 +2,19 @@ package dev.kord.rest.builder.channel
 
 import dev.kord.common.annotation.KordDsl
 import dev.kord.common.entity.ArchiveDuration
+import dev.kord.common.entity.ChannelFlags
+import dev.kord.common.entity.DiscordDefaultReaction
+import dev.kord.common.entity.DiscordForumTag
 import dev.kord.common.entity.Overwrite
 import dev.kord.common.entity.Snowflake
+import dev.kord.common.entity.SortOrderType
 import dev.kord.common.entity.VideoQualityMode
 import dev.kord.common.entity.optional.Optional
 import dev.kord.common.entity.optional.OptionalBoolean
 import dev.kord.common.entity.optional.OptionalInt
 import dev.kord.common.entity.optional.OptionalSnowflake
 import dev.kord.common.entity.optional.delegate.delegate
+import dev.kord.common.entity.optional.optional
 import dev.kord.rest.builder.AuditRequestBuilder
 import dev.kord.rest.json.request.ChannelModifyPatchRequest
 import kotlin.DeprecationLevel.HIDDEN
@@ -96,6 +101,23 @@ public class ForumChannelModifyBuilder : PermissionOverwritesModifyBuilder,
      */
     public var defaultAutoArchiveDuration: ArchiveDuration? by ::_defaultAutoArchiveDuration.delegate()
 
+    private var _flags: Optional<ChannelFlags> = Optional.Missing()
+    public var flags: ChannelFlags? by ::_flags.delegate()
+
+    private var _defaultReactionEmoji: Optional<DiscordDefaultReaction?> = Optional.Missing()
+    public var defaultReactionEmoji: DiscordDefaultReaction? by ::_defaultReactionEmoji.delegate()
+    public var defaultReactionEmojiId: Snowflake? = null
+    public var defaultReactionEmojiName: String? = null
+
+    private var _availableTags: Optional<List<DiscordForumTag>> = Optional.Missing()
+    public var availableTags: List<DiscordForumTag>? by ::_availableTags.delegate()
+
+    private var _defaultThreadRateLimitPerUser: Optional<Duration> = Optional.Missing()
+    public var defaultThreadRateLimitPerUser: Duration? by ::_defaultThreadRateLimitPerUser.delegate()
+
+    private var _defaultSortOrder: Optional<SortOrderType?> = Optional.Missing()
+    public var defaultSortOrder: SortOrderType? by ::_defaultSortOrder.delegate()
+
     override fun toRequest(): ChannelModifyPatchRequest = ChannelModifyPatchRequest(
         name = _name,
         position = _position,
@@ -105,6 +127,18 @@ public class ForumChannelModifyBuilder : PermissionOverwritesModifyBuilder,
         permissionOverwrites = _permissionOverwrites,
         parentId = _parentId,
         defaultAutoArchiveDuration = _defaultAutoArchiveDuration,
+        defaultReactionEmoji = when {
+            defaultReactionEmojiId != null || defaultReactionEmojiName != null ->
+                DiscordDefaultReaction(
+                    emojiId = defaultReactionEmojiId,
+                    emojiName = defaultReactionEmojiName,
+                ).optional()
+            else -> _defaultReactionEmoji
+        },
+        defaultThreadRateLimitPerUser = _defaultThreadRateLimitPerUser,
+        availableTags = _availableTags,
+        defaultSortOrder = _defaultSortOrder,
+        flags = _flags
     )
 
 }

diff --git a/rest/src/main/kotlin/builder/channel/ForumChannelCreateBuilder.kt b/rest/src/main/kotlin/builder/channel/ForumChannelCreateBuilder.kt
@@ -3,13 +3,17 @@ package dev.kord.rest.builder.channel
 import dev.kord.common.annotation.KordDsl
 import dev.kord.common.entity.ArchiveDuration
 import dev.kord.common.entity.ChannelType
+import dev.kord.common.entity.DiscordDefaultReaction
+import dev.kord.common.entity.DiscordForumTag
 import dev.kord.common.entity.Overwrite
 import dev.kord.common.entity.Snowflake
+import dev.kord.common.entity.SortOrderType
 import dev.kord.common.entity.optional.Optional
 import dev.kord.common.entity.optional.OptionalBoolean
 import dev.kord.common.entity.optional.OptionalInt
 import dev.kord.common.entity.optional.OptionalSnowflake
 import dev.kord.common.entity.optional.delegate.delegate
+import dev.kord.common.entity.optional.optional
 import dev.kord.rest.builder.AuditRequestBuilder
 import dev.kord.rest.json.request.GuildChannelCreateRequest
 import kotlin.time.Duration
@@ -45,6 +49,20 @@ public class ForumChannelCreateBuilder(public var name: String) :
 
     override var permissionOverwrites: MutableSet<Overwrite> = mutableSetOf()
 
+    private var _defaultReactionEmoji: Optional<DiscordDefaultReaction?> = Optional.Missing()
+    public var defaultReactionEmoji: DiscordDefaultReaction? by ::_defaultReactionEmoji.delegate()
+    public var defaultReactionEmojiId: Snowflake? = null
+    public var defaultReactionEmojiName: String? = null
+
+    private var _availableTags: Optional<List<DiscordForumTag>?> = Optional.Missing()
+    public var availableTags: List<DiscordForumTag>? by ::_availableTags.delegate()
+
+    private var _defaultThreadRateLimitPerUser: Optional<Duration> = Optional.Missing()
+    public var defaultThreadRateLimitPerUser: Duration? by ::_defaultThreadRateLimitPerUser.delegate()
+
+    private var _defaultSortOrder: Optional<SortOrderType?> = Optional.Missing()
+    public var defaultSortOrder: SortOrderType? by ::_defaultSortOrder.delegate()
+
     override fun toRequest(): GuildChannelCreateRequest = GuildChannelCreateRequest(
         name = name,
         type = ChannelType.GuildForum,
@@ -55,5 +73,16 @@ public class ForumChannelCreateBuilder(public var name: String) :
         nsfw = _nsfw,
         permissionOverwrite = Optional.missingOnEmpty(permissionOverwrites),
         defaultAutoArchiveDuration = _defaultAutoArchiveDuration,
+        defaultReactionEmoji = when {
+            defaultReactionEmojiId != null || defaultReactionEmojiName != null ->
+                DiscordDefaultReaction(
+                    emojiId = defaultReactionEmojiId,
+                    emojiName = defaultReactionEmojiName,
+                ).optional()
+            else -> _defaultReactionEmoji
+        },
+        defaultThreadRateLimitPerUser = _defaultThreadRateLimitPerUser,
+        availableTags = _availableTags,
+        defaultSortOrder = _defaultSortOrder,
     )
 }
diff --git a/rest/src/main/kotlin/builder/channel/TextChannelCreateBuilder.kt b/rest/src/main/kotlin/builder/channel/TextChannelCreateBuilder.kt
@@ -45,6 +45,9 @@ public class TextChannelCreateBuilder(public var name: String) :
 
     override var permissionOverwrites: MutableSet<Overwrite> = mutableSetOf()
 
+    private var _defaultThreadRateLimitPerUser: Optional<Duration> = Optional.Missing()
+    public var defaultThreadRateLimitPerUser: Duration? by ::_defaultThreadRateLimitPerUser.delegate()
+
     override fun toRequest(): GuildChannelCreateRequest = GuildChannelCreateRequest(
         name = name,
         type = ChannelType.GuildText,
@@ -55,5 +58,6 @@ public class TextChannelCreateBuilder(public var name: String) :
         nsfw = _nsfw,
         permissionOverwrite = Optional.missingOnEmpty(permissionOverwrites),
         defaultAutoArchiveDuration = _defaultAutoArchiveDuration,
+        defaultThreadRateLimitPerUser = _defaultThreadRateLimitPerUser
     )
 }
diff --git a/rest/src/main/kotlin/builder/channel/thread/ThreadModifyBuilder.kt b/rest/src/main/kotlin/builder/channel/thread/ThreadModifyBuilder.kt
@@ -1,6 +1,7 @@
 package dev.kord.rest.builder.channel.thread
 
 import dev.kord.common.entity.ArchiveDuration
+import dev.kord.common.entity.ChannelFlags
 import dev.kord.common.entity.optional.Optional
 import dev.kord.common.entity.optional.OptionalBoolean
 import dev.kord.common.entity.optional.delegate.delegate
@@ -28,14 +29,18 @@ public class ThreadModifyBuilder : AuditRequestBuilder<ChannelModifyPatchRequest
     private var _invitable: OptionalBoolean = OptionalBoolean.Missing
     public var invitable: Boolean? by ::_invitable.delegate()
 
+    private var _flags: Optional<ChannelFlags> = Optional.Missing()
+    public var flags: ChannelFlags? by ::_flags.delegate()
+
     override fun toRequest(): ChannelModifyPatchRequest {
         return ChannelModifyPatchRequest(
             name = _name,
             locked = _locked,
             archived = _archived,
             autoArchiveDuration = _autoArchiveDuration,
             rateLimitPerUser = _rateLimitPerUser,
-            invitable = _invitable
+            invitable = _invitable,
+            flags = _flags
         )
     }
 

diff --git a/rest/src/main/kotlin/json/request/ChannelRequests.kt b/rest/src/main/kotlin/json/request/ChannelRequests.kt
@@ -53,6 +53,15 @@ public data class ChannelModifyPatchRequest(
     val videoQualityMode: Optional<VideoQualityMode?> = Optional.Missing(),
     @SerialName("default_auto_archive_duration")
     val defaultAutoArchiveDuration: Optional<ArchiveDuration?> = Optional.Missing(),
+    @SerialName("default_reaction_emoji")
+    val defaultReactionEmoji: Optional<DiscordDefaultReaction?> = Optional.Missing(),
+    @SerialName("default_thread_rate_limit_per_user")
+    val defaultThreadRateLimitPerUser: Optional<DurationInSeconds> = Optional.Missing(),
+    val flags: Optional<ChannelFlags> = Optional.Missing(),
+    @SerialName("available_tags")
+    val availableTags: Optional<List<DiscordForumTag>> = Optional.Missing(),
+    @SerialName("default_sort_order")
+    val defaultSortOrder: Optional<SortOrderType?> = Optional.Missing(),
 )
 
 @Serializable

diff --git a/rest/src/main/kotlin/json/request/GuildRequests.kt b/rest/src/main/kotlin/json/request/GuildRequests.kt
@@ -59,6 +59,15 @@ public data class GuildChannelCreateRequest(
     val id: OptionalSnowflake = OptionalSnowflake.Missing,
     @SerialName("default_auto_archive_duration")
     val defaultAutoArchiveDuration: Optional<ArchiveDuration> = Optional.Missing(),
+    @SerialName("default_reaction_emoji")
+    val defaultReactionEmoji: Optional<DiscordDefaultReaction?> = Optional.Missing(),
+    @SerialName("default_thread_rate_limit_per_user")
+    val defaultThreadRateLimitPerUser: Optional<DurationInSeconds> = Optional.Missing(),
+    val flags: Optional<ChannelFlags> = Optional.Missing(),
+    @SerialName("available_tags")
+    val availableTags: Optional<List<DiscordForumTag>?> = Optional.Missing(),
+    @SerialName("default_sort_order")
+    val defaultSortOrder: Optional<SortOrderType?> = Optional.Missing(),
 )
 
 @Serializable