From fe7efa6b84212efb54ee3efef1506eb7f49a5c42 Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sat, 21 Mar 2020 17:39:50 +0100
Subject: [PATCH] New error messages

---
 .../hadder/commands/misc/MoveAllCommand.java  | 29 ++++++++++++++-----
 .../Translations/Translations_en.properties   |  4 +++
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java b/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java
index 519e681..b8d1dc6 100644
--- a/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java
@@ -20,6 +20,7 @@ import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.core.Perm;
 import com.bbn.hadder.core.Perms;
 import com.bbn.hadder.utils.MessageEditor;
+import org.apache.commons.lang3.StringUtils;
 
 @Perms(Perm.VOICE_MOVE_OTHERS)
 public class MoveAllCommand implements Command {
@@ -27,14 +28,26 @@ public class MoveAllCommand implements Command {
     @Override
     public void executed(String[] args, CommandEvent e) {
         if (args.length == 2) {
-            int count = e.getGuild().getVoiceChannelById(args[0]).getMembers().size();
-            e.getGuild().getVoiceChannelById(args[0]).getMembers().forEach(
-                    member -> e.getGuild().moveVoiceMember(member, e.getGuild().getVoiceChannelById(args[1])).queue()
-            );
-            e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                    "commands.misc.moveall.success.title", "",
-                    "commands.misc.moveall.success.description", String.valueOf(count))
-                    .build()).queue();
+            if (StringUtils.isNumeric(args[0]) && args[0].length() == 18) {
+                if (StringUtils.isNumeric(args[1]) && args[1].length() == 18) {
+                    int count = e.getGuild().getVoiceChannelById(args[0]).getMembers().size();
+                    e.getGuild().getVoiceChannelById(args[0]).getMembers().forEach(
+                            member -> e.getGuild().moveVoiceMember(member, e.getGuild().getVoiceChannelById(args[1])).queue()
+                    );
+                    e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                            "commands.misc.moveall.success.title", "",
+                            "commands.misc.moveall.success.description", String.valueOf(count))
+                            .build()).queue();
+                } else {
+                    e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                            "commands.misc.moveall.error.target.int.title",
+                            "commands.misc.moveall.error.target.int.description").build()).queue();
+                }
+            } else {
+                e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                        "commands.misc.moveall.error.source.int.title",
+                        "commands.misc.moveall.error.source.int.description").build()).queue();
+            }
         } else e.getHelpCommand().sendHelp(this, e);
     }
 
diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties
index 1f07242..54ef718 100644
--- a/src/main/resources/Translations/Translations_en.properties
+++ b/src/main/resources/Translations/Translations_en.properties
@@ -100,6 +100,10 @@ commands.misc.code.error.description = I can't find the specified invite code.
 commands.misc.code.help.description = Shows information about a invite code.
 commands.misc.moveall.success.title = Successfully moved
 commands.misc.moveall.success.description = I successfully moved %extra% members. Have fun\!
+commands.misc.moveall.error.source.int.title = Invalid ID
+commands.misc.moveall.error.source.int.description = You didn't specified a ID as the source channel.
+commands.misc.moveall.error.target.int.title = Invalid ID
+commands.misc.moveall.error.target.int.description = You didn't specified a ID as the target channel.
 commands.misc.moveall.help.description = Moves all users in the source channel to the target channel.
 commands.misc.corona.help.description = Show the newest stats about COVID-19