Merge remote-tracking branch 'origin/root' into root

Kord-Extensions · Jun 7, 2024 · 7fcdb73 · 7fcdb73
2 parents 6f19860 + e3da4b8
commit 7fcdb73
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 21 deletions.
diff --git a/...n/kotlin/com/kotlindiscord/kord/extensions/commands/application/message/MessageCommand.kt b/...n/kotlin/com/kotlindiscord/kord/extensions/commands/application/message/MessageCommand.kt
@@ -70,14 +70,11 @@ public abstract class MessageCommand<C : MessageCommandContext<C, M>, M : ModalF
 
 				mapOf(
 					"name" to name,
-					"type" to "message"
+					"type" to "message",
+					"extension" to extension.name,
 				)
 			)
 
-			context.sentry.context(
-				"extension", extension.name
-			)
-
 			context.sentry.breadcrumb(BreadcrumbType.User) {
 				category = "command.application.message"
 				message = "Message command \"$name\" called."

diff --git a/.../main/kotlin/com/kotlindiscord/kord/extensions/commands/application/slash/SlashCommand.kt b/.../main/kotlin/com/kotlindiscord/kord/extensions/commands/application/slash/SlashCommand.kt
@@ -188,19 +188,30 @@ public abstract class SlashCommand<C : SlashCommandContext<*, A, M>, A : Argumen
 	/** If enabled, adds the initial Sentry breadcrumb to the given context. **/
 	public open suspend fun firstSentryBreadcrumb(context: C, commandObj: SlashCommand<*, *, *>) {
 		if (sentry.enabled) {
+			val fullName = buildString {
+				parentCommand?.let {
+					append(it.name)
+					append(" ")
+				}
+
+				parentGroup?.let {
+					append(it.name)
+					append(" ")
+				}
+
+				append(name)
+			}
+
 			context.sentry.context(
 				"command",
 
 				mapOf(
-					"name" to name,
-					"type" to "slash"
+					"name" to fullName,
+					"type" to "slash",
+					"extension" to extension.name
 				)
 			)
 
-			context.sentry.context(
-				"extension", extension.name
-			)
-
 			context.sentry.breadcrumb(BreadcrumbType.User) {
 				category = "command.application.slash"
 				message = "Slash command \"${commandObj.name}\" called."

diff --git a/...rc/main/kotlin/com/kotlindiscord/kord/extensions/commands/application/user/UserCommand.kt b/...rc/main/kotlin/com/kotlindiscord/kord/extensions/commands/application/user/UserCommand.kt
@@ -70,14 +70,11 @@ public abstract class UserCommand<C : UserCommandContext<C, M>, M : ModalForm>(
 
 				mapOf(
 					"name" to name,
-					"type" to "user"
+					"type" to "user",
+					"extension" to extension.name,
 				)
 			)
 
-			context.sentry.context(
-				"extension", extension.name
-			)
-
 			context.sentry.breadcrumb(BreadcrumbType.User) {
 				category = "command.application.user"
 				message = "User command \"$name\" called."

diff --git a/...extensions/src/main/kotlin/com/kotlindiscord/kord/extensions/commands/chat/ChatCommand.kt b/...extensions/src/main/kotlin/com/kotlindiscord/kord/extensions/commands/chat/ChatCommand.kt
@@ -385,14 +385,11 @@ public open class ChatCommand<T : Arguments>(
 
 				mapOf(
 					"name" to translatedName,
-					"type" to "chat"
+					"type" to "chat",
+					"extension" to extension.name,
 				)
 			)
 
-			context.sentry.context(
-				"extension", extension.name
-			)
-
 			context.sentry.breadcrumb(BreadcrumbType.User) {
 				category = "command.chat"
 				message = "Command \"$name\" called."