diff --git a/pom.xml b/pom.xml
index 56e175e..deaa85d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,6 +10,7 @@
UTF-8
1.8
1.8
+ 2.3.21
@@ -88,6 +89,73 @@
+
+ org.jetbrains.kotlin
+ kotlin-maven-plugin
+ ${kotlin.version}
+ true
+
+
+ kotlin-compile
+ compile
+
+ compile
+
+
+
+ src/main/kotlin
+
+ src/main/java
+
+
+
+
+ kotlin-test-compile
+ test-compile
+
+ test-compile
+
+
+
+ src/test/kotlin
+ src/test/java
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.15.0
+
+
+
+ default-compile
+ none
+
+
+ default-testCompile
+ none
+
+
+
+
+ java-compile
+ compile
+
+ compile
+
+
+
+ java-test-compile
+ test-compile
+
+ testCompile
+
+
+
+
maven-assembly-plugin
diff --git a/src/main/java/com/jagrosh/vortex/Vortex.java b/src/main/java/com/jagrosh/vortex/Vortex.java
index 9e087a6..ec49ff4 100644
--- a/src/main/java/com/jagrosh/vortex/Vortex.java
+++ b/src/main/java/com/jagrosh/vortex/Vortex.java
@@ -125,7 +125,7 @@
new SilentbanCmd(this),
new UnbanCmd(this),
new CleanCmd(this),
- // new VoicemoveCmd(this),
+ new VoicemoveCmd(this),
// new VoicekickCmd(this),
new MuteCmd(this),
new UnmuteCmd(this),
diff --git a/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java b/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java
index 040f871..0dd4a8f 100644
--- a/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java
+++ b/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java
@@ -82,10 +82,12 @@
try
{
usage.increment(tc.getGuild().getIdLong());
- tc.sendMessage(new MessageCreateBuilder()
- .addContent(FormatUtil.filterEveryone(LogUtil.basiclogFormat(now, vortex.getDatabase().settings.getSettings(tc.getGuild()).getTimezone(), emote, message)))
- .setEmbeds(embed)
- .build()).queue();
+ MessageCreateBuilder builder = new MessageCreateBuilder()
+ .addContent(FormatUtil.filterEveryone(LogUtil.basiclogFormat(now, vortex.getDatabase().settings.getSettings(tc.getGuild()).getTimezone(), emote, message)));
+ if (embed != null){
+ builder = builder.addEmbeds(embed);
+ }
+ tc.sendMessage(builder.build()).queue();
}
catch(PermissionException ignore) {}
}
diff --git a/src/main/java/com/jagrosh/vortex/managers/ConditionalEventManager.java b/src/main/java/com/jagrosh/vortex/managers/ConditionalEventManager.java
index 62aeb45..ecffd22 100644
--- a/src/main/java/com/jagrosh/vortex/managers/ConditionalEventManager.java
+++ b/src/main/java/com/jagrosh/vortex/managers/ConditionalEventManager.java
@@ -98,6 +98,10 @@
}
// otherwise, continue as normal
- super.handle(ge);
+ try {
+ super.handle(ge);
+ } catch (Exception e){
+
+ }
}
}
diff --git a/src/main/java/com/jagrosh/vortex/managers/MultiBotManager.java b/src/main/java/com/jagrosh/vortex/managers/MultiBotManager.java
index f30a4ab..2087f4d 100644
--- a/src/main/java/com/jagrosh/vortex/managers/MultiBotManager.java
+++ b/src/main/java/com/jagrosh/vortex/managers/MultiBotManager.java
@@ -48,7 +48,7 @@
b.setBulkDeleteSplittingEnabled(false);
b.setRequestTimeoutRetry(true);
b.setSessionController(new SlowerConcurrentSessionController(20));
- b.setEnabledIntents(Arrays.asList(GatewayIntent.GUILD_EXPRESSIONS, GatewayIntent.MESSAGE_CONTENT, GatewayIntent.SCHEDULED_EVENTS, GatewayIntent.GUILD_MEMBERS, GatewayIntent.GUILD_INVITES, GatewayIntent.GUILD_PRESENCES, GatewayIntent.GUILD_VOICE_STATES));
+ b.setEnabledIntents(Arrays.asList(GatewayIntent.GUILD_EXPRESSIONS, GatewayIntent.MESSAGE_CONTENT, GatewayIntent.SCHEDULED_EVENTS, GatewayIntent.GUILD_MEMBERS, GatewayIntent.GUILD_INVITES, GatewayIntent.GUILD_PRESENCES, GatewayIntent.GUILD_VOICE_STATES, GatewayIntent.DIRECT_MESSAGES, GatewayIntent.GUILD_MESSAGES, GatewayIntent.GUILD_MESSAGE_REACTIONS, GatewayIntent.DIRECT_MESSAGE_REACTIONS, GatewayIntent.AUTO_MODERATION_CONFIGURATION, GatewayIntent.AUTO_MODERATION_EXECUTION, GatewayIntent.GUILD_WEBHOOKS, GatewayIntent.GUILD_WEBHOOKS, GatewayIntent.GUILD_INVITES, GatewayIntent.GUILD_MODERATION));
bots.add(b.build());
}
}
diff --git a/src/main/kotlin/com/jagrosh/vortex/commands/VoicekickCmd.kt b/src/main/kotlin/com/jagrosh/vortex/commands/VoicekickCmd.kt
new file mode 100644
index 0000000..1ef7b38
--- /dev/null
+++ b/src/main/kotlin/com/jagrosh/vortex/commands/VoicekickCmd.kt
@@ -0,0 +1,14 @@
+package com.jagrosh.vortex.commands
+
+import com.jagrosh.jdautilities.command.CommandEvent
+import com.jagrosh.vortex.Vortex
+import net.dv8tion.jda.api.Permission
+
+class VoicekickCmd(vortex: Vortex) : ModCommand(vortex, Permission.VOICE_MOVE_OTHERS){
+ override fun execute(event: CommandEvent?) {
+ if (event == null){
+ return
+ }
+ event.reply("no :3");
+ }
+}
\ No newline at end of file