Application command getter (#248)

* implement get application by id endpoint * Add KordPreview annotations * rename Kord#getApplicationCommand to getGlobalApplicationCommand
kordlib · Apr 15, 2021 · 96422d4 · 96422d4
1 parent 8ffbdfc
commit 96422d4
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 0 deletions.
diff --git a/core/src/main/kotlin/Kord.kt b/core/src/main/kotlin/Kord.kt
@@ -71,6 +71,12 @@ class Kord(
     val globalCommands: Flow<GlobalApplicationCommand>
         get() = slashCommands.getGlobalApplicationCommands()
 
+
+    @KordPreview
+    suspend fun getGlobalApplicationCommand(commandId: Snowflake) =
+        slashCommands.getGlobalApplicationCommand(commandId)
+
+
     /**
      * The default supplier, obtained through Kord's [resources] and configured through [KordBuilder.defaultStrategy].
      * By default a strategy from [EntitySupplyStrategy.rest].

diff --git a/core/src/main/kotlin/SlashCommands.kt b/core/src/main/kotlin/SlashCommands.kt
@@ -70,6 +70,12 @@ class SlashCommands(
     }
 
 
+    suspend fun getGuildApplicationCommand(guildId: Snowflake, commandId: Snowflake): GuildApplicationCommand {
+        val response = service.getGuildCommand(applicationId, guildId, commandId)
+        val data = ApplicationCommandData.from(response)
+        return GuildApplicationCommand(data, service, guildId)
+    }
+
     @OptIn(ExperimentalContracts::class)
     suspend inline fun createGuildApplicationCommands(
         guildId: Snowflake,
@@ -94,6 +100,12 @@ class SlashCommands(
     }
 
 
+    suspend fun getGlobalApplicationCommand(commandId: Snowflake): GlobalApplicationCommand {
+        val response = service.getGlobalCommand(applicationId, commandId)
+        val data = ApplicationCommandData.from(response)
+        return GlobalApplicationCommand(data, service)
+    }
+
     fun getGlobalApplicationCommands(): Flow<GlobalApplicationCommand> = flow {
         for (command in service.getGlobalApplicationCommands(applicationId)) {
             val data = ApplicationCommandData.from(command)

diff --git a/core/src/main/kotlin/behavior/GuildBehavior.kt b/core/src/main/kotlin/behavior/GuildBehavior.kt
@@ -228,6 +228,10 @@ interface GuildBehavior : KordEntity, Strategizable {
             }
     }
 
+    @KordPreview
+    suspend fun getApplicationCommand(commandId: Snowflake) =
+        kord.slashCommands.getGuildApplicationCommand(id, commandId)
+
     /**
      * Requests to get the this behavior as a [Guild].
      *

diff --git a/rest/src/main/kotlin/route/Route.kt b/rest/src/main/kotlin/route/Route.kt
@@ -451,62 +451,87 @@ sealed class Route<T>(
     object TemplateDelete
         : Route<DiscordTemplate>(HttpMethod.Delete, "/guilds/${GuildId}/templates/${TemplateCode}", DiscordTemplate.serializer())
 
+    @KordPreview
     object GlobalApplicationCommandsGet
         : Route<List<DiscordApplicationCommand>>(
         HttpMethod.Get, "/applications/${ApplicationId}/commands", ListSerializer(DiscordApplicationCommand.serializer())
     )
 
+    @KordPreview
     object GlobalApplicationCommandCreate : Route<DiscordApplicationCommand>(
         HttpMethod.Post,
         "/applications/${ApplicationId}/commands",
         DiscordApplicationCommand.serializer()
     )
 
 
+    @KordPreview
     object GlobalApplicationCommandsCreate : Route<List<DiscordApplicationCommand>>(
         HttpMethod.Put,
         "/applications/${ApplicationId}/commands",
         ListSerializer(DiscordApplicationCommand.serializer())
     )
 
+    @KordPreview
     object GlobalApplicationCommandModify : Route<DiscordApplicationCommand>(
         HttpMethod.Patch,
         "/applications/${ApplicationId}/commands/${CommandId}",
         DiscordApplicationCommand.serializer()
     )
 
+
+    @KordPreview
+    object GlobalApplicationCommandGet
+        : Route<DiscordApplicationCommand>(
+        HttpMethod.Get,
+        "/applications/${ApplicationId}/commands/${CommandId}",
+        DiscordApplicationCommand.serializer()
+    )
+
     object GlobalApplicationCommandDelete
         : Route<Unit>(
         HttpMethod.Delete, "/applications/${ApplicationId}/commands/${CommandId}", NoStrategy
     )
 
+    @KordPreview
     object GuildApplicationCommandsGet
         : Route<List<DiscordApplicationCommand>>(
         HttpMethod.Get,
         "/applications/${ApplicationId}/guilds/${GuildId}/commands",
         ListSerializer(DiscordApplicationCommand.serializer())
     )
 
+    @KordPreview
     object GuildApplicationCommandCreate : Route<DiscordApplicationCommand>(
         HttpMethod.Post,
         "/applications/${ApplicationId}/guilds/${GuildId}/commands",
         DiscordApplicationCommand.serializer()
     )
 
 
+    @KordPreview
     object GuildApplicationCommandsCreate : Route<List<DiscordApplicationCommand>>(
         HttpMethod.Put,
         "/applications/${ApplicationId}/guilds/${GuildId}/commands",
         ListSerializer(DiscordApplicationCommand.serializer())
     )
 
+    @KordPreview
     object GuildApplicationCommandModify
         : Route<DiscordApplicationCommand>(
         HttpMethod.Patch,
         "/applications/${ApplicationId}/guilds/${GuildId}/commands/${CommandId}",
         DiscordApplicationCommand.serializer()
     )
 
+    @KordPreview
+    object GuildApplicationCommandGet
+        : Route<DiscordApplicationCommand>(
+        HttpMethod.Get,
+        "/applications/${ApplicationId}/guilds/${GuildId}/commands/${CommandId}",
+        DiscordApplicationCommand.serializer()
+    )
+
     object GuildApplicationCommandDelete
         : Route<Unit>(
         HttpMethod.Delete,

diff --git a/rest/src/main/kotlin/service/InteractionService.kt b/rest/src/main/kotlin/service/InteractionService.kt
@@ -175,4 +175,16 @@ class InteractionService(requestHandler: RequestHandler) : RestService(requestHa
         keys[Route.MessageId] = messageId
         body(FollowupMessageModifyRequest.serializer(), request)
     }
+
+    suspend fun getGlobalCommand(applicationId: Snowflake, commandId: Snowflake) = call(Route.GlobalApplicationCommandGet){
+        keys[Route.ApplicationId] = applicationId
+        keys[Route.CommandId] = commandId
+    }
+
+
+    suspend fun getGuildCommand(applicationId: Snowflake, guildId: Snowflake, commandId: Snowflake) = call(Route.GuildApplicationCommandGet){
+        keys[Route.ApplicationId] = applicationId
+        keys[Route.GuildId] = guildId
+        keys[Route.CommandId] = commandId
+    }
 }