Fix eval command

Author: duncte123

.idea/kotlinc.xml

@@ -37,6 +37,7 @@ import java.io.StringWriter
 import java.util.concurrent.*
 import javax.script.ScriptEngine
 import javax.script.ScriptEngineManager
+import javax.script.SimpleBindings
 import kotlin.system.measureTimeMillis
 
 class EvalCommand : Command() {
@@ -115,30 +116,32 @@ class EvalCommand : Command() {
                 .replace("\n?```".toRegex(), "")
         }
 
-        engine.put("commandManager", ctx.commandManager)
-        engine.put("message", ctx.message)
-        engine.put("channel", ctx.message.channel)
-        engine.put("guild", ctx.guild)
-        engine.put("member", ctx.member)
-        engine.put("author", ctx.author)
-        engine.put("jda", ctx.jda)
-        engine.put("shardManager", ctx.jda.shardManager)
-        engine.put("event", ctx.event)
-
-        engine.put("args", ctx.args)
-        engine.put("ctx", ctx)
-        engine.put("variables", ctx.variables)
-
-        eval(ctx, userIn)
+        val bindings = SimpleBindings()
+
+        bindings["commandManager"] = ctx.commandManager
+        bindings["message"] = ctx.message
+        bindings["channel"] = ctx.message.channel
+        bindings["guild"] = ctx.guild
+        bindings["member"] = ctx.member
+        bindings["author"] = ctx.author
+        bindings["jda"] = ctx.jda
+        bindings["shardManager"] = ctx.jda.shardManager
+        bindings["event"] = ctx.event
+
+        bindings["args"] = ctx.args
+        bindings["ctx"] = ctx
+        bindings["variables"] = ctx.variables
+
+        eval(ctx, userIn, bindings)
     }
 
-    private fun eval(ctx: CommandContext, script: String) {
+    private fun eval(ctx: CommandContext, script: String, bindings: SimpleBindings) {
         val time = measureTimeMillis {
             val future: Future<*> = this.evalThread.submit(
                 Callable {
                     try {
                         // NOTE: while(true) loops and sleeps do not trigger a timeout
-                        return@Callable engine.eval(script)
+                        return@Callable engine.eval(script, bindings)
                     } catch (ex: Throwable) {
                         return@Callable ex
                     }

bot/src/main/kotlin/me/duncte123/skybot/commands/essentials/eval/EvalCommand.kt

@@ -21,15 +21,24 @@ package me.duncte123.skybot.objects
 import me.duncte123.skybot.Variables
 import me.duncte123.skybot.objects.command.CommandCategory
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent
+import net.dv8tion.jda.api.interactions.commands.build.CommandData
 import net.dv8tion.jda.api.interactions.commands.build.Commands
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData
+import kotlin.math.min
 import me.duncte123.skybot.objects.command.Command as SkyCommand
 
 abstract class SlashSupport : SkyCommand() {
     protected abstract fun configureSlashSupport(baseData: SlashCommandData)
 
     fun getSlashData(): SlashCommandData {
-        val base = Commands.slash(name, getHelp("", "/"))
+        val help = getHelp("", "/")
+
+        val base = Commands.slash(
+            name,
+            help.substring(
+                0 until min(help.length, CommandData.MAX_DESCRIPTION_LENGTH)
+            )
+        )
             .setGuildOnly(true)
             .setNSFW(category == CommandCategory.NSFW)
 

bot/src/main/kotlin/me/duncte123/skybot/objects/SlashSupport.kt

@@ -22,9 +22,9 @@ plugins {
     java
     idea
 
-    kotlin("jvm") version "1.9.21" apply false
+    kotlin("jvm") version "1.9.23" apply false
     id("org.liquibase.gradle") version "2.0.4" apply false
-    id("org.jmailen.kotlinter") version "4.2.0" apply false
+    id("org.jmailen.kotlinter") version "4.3.0" apply false
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
     id("com.github.breadmoirai.github-release") version "2.2.12" apply false
 }