Add fields to channel position modify

discord/discord-api-docs#1776

Author: BartArys

core/src/test/kotlin/com/gitlab/kordlib/core/rest/RestTest.kt

@@ -433,6 +433,20 @@ class RestServiceTest {
         assertEquals("TEST", message.content)
     }
 
+    @Test
+    @Order(25)
+    @OptIn(KordExperimental::class)
+    fun `channel moves in guild`(): Unit = runBlocking {
+        val category = guild.createCategory("move category")
+        val textChannel = guild.createTextChannel("move me to a category")
+
+        guild.swapChannelPositions {
+            move(textChannel.id){ parentId = category.id }
+        }
+
+        val currentTextChannel = guild.getChannelOf<TextChannel>(textChannel.id)
+        assertEquals(category.id,currentTextChannel.categoryId)
+    }
 
     @Test
     @Order(Int.MAX_VALUE - 2)

rest/src/main/kotlin/com/gitlab/kordlib/rest/builder/channel/GuildChannelPositionModifyBuilder.kt

@@ -2,22 +2,64 @@ package com.gitlab.kordlib.rest.builder.channel
 
 import com.gitlab.kordlib.rest.builder.AuditRequestBuilder
 import com.gitlab.kordlib.common.annotation.KordDsl
+import com.gitlab.kordlib.common.annotation.KordExperimental
 import com.gitlab.kordlib.common.entity.Snowflake
+import com.gitlab.kordlib.rest.json.request.ChannelPositionSwapRequest
 import com.gitlab.kordlib.rest.json.request.GuildChannelPositionModifyRequest
 
 @KordDsl
 class GuildChannelPositionModifyBuilder: AuditRequestBuilder<GuildChannelPositionModifyRequest>  {
     override var reason: String? = null
-    private val swaps: MutableList<Pair<Snowflake, Int>> = mutableListOf()
+    var swaps: MutableList<GuildChannelSwapBuilder> = mutableListOf()
 
     fun move(pair: Pair<Snowflake, Int>) {
-        swaps += pair.first to pair.second
+        move(pair.first) { position = pair.second }
     }
 
     fun move(vararg pairs: Pair<Snowflake, Int>) {
-        swaps += pairs.map { it.first to it.second }
+        pairs.forEach { move(it) }
+    }
+
+    inline fun move(channel: Snowflake, builder: GuildChannelSwapBuilder.() -> Unit){
+        swaps.firstOrNull { it.channelId == channel }?.builder() ?: run {
+            swaps.add(GuildChannelSwapBuilder(channel).also(builder))
+        }
     }
 
     override fun toRequest(): GuildChannelPositionModifyRequest =
-            GuildChannelPositionModifyRequest(swaps)
-}
+            GuildChannelPositionModifyRequest(swaps.map { it.toRequest() })
+}
+
+
+class GuildChannelSwapBuilder(var channelId: Snowflake) {
+
+    /**
+     * The new position of this channel
+     */
+    var position: Int? = null
+
+    /**
+     * The new parent of this channel, has to be a category.
+     *
+     * **Only one channel can have a parent id modified per request**.
+     *
+     * This field is not officially supported by the Discord API, and might change/be removed in the future.
+     */
+    @KordExperimental
+    var parentId: Snowflake? = null
+
+    /**
+     * Locks the permissions of this channel to the new category it is moved to.
+     * Only works if [parentId] is set.
+     *
+     * This field is not officially supported by the Discord API, and might change/be removed in the future.
+     */
+    @KordExperimental
+    var lockPermissionsToParent: Boolean? = null
+
+    @OptIn(KordExperimental::class)
+    fun toRequest(): ChannelPositionSwapRequest = ChannelPositionSwapRequest(
+            channelId, position, lockPermissionsToParent, parentId
+    )
+
+}

rest/src/main/kotlin/com/gitlab/kordlib/rest/json/request/GuildRequests.kt

@@ -2,6 +2,7 @@ package com.gitlab.kordlib.rest.json.request
 
 import com.gitlab.kordlib.common.Color
 import com.gitlab.kordlib.common.annotation.DeprecatedSinceKord
+import com.gitlab.kordlib.common.annotation.KordExperimental
 import com.gitlab.kordlib.common.entity.*
 import com.gitlab.kordlib.common.entity.optional.Optional
 import com.gitlab.kordlib.common.entity.optional.OptionalBoolean
@@ -52,29 +53,38 @@ data class GuildChannelCreateRequest(
         val id: OptionalSnowflake = OptionalSnowflake.Missing,
 )
 
-@Serializable(with = GuildChannelPositionModifyRequest.Serializer::class)
-data class GuildChannelPositionModifyRequest(val swaps: List<Pair<Snowflake, Int>>) {
+@Serializable
+data class ChannelPositionSwapRequest(
+        val id: Snowflake,
+        val position: Int?,
+        @KordExperimental
+        @SerialName("lock_permissions")
+        val lockPermissions: Boolean?,
+        @KordExperimental
+        @SerialName("parent_id")
+        val parentId: Snowflake?
+)
 
+@Serializable(with = GuildChannelPositionModifyRequest.Serializer::class)
+data class GuildChannelPositionModifyRequest(
+        val swaps: List<ChannelPositionSwapRequest>
+) {
     internal object Serializer : KSerializer<GuildChannelPositionModifyRequest> {
+        private val delegate = ListSerializer(ChannelPositionSwapRequest.serializer())
 
         @OptIn(InternalSerializationApi::class, ExperimentalSerializationApi::class)
         override val descriptor: SerialDescriptor
-            get() = listSerialDescriptor(ChannelPosition.serializer().descriptor)
+            get() = listSerialDescriptor(ChannelPositionSwapRequest.serializer().descriptor)
 
         override fun serialize(encoder: Encoder, value: GuildChannelPositionModifyRequest) {
-            val positions = value.swaps.map { ChannelPosition(it.first, it.second) }
-            ListSerializer(ChannelPosition.serializer()).serialize(encoder, positions)
+            delegate.serialize(encoder, value.swaps)
         }
 
         override fun deserialize(decoder: Decoder): GuildChannelPositionModifyRequest {
-            val values = decoder.decodeSerializableValue(ListSerializer(ChannelPosition.serializer()))
-            return GuildChannelPositionModifyRequest(values.map { it.id to it.position })
+            return GuildChannelPositionModifyRequest(decoder.decodeSerializableValue(delegate))
         }
 
     }
-
-    @Serializable
-    private data class ChannelPosition(val id: Snowflake, val position: Int)
 }
 
 @Serializable