Merge pull request #132 from Matyrobbrt/script-tricks

3.9: Scripting

Author: KiriCattus

build.gradle

@@ -15,6 +15,7 @@ plugins {
   id 'pmd'
   id 'org.flywaydb.flyway' version "${flywaydb}"
   id 'org.cadixdev.licenser' version "${licenser}"
+  id 'org.jetbrains.kotlin.jvm' version '1.6.10'
 }
 
 mainClassName = 'com.mcmoddev.mmdbot.MMDBot'
@@ -76,6 +77,8 @@ dependencies {
   implementation supportDependencies.nightConfig
   implementation supportDependencies.sqliteJdbc
   implementation supportDependencies.flywayCore
+  implementation supportDependencies.graal
+  implementation supportDependencies.graalScriptEngine
   compileOnly supportDependencies.jetbrainsAnnotations
 
   implementation group: 'org.jdbi', name: 'jdbi3-core', version: "${project.jdbi_version}"
@@ -248,3 +251,13 @@ pmd {
   toolVersion = '6.38.0'
   incrementalAnalysis = true
 }
+compileKotlin {
+  kotlinOptions {
+    jvmTarget = "1.8"
+  }
+}
+compileTestKotlin {
+  kotlinOptions {
+    jvmTarget = "1.8"
+  }
+}

dependencies.gradle

@@ -16,6 +16,7 @@ ext {
     sqliteJdbcVersion = "3.36.0.3"
     flywayCoreVersion = "8.4.1"
     jetbrainsAnnotationsVersion = "23.0.0"
+    graalVersion = "22.0.0"
     //-- DEPENDENCIES
     supportDependencies = [
             jda                           : "net.dv8tion:JDA:$jdaVersion",
@@ -26,7 +27,9 @@ ext {
             nightConfig                   : "com.electronwill.night-config:toml:$tomlVersion",
             sqliteJdbc                    : "org.xerial:sqlite-jdbc:$sqliteJdbcVersion",
             flywayCore                    : "org.flywaydb:flyway-core:$flywayCoreVersion",
-            jetbrainsAnnotations          : "org.jetbrains:annotations:$jetbrainsAnnotationsVersion"
+            jetbrainsAnnotations          : "org.jetbrains:annotations:$jetbrainsAnnotationsVersion",
+            graal                         : "org.graalvm.js:js:$graalVersion",
+            graalScriptEngine             : "org.graalvm.js:js-scriptengine:$graalVersion"
     ]
 }
 

src/main/java/com/mcmoddev/mmdbot/MMDBot.java

@@ -33,6 +33,7 @@
 import net.dv8tion.jda.api.JDABuilder;
 import net.dv8tion.jda.api.entities.Activity;
 import net.dv8tion.jda.api.requests.GatewayIntent;
+import net.dv8tion.jda.api.utils.AllowedMentions;
 import net.dv8tion.jda.api.utils.cache.CacheFlag;
 import org.jdbi.v3.core.Jdbi;
 import org.slf4j.Logger;
@@ -73,6 +74,10 @@ public final class MMDBot {
         GatewayIntent.GUILD_MESSAGES,
         GatewayIntent.GUILD_MEMBERS);
 
+    static {
+        AllowedMentions.setDefaultMentionRepliedUser(false);
+    }
+
     /**
      * The config.
      */

src/main/java/com/mcmoddev/mmdbot/core/BotConfig.java

@@ -215,6 +215,13 @@ public boolean isEnabled(final String commandName) {
         return config.<Boolean>getOrElse(References.COMMANDS + commandName + ".enabled", true);
     }
 
+    /**
+     * @return If tricks should be run using prefix commands
+     */
+    public boolean prefixTricksEnabled() {
+        return config.getOrElse("commands.prefix_tricks_enabled", false);
+    }
+
     /**
      * Returns whether the given command is enabled for the given guild.
      * <p>

src/main/java/com/mcmoddev/mmdbot/modules/commands/CommandModule.java

@@ -32,6 +32,7 @@
 import com.mcmoddev.mmdbot.modules.commands.bot.management.CmdRename;
 import com.mcmoddev.mmdbot.modules.commands.bot.management.CmdRestart;
 import com.mcmoddev.mmdbot.modules.commands.bot.management.CmdShutdown;
+import com.mcmoddev.mmdbot.modules.commands.community.CmdEvaluate;
 import com.mcmoddev.mmdbot.modules.commands.community.contextmenu.GuildOnlyMenu;
 import com.mcmoddev.mmdbot.modules.commands.community.contextmenu.message.ContextMenuAddQuote;
 import com.mcmoddev.mmdbot.modules.commands.community.contextmenu.message.ContextMenuGist;
@@ -54,6 +55,8 @@
 import com.mcmoddev.mmdbot.modules.commands.community.server.tricks.CmdAddTrick;
 import com.mcmoddev.mmdbot.modules.commands.community.server.tricks.CmdEditTrick;
 import com.mcmoddev.mmdbot.modules.commands.community.server.tricks.CmdListTricks;
+import com.mcmoddev.mmdbot.modules.commands.community.server.tricks.CmdRawTrick;
+import com.mcmoddev.mmdbot.modules.commands.community.server.tricks.CmdRunTrick;
 import com.mcmoddev.mmdbot.modules.commands.community.server.tricks.CmdTrick;
 import com.mcmoddev.mmdbot.modules.commands.moderation.CmdCommunityChannel;
 import com.mcmoddev.mmdbot.modules.commands.moderation.CmdMute;
@@ -64,6 +67,7 @@
 import com.mcmoddev.mmdbot.modules.commands.moderation.CmdWarning;
 import com.mcmoddev.mmdbot.utilities.ThreadedEventListener;
 import com.mcmoddev.mmdbot.utilities.Utils;
+import com.mcmoddev.mmdbot.utilities.tricks.Tricks;
 import net.dv8tion.jda.api.hooks.EventListener;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 
@@ -138,13 +142,16 @@ public static void setupCommandModule() {
             new CmdWarning(),
             new CmdTrick(),
             new CmdInvite(),
-            new CmdDictionary());
+            new CmdDictionary(),
+            new CmdEvaluate(),
+            new CmdRawTrick());
 
         // addSlashCommand(Tricks.getTricks().stream().map(CmdRunTrickSeparated::new).toArray(SlashCommand[]::new));
 
         commandClient.addCommand(new CmdRefreshScamLinks());
         commandClient.addCommand(new CmdReact());
         commandClient.addCommand(new CmdGist());
+        commandClient.addCommand(new CmdEvaluate());
 
         commandClient.addCommand(new CmdAddTrick.Prefix());
         commandClient.addCommand(new CmdEditTrick.Prefix());
@@ -153,6 +160,10 @@ public static void setupCommandModule() {
         addContextMenu(new ContextMenuAddQuote());
         addContextMenu(new ContextMenuUserInfo());
 
+        if (MMDBot.getConfig().prefixTricksEnabled()) {
+            Tricks.getTricks().stream().map(CmdRunTrick.Prefix::new).forEach(commandClient::addCommand);
+        }
+
         if (MMDBot.getConfig().isCommandModuleEnabled()) {
             // Wrap the command and button listener in another thread, so that if a runtime exception
             // occurs while executing a command, the event thread will not be stopped

src/main/java/com/mcmoddev/mmdbot/modules/commands/DismissListener.java

@@ -50,12 +50,14 @@ public void onButtonInteraction(@javax.annotation.Nonnull final ButtonInteractio
 
         if (buttonOwner == event.getUser().getIdLong() && !event.getMessage().isEphemeral()) {
             event.getMessage().delete().reason("User dismissed the message").queue();
+        } else {
+            event.deferReply(true).setContent("You cannot dismiss this message!").queue();
         }
 
     }
 
     public static Button createDismissButton(final long buttonOwner) {
-        return Button.danger("dismiss-" + buttonOwner, "❌ Dismiss");
+        return Button.secondary("dismiss-" + buttonOwner, "✖ Dismiss");
     }
 
     public static Button createDismissButton(final Member buttonOwner) {