Add Dashboard Command, update constants and TopggStatsSender

Author: WinG4merBR

buildSrc/src/main/kotlin/Versions.kt

@@ -17,4 +17,5 @@ object Versions {
     const val JDA_KTX = "0.12.0"
     const val SHADOW_JAR = "7.1.2"
     const val JACKSON = "2.18.0"
+    const val MONGODB = "5.3.0"
 }

common/src/commonMain/kotlin/net/cakeyfox/common/Constants.kt

@@ -12,6 +12,8 @@ object Constants {
     const val PREMIUM = "https://foxybot.win/br/premium"
     const val DAILY = "https://foxybot.win/br/daily"
     const val DAILY_EMOJI = "https://cdn.discordapp.com/emojis/915736630495686696.png?size=2048"
+    const val DASHBOARD_URL = "https://foxybot.win/br/dashboard"
+
     @OptIn(ExperimentalSerializationApi::class)
     val HOCON = Hocon { useArrayPolymorphism = true }
     const val SUPPORT_SERVER_ID = "768267522670723094"

foxy/build.gradle.kts

@@ -29,8 +29,8 @@ dependencies {
     implementation("club.minnced:jda-ktx:${Versions.JDA_KTX}")
 
     // MongoDB
-    implementation("org.mongodb:bson-kotlinx:5.3.0")
-    implementation("org.mongodb:mongodb-driver-kotlin-coroutine:5.3.0")
+    implementation("org.mongodb:bson-kotlinx:${Versions.MONGODB}")
+    implementation("org.mongodb:mongodb-driver-kotlin-coroutine:${Versions.MONGODB}")
 
     // Ktor
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")

foxy/src/main/kotlin/net/cakeyfox/foxy/FoxyInstance.kt

@@ -33,7 +33,6 @@ import net.dv8tion.jda.api.utils.ChunkingFilter
 import net.dv8tion.jda.api.utils.MemberCachePolicy
 import net.dv8tion.jda.api.utils.cache.CacheFlag
 import kotlin.concurrent.thread
-import kotlin.reflect.jvm.jvmName
 
 class FoxyInstance(
     val config: FoxyConfig,
@@ -57,14 +56,12 @@ class FoxyInstance(
     private val currentClusterName = if (config.discord.clusters.size < 2) null else currentCluster.name
     private val coroutineExecutor = ThreadUtils.createThreadPool("CoroutineExecutor [%d]")
 
-    val json = Json {
-        ignoreUnknownKeys = true
-    }
+    val json = Json { ignoreUnknownKeys = true }
     val threadPoolManager = ThreadPoolManager()
     val coroutineDispatcher = coroutineExecutor.asCoroutineDispatcher()
 
     suspend fun start() {
-        val logger = KotlinLogging.logger(this::class.jvmName)
+        val logger = KotlinLogging.logger { }
 
         environment = config.environment
         mongoClient = MongoDBClient(this)
@@ -73,13 +70,8 @@ class FoxyInstance(
         interactionManager = FoxyComponentManager(this)
         artistryClient = ArtistryClient(config, config.others.artistry.key)
         httpClient = HttpClient(CIO) {
-            install(HttpTimeout) {
-                requestTimeoutMillis = 60_000
-            }
-
-            install(ContentNegotiation) {
-                json()
-            }
+            install(HttpTimeout) { requestTimeoutMillis = 60_000 }
+            install(ContentNegotiation) { json() }
         }
 
         mongoClient.start(this)

foxy/src/main/kotlin/net/cakeyfox/foxy/command/vanilla/dev/ServerInviteRetrieveExecutor.kt

@@ -29,6 +29,7 @@ class ServerInviteRetrieveExecutor : FoxyCommandExecutor() {
         context.reply(true) {
             embed {
                 title = "Convites do servidor ${guild.name}"
+                thumbnail = guild.icon
                 color = Colors.RANDOM
                 description = invites.take(5)
                     .joinToString("\n") {

foxy/src/main/kotlin/net/cakeyfox/foxy/command/vanilla/utils/DashboardExecutor.kt

@@ -0,0 +1,52 @@
+package net.cakeyfox.foxy.command.vanilla.utils
+
+import dev.minn.jda.ktx.coroutines.await
+import net.cakeyfox.common.Colors
+import net.cakeyfox.common.Constants
+import net.cakeyfox.common.FoxyEmotes
+import net.cakeyfox.foxy.command.FoxyInteractionContext
+import net.cakeyfox.foxy.command.structure.FoxyCommandExecutor
+import net.cakeyfox.foxy.utils.pretty
+import net.dv8tion.jda.api.Permission
+
+class DashboardExecutor : FoxyCommandExecutor() {
+    override suspend fun execute(context: FoxyInteractionContext) {
+        if (context.guild == null) {
+            context.reply(true) {
+                content = pretty(
+                    FoxyEmotes.FoxyCry,
+                    context.locale["dashboard.guildNotFound"]
+                )
+            }
+
+            return
+        }
+
+        val userAsMember = context.guild.retrieveMember(context.user).await()
+
+        if (!userAsMember.hasPermission(Permission.MANAGE_SERVER)) {
+            context.reply(true) {
+                content = pretty(
+                    FoxyEmotes.FoxyCry,
+                    context.locale["dashboard.noPermission"]
+                )
+            }
+        }
+
+        context.reply(true) {
+            embed {
+                title = pretty(FoxyEmotes.FoxyYay, context.locale["dashboard.embed.title"])
+                color = Colors.BLURPLE
+                description = context.locale["dashboard.embed.description", context.guild.name]
+            }
+
+            actionRow(
+                context.foxy.interactionManager.createLinkButton(
+                    FoxyEmotes.FoxyYay,
+                    context.locale["dashboard.embed.button"],
+                    Constants.DASHBOARD_URL
+                )
+            )
+        }
+    }
+}

foxy/src/main/kotlin/net/cakeyfox/foxy/command/vanilla/utils/PingExecutor.kt

@@ -9,16 +9,16 @@ import net.cakeyfox.foxy.utils.pretty
 class PingExecutor : FoxyCommandExecutor() {
     override suspend fun execute(context: FoxyInteractionContext) {
         val gatewayPing = context.jda.gatewayPing
-        val currentShardId = context.jda.shardInfo.shardId + 1
+        val currentShardId = context.jda.shardInfo.shardId
         val totalShards = context.jda.shardInfo.shardTotal
         val minClusterShards = context.foxy.currentCluster.minShard
-        val maxClusterShards = context.foxy.currentCluster.maxShard
+        val maxClusterShards = context.foxy.currentCluster.maxShard + 1
         val currentClusterId = context.foxy.currentCluster.id
         val currentClusterName = context.foxy.currentCluster.name
 
         context.reply {
             embed {
-                title = pretty(FoxyEmotes.FoxyWow, "Pong!")
+                title = pretty(FoxyEmotes.FoxyWow, "Pong! (Shard: #$currentShardId)")
                 thumbnail = context.foxy.selfUser.effectiveAvatarUrl
                 color = Colors.FOXY_DEFAULT
 
@@ -37,7 +37,7 @@ class PingExecutor : FoxyCommandExecutor() {
                 field {
                     name = pretty(FoxyEmotes.FoxyDrinkingCoffee, "Cluster:")
                     value =
-                        "Cluster $currentClusterId - `${currentClusterName}` **[$minClusterShards-$maxClusterShards]**"
+                        "**Cluster $currentClusterId** - `${currentClusterName}` **($minClusterShards/$maxClusterShards)**"
                     inline = false
                 }
             }

foxy/src/main/kotlin/net/cakeyfox/foxy/command/vanilla/utils/declarations/DashboardCommand.kt

@@ -0,0 +1,21 @@
+package net.cakeyfox.foxy.command.vanilla.utils.declarations
+
+import net.cakeyfox.foxy.command.structure.FoxyCommandDeclarationWrapper
+import net.cakeyfox.foxy.command.vanilla.utils.DashboardExecutor
+import net.dv8tion.jda.api.interactions.IntegrationType
+import net.dv8tion.jda.api.interactions.InteractionContextType
+
+class DashboardCommand : FoxyCommandDeclarationWrapper {
+    override fun create() = command(
+        name = "dashboard",
+        description = "description",
+        interactionContexts = listOf(
+            InteractionContextType.GUILD
+        ),
+        integrationType = listOf(
+            IntegrationType.GUILD_INSTALL
+        ),
+    ) {
+        executor = DashboardExecutor()
+    }
+}

foxy/src/main/kotlin/net/cakeyfox/foxy/utils/analytics/TopggStatsSender.kt

@@ -4,10 +4,10 @@ import io.ktor.client.*
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
-import io.ktor.http.content.*
 import kotlinx.coroutines.*
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.put
 import mu.KotlinLogging
 import net.cakeyfox.foxy.FoxyInstance
 import net.cakeyfox.serializable.data.cluster.ClusterStats
@@ -88,12 +88,10 @@ class TopggStatsSender(
             val response = foxy.httpClient.post("https://top.gg/api/bots/$clientId/stats") {
                 header("Authorization", token)
                 accept(ContentType.Application.Json)
-                setBody(
-                    TextContent(
-                        Json.encodeToString(ClusterStats.TopggBotStats(serverCount)),
-                        ContentType.Application.Json
-                    )
-                )
+                setBody(buildJsonObject {
+                    put("server_count", serverCount)
+                    put("shard_count", foxy.config.discord.totalShards)
+                })
             }
 
             if (response.status != HttpStatusCode.OK) {

foxy/src/main/resources/locales/en-us/general.yml

@@ -5,6 +5,10 @@ commands:
   componentExpired: "Wait, where is it? I can't find the interaction information... It seems to have expired! Run the command again."
 
   command:
+    dashboard:
+      name: "dashboard"
+      description: "[Utils] Access the current server dashboard"
+
     ship:
       name: "ship"
       description: "[Social] Ship two users"

foxy/src/main/resources/locales/pt-br/commands.yml

@@ -5,6 +5,14 @@
 commands:
   earlyAccess: "Esse comando está em beta e apenas usuários premium possuem acesso antecipado. Se você quiser ter acesso a esse comando e muitos outros, você pode se tornar um usuário premium clicando [aqui](https://foxybot.win/br/premium)"
 
+dashboard:
+  embed:
+    title: "Painel de Controle"
+    description: "Quer deixar o servidor `{0}` incrível e mas não sabe por onde começar? Acesse o painel de controle para configurar o seu servidor!"
+    button: "Acessar o Painel de Controle"
+    noPermission: "Você precisa da permissão `Gerenciar Servidor` para utilizar esse comando"
+    guildNotFound: "Eu preciso estar nesse servidor para isso funcionar!"
+
 russianRoulette:
   embed:
     title: "Roleta Russa"

foxy/src/main/resources/locales/pt-br/general.yml

@@ -6,6 +6,10 @@ commands:
   error: "Ocorreu um erro ao executar o comando, o problema foi reportado! `{0}`"
 
   command:
+    dashboard:
+      name: "dashboard"
+      description: "[Utilitários] Acesse o painel de configuração do servidor atual"
+
     ship:
       name: "ship"
       description: "[Social] Ship two users"