diff --git a/src/pkg/deepCurse/nopalmo/command/AbstractCommand.java b/src/pkg/deepCurse/nopalmo/command/AbstractCommand.java deleted file mode 100644 index 6ebeacb..0000000 --- a/src/pkg/deepCurse/nopalmo/command/AbstractCommand.java +++ /dev/null @@ -1,49 +0,0 @@ -package pkg.deepCurse.nopalmo.command; - -import java.util.HashMap; - -import org.jetbrains.annotations.Nullable; - -import pkg.deepCurse.nopalmo.manager.Argument; - -public abstract class AbstractCommand { // TODO rewrite to implement type args? - - public abstract String[] getCommandCalls(); - - public String getCommandName() { - return getCommandCalls()[0]; - } - - public boolean isNSFW() { - return false; - } - - public boolean isPremium() { // im probably never gonna use this, but ill leave it in for those who want to - // see how i would implement it - return false; - } - - public abstract HelpPage getHelpPage(); - - public enum HelpPage { - General, DEV, EGG, Moderation, Fun, Info - } - - public String getHelp() { - return null; - } - - public String getUsage() { - return null; - } - - public int getTimeout() { - return 0; - } - - @Nullable - public HashMap getArguments() { - return null; - } - -} diff --git a/src/pkg/deepCurse/nopalmo/command/CommandInterface.java b/src/pkg/deepCurse/nopalmo/command/CommandInterface.java new file mode 100644 index 0000000..5fe51f3 --- /dev/null +++ b/src/pkg/deepCurse/nopalmo/command/CommandInterface.java @@ -0,0 +1,87 @@ +package pkg.deepCurse.nopalmo.command; + +import java.util.HashMap; + +import org.jetbrains.annotations.Nullable; + +import net.dv8tion.jda.api.Permission; +import pkg.deepCurse.nopalmo.manager.Argument; +import pkg.deepCurse.nopalmo.manager.CommandBlob; +import pkg.deepCurse.nopalmo.manager.DirectCommandBlob; +import pkg.deepCurse.nopalmo.manager.GuildCommandBlob; + +public interface CommandInterface { // TODO rewrite to implement type args? + + public abstract String[] getCommandCalls(); + + public default String getCommandName() { + return getCommandCalls()[0]; + } + + public default boolean isNSFW() { + return false; + } + + public default boolean isPremium() { // im probably never gonna use this, but ill leave it in for those who want to + // see how i would implement it + return false; + } + + public abstract HelpPage getHelpPage(); + + public enum HelpPage { + General, DEV, EGG, Moderation, Fun, Info + } + + public default String getHelp() { + return null; + } + + public default String getUsage() { + return null; + } + + public default int getTimeout() { + return 0; + } + + @Nullable + public default HashMap getArguments() { + return null; + } + + public interface DualCommandInterface extends DirectCommandInterface, GuildCommandInterface { + @Override + public default void runGuildCommand(GuildCommandBlob blob, HashMap argumentMap) + throws Exception { + runDualCommand(new CommandBlob(blob), argumentMap); + } + + @Override + public default void runDirectCommand(DirectCommandBlob blob, HashMap argumentMap) + throws Exception { + runDualCommand(new CommandBlob(blob), argumentMap); + } + + public void runDualCommand(CommandBlob blob, HashMap argumentMap) + throws Exception; + + } + + public interface DirectCommandInterface extends CommandInterface { + public void runDirectCommand(DirectCommandBlob blob, HashMap argumentList) throws Exception; + } + + public interface GuildCommandInterface extends CommandInterface { + public void runGuildCommand(GuildCommandBlob blob, HashMap argumentList) throws Exception; + + public default Permission[] getRequiredPermissions() { + return null; + } + + public default Permission getRequiredPermission() { + return null; + } + } + +} diff --git a/src/pkg/deepCurse/nopalmo/command/DirectCommand.java b/src/pkg/deepCurse/nopalmo/command/DirectCommand.java deleted file mode 100644 index 5db690f..0000000 --- a/src/pkg/deepCurse/nopalmo/command/DirectCommand.java +++ /dev/null @@ -1,12 +0,0 @@ -package pkg.deepCurse.nopalmo.command; - -import java.util.HashMap; - -import pkg.deepCurse.nopalmo.manager.Argument; -import pkg.deepCurse.nopalmo.manager.DirectCommandBlob; - -public abstract class DirectCommand extends AbstractCommand { - - public abstract void runCommand(DirectCommandBlob blob, HashMap argumentList) throws Exception; - -} diff --git a/src/pkg/deepCurse/nopalmo/command/GuildCommand.java b/src/pkg/deepCurse/nopalmo/command/GuildCommand.java deleted file mode 100644 index 5af6b2a..0000000 --- a/src/pkg/deepCurse/nopalmo/command/GuildCommand.java +++ /dev/null @@ -1,23 +0,0 @@ -package pkg.deepCurse.nopalmo.command; - -import java.util.HashMap; - -import net.dv8tion.jda.api.Permission; -import pkg.deepCurse.nopalmo.manager.Argument; -import pkg.deepCurse.nopalmo.manager.GuildCommandBlob; - -public abstract class GuildCommand extends AbstractCommand { - - public abstract void runCommand(GuildCommandBlob blob, HashMap argumentList) throws Exception; - - public abstract String[] getCommandCalls(); - - public Permission[] getRequiredPermissions() { - return null; - } - - public Permission getRequiredPermission() { - - return null; - } -} diff --git a/src/pkg/deepCurse/nopalmo/command/commands/Git.java b/src/pkg/deepCurse/nopalmo/command/commands/Git.java new file mode 100644 index 0000000..e0829c3 --- /dev/null +++ b/src/pkg/deepCurse/nopalmo/command/commands/Git.java @@ -0,0 +1,26 @@ +package pkg.deepCurse.nopalmo.command.commands; + +import java.util.HashMap; + +import pkg.deepCurse.nopalmo.command.CommandInterface.DualCommandInterface; +import pkg.deepCurse.nopalmo.manager.Argument; +import pkg.deepCurse.nopalmo.manager.CommandBlob; + +public class Git implements DualCommandInterface { + + @Override + public void runDualCommand(CommandBlob blob, HashMap argumentMap) throws Exception { + blob.getChannel().sendMessage("Heres the link: https://github.com/lever1209/nopalmo").queue(); + } + + @Override + public String[] getCommandCalls() { + return new String[] { "git", "source", "github" }; + } + + @Override + public HelpPage getHelpPage() { + return HelpPage.Info; + } + +} diff --git a/src/pkg/deepCurse/nopalmo/command/guildCommand/info/Help.java b/src/pkg/deepCurse/nopalmo/command/commands/Help.java similarity index 89% rename from src/pkg/deepCurse/nopalmo/command/guildCommand/info/Help.java rename to src/pkg/deepCurse/nopalmo/command/commands/Help.java index 5302fa6..1723ef3 100644 --- a/src/pkg/deepCurse/nopalmo/command/guildCommand/info/Help.java +++ b/src/pkg/deepCurse/nopalmo/command/commands/Help.java @@ -1,4 +1,4 @@ -package pkg.deepCurse.nopalmo.command.guildCommand.info; +package pkg.deepCurse.nopalmo.command.commands; import java.time.Instant; import java.util.HashMap; @@ -6,13 +6,13 @@ import java.util.Random; import java.util.concurrent.TimeUnit; import net.dv8tion.jda.api.EmbedBuilder; -import pkg.deepCurse.nopalmo.command.GuildCommand; +import pkg.deepCurse.nopalmo.command.CommandInterface.GuildCommandInterface; import pkg.deepCurse.nopalmo.database.DatabaseTools.Tools.Global; import pkg.deepCurse.nopalmo.manager.Argument; import pkg.deepCurse.nopalmo.manager.GuildCommandBlob; import pkg.deepCurse.nopalmo.manager.GuildCommandManager; -public class Help extends GuildCommand { +public class Help implements GuildCommandInterface { public final GuildCommandManager manager; @@ -21,14 +21,14 @@ public class Help extends GuildCommand { } @Override - public void runCommand(GuildCommandBlob blob, HashMap argumentMap) throws Exception { + public void runGuildCommand(GuildCommandBlob blob, HashMap argumentMap) throws Exception { if (argumentMap.isEmpty()) { EmbedBuilder embed = new EmbedBuilder().setTitle("Commands:"); HashMap commandHash = new HashMap(); - for (GuildCommand command : manager.getGuildCommands()) { + for (GuildCommandInterface command : manager.getGuildCommands()) { commandHash.put(command.getHelpPage(), commandHash.get(command.getHelpPage()) + command.getCommandName()); @@ -37,12 +37,12 @@ public class Help extends GuildCommand { StringBuilder sB = new StringBuilder(); - GuildCommand ping = blob.getCommandManager().getCommand("ping"); + GuildCommandInterface ping = blob.getCommandManager().getCommand("ping"); if (ping != null) { sB.append("`" + ping.getUsage() + "`\n"); } - GuildCommand help = blob.getCommandManager().getCommand("help"); + GuildCommandInterface help = blob.getCommandManager().getCommand("help"); if (help != null) { sB.append("`" + help.getUsage() + "`\n"); } @@ -86,7 +86,7 @@ public class Help extends GuildCommand { // ########################################################################################################################## try { - GuildCommand command = manager.getCommand(String.join("", blob.getArgs())); + GuildCommandInterface command = manager.getCommand(String.join("", blob.getArgs())); // event.getChannel().sendMessage("Command help for `" + command.commandName() + // "`:\n\tUsage: "+ command.usageString() + "\n" + diff --git a/src/pkg/deepCurse/nopalmo/command/guildCommand/info/Ping.java b/src/pkg/deepCurse/nopalmo/command/commands/Ping.java similarity index 58% rename from src/pkg/deepCurse/nopalmo/command/guildCommand/info/Ping.java rename to src/pkg/deepCurse/nopalmo/command/commands/Ping.java index 7e07349..cf7f4f3 100644 --- a/src/pkg/deepCurse/nopalmo/command/guildCommand/info/Ping.java +++ b/src/pkg/deepCurse/nopalmo/command/commands/Ping.java @@ -1,32 +1,44 @@ -package pkg.deepCurse.nopalmo.command.guildCommand.info; +package pkg.deepCurse.nopalmo.command.commands; import java.util.HashMap; -import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent; -import pkg.deepCurse.nopalmo.command.GuildCommand; +import net.dv8tion.jda.api.entities.MessageChannel; +import pkg.deepCurse.nopalmo.command.CommandInterface.DirectCommandInterface; +import pkg.deepCurse.nopalmo.command.CommandInterface.GuildCommandInterface; import pkg.deepCurse.nopalmo.database.DatabaseTools.Tools.Global; import pkg.deepCurse.nopalmo.manager.Argument; +import pkg.deepCurse.nopalmo.manager.CommandBlob; +import pkg.deepCurse.nopalmo.manager.DirectCommandBlob; import pkg.deepCurse.nopalmo.manager.GuildCommandBlob; import pkg.deepCurse.nopalmo.utils.UptimePing; -public class Ping extends GuildCommand { +public class Ping implements GuildCommandInterface, DirectCommandInterface { @Override - public void runCommand(GuildCommandBlob blob, HashMap argumentMap) throws Exception { - - GuildMessageReceivedEvent event = blob.getEvent(); + public void runGuildCommand(GuildCommandBlob blob, HashMap argumentMap) throws Exception { + dualCommand(new CommandBlob(blob), argumentMap); + } + + @Override + public void runDirectCommand(DirectCommandBlob blob, HashMap argumentMap) throws Exception { + dualCommand(new CommandBlob(blob), argumentMap); + } + + private void dualCommand(CommandBlob blob, HashMap argumentMap) throws Exception { + MessageChannel channel = blob.getChannel(); + if (argumentMap.isEmpty()) { - event.getChannel().sendMessage("Pong!\n" + event.getJDA().getGatewayPing() + "ms\n").queue(); + channel.sendMessage("Pong!\n" + blob.getJDA().getGatewayPing() + "ms\n").queue(); return; } if (argumentMap.get("all") != null) { - event.getChannel().sendMessage("Gathering data. . .").queue(msg -> { + channel.sendMessage("Gathering data. . .").queue(msg -> { long timeToProcess = System.currentTimeMillis(); - long jdaPing = event.getJDA().getGatewayPing(); + long jdaPing = blob.getJDA().getGatewayPing(); long googlePing = -1; try { googlePing = UptimePing.sendPing("www.google.com"); @@ -50,21 +62,6 @@ public class Ping extends GuildCommand { .queue(); }); } - -// if (argumentArray == null || argumentArray.isEmpty()) { -// -// return; -// } else { -// -// for (Argument i : argumentArray) { -// if (i.getArgName().contentEquals("all")) { -// -// } else { -// Tools.wrongUsage(event.getChannel(), this); -// } -// } -// return; -// } } @Override diff --git a/src/pkg/deepCurse/nopalmo/command/directCommand/info/DirectMessagePing.java b/src/pkg/deepCurse/nopalmo/command/directCommand/info/DirectMessagePing.java deleted file mode 100644 index 3d5f2b2..0000000 --- a/src/pkg/deepCurse/nopalmo/command/directCommand/info/DirectMessagePing.java +++ /dev/null @@ -1,84 +0,0 @@ -package pkg.deepCurse.nopalmo.command.directCommand.info; - -import java.util.HashMap; - -import net.dv8tion.jda.api.events.message.MessageReceivedEvent; -import pkg.deepCurse.nopalmo.command.DirectCommand; -import pkg.deepCurse.nopalmo.database.DatabaseTools.Tools.Global; -import pkg.deepCurse.nopalmo.manager.Argument; -import pkg.deepCurse.nopalmo.manager.DirectCommandBlob; -import pkg.deepCurse.nopalmo.utils.UptimePing; - -public class DirectMessagePing extends DirectCommand { - - @Override - public void runCommand(DirectCommandBlob blob, - HashMap argumentMap) throws Exception { - - MessageReceivedEvent event = blob.getEvent(); - - if (argumentMap.isEmpty()) { - event.getChannel().sendMessage("Pong!\n" + event.getJDA().getGatewayPing() + "ms\n").queue(); - return; - } - - if (argumentMap.get("all") != null) { - - event.getChannel().sendMessage("Gathering data. . .").queue(msg -> { - long timeToProcess = System.currentTimeMillis(); - - try { // TODO rewrite this block, all tries are not good practice - - String out = "Pong!\n" + "Google: " + UptimePing.sendPing("www.google.com") + "ms\n" - + "JDA Gateway: " + event.getJDA().getGatewayPing() + "ms\n" + "www.discord.com: " - + UptimePing.sendPing("www.discord.com") + "ms"; - - msg.editMessage(out + "\nTime to process: " + (System.currentTimeMillis() - timeToProcess) + "ms") - .queue(); - } catch (Exception e) { - e.printStackTrace(); - } - }); - } - -// if (argumentArray == null || argumentArray.isEmpty()) { -// -// return; -// } else { -// -// for (Argument i : argumentArray) { -// if (i.getArgName().contentEquals("all")) { -// -// } else { -// Tools.wrongUsage(event.getChannel(), this); -// } -// } -// return; -// } - } - - @Override - public String[] getCommandCalls() { - return new String[] { "ping" }; - } - - @Override - public String getUsage() { - return Global.prefix + "ping [" + Argument.argumentPrefix + "all]"; - } - - @Override - public HelpPage getHelpPage() { - return HelpPage.Info; - } - - @Override - public HashMap getArguments() { - HashMap args = new HashMap(); - - args.put("all", new Argument("all").setPrefixRequirement(true)); - - return args; - } - -} diff --git a/src/pkg/deepCurse/nopalmo/command/guildCommand/info/Git.java b/src/pkg/deepCurse/nopalmo/command/guildCommand/info/Git.java deleted file mode 100644 index 29df489..0000000 --- a/src/pkg/deepCurse/nopalmo/command/guildCommand/info/Git.java +++ /dev/null @@ -1,28 +0,0 @@ -package pkg.deepCurse.nopalmo.command.guildCommand.info; - -import java.util.HashMap; - -import pkg.deepCurse.nopalmo.command.GuildCommand; -import pkg.deepCurse.nopalmo.manager.Argument; -import pkg.deepCurse.nopalmo.manager.GuildCommandBlob; - -public class Git extends GuildCommand { - - @Override - public void runCommand(GuildCommandBlob blob, HashMap argumentList) throws Exception { - blob.getEvent().getChannel().sendMessage("Heres the link: https://github.com/lever1209/nopalmo").queue(); - } - - @Override - public String[] getCommandCalls() { - // TODO Auto-generated method stub - return new String[] { "git", "source", "github" }; - } - - @Override - public HelpPage getHelpPage() { - // TODO Auto-generated method stub - return HelpPage.Info; - } - -} diff --git a/src/pkg/deepCurse/nopalmo/global/Tools.java b/src/pkg/deepCurse/nopalmo/global/Tools.java index e8dabb1..3550894 100644 --- a/src/pkg/deepCurse/nopalmo/global/Tools.java +++ b/src/pkg/deepCurse/nopalmo/global/Tools.java @@ -1,18 +1,16 @@ package pkg.deepCurse.nopalmo.global; import net.dv8tion.jda.api.entities.MessageChannel; -import net.dv8tion.jda.api.entities.TextChannel; -import pkg.deepCurse.nopalmo.command.DirectCommand; -import pkg.deepCurse.nopalmo.command.GuildCommand; +import pkg.deepCurse.nopalmo.command.CommandInterface; public class Tools { - public static void wrongUsage(TextChannel tc, GuildCommand c) { - tc.sendMessage("Wrong Command Usage!\n" + c.getUsage()).queue(); + public static void wrongUsage(MessageChannel messageChannel, CommandInterface command) { + messageChannel.sendMessage("Wrong Command Usage!\n" + command.getUsage()).queue(); } - public static void wrongUsage(MessageChannel tc, DirectCommand c) { - tc.sendMessage("Wrong Command Usage!\n" + c.getUsage()).queue(); - } +// public static void wrongUsage(MessageChannel tc, DirectCommandInterface c) { +// tc.sendMessage("Wrong Command Usage!\n" + c.getUsage()).queue(); +// } } diff --git a/src/pkg/deepCurse/nopalmo/listener/DirectMessageReceivedListener.java b/src/pkg/deepCurse/nopalmo/listener/DirectMessageReceivedListener.java index 0bf4271..a0fe343 100644 --- a/src/pkg/deepCurse/nopalmo/listener/DirectMessageReceivedListener.java +++ b/src/pkg/deepCurse/nopalmo/listener/DirectMessageReceivedListener.java @@ -21,16 +21,12 @@ public class DirectMessageReceivedListener extends ListenerAdapter { public void onMessageReceived(@Nonnull MessageReceivedEvent event) { Message message = event.getMessage(); String messageRaw = message.getContentRaw(); - System.out.println(messageRaw + "\n<@!" + event.getJDA().getSelfUser().getIdLong() + ">"); + if (messageRaw.contentEquals(Global.prefix + Global.prefix) && DatabaseTools.Tools.Developers.canPowerOffBot(event.getAuthor().getIdLong())) { - // message.addReaction(Reactions.getReaction("galaxyThumb")).complete(); TODO re - // enable - - // message.delete().complete(); - - // pause thread as last resort + // message.addReaction(Reactions.getReaction("galaxyThumb")).complete(); + // TODO re enable event.getJDA().shutdown(); System.exit(0); @@ -43,7 +39,6 @@ public class DirectMessageReceivedListener extends ListenerAdapter { for (String i : prefixArray) { // TODO switch to [] to skip for loop? if (messageRaw.startsWith(i)) { - // System.out.println("breaking"); shouldReturn = false; } } @@ -51,7 +46,6 @@ public class DirectMessageReceivedListener extends ListenerAdapter { // TODO add pre manager commands if (shouldReturn) { - return; } diff --git a/src/pkg/deepCurse/nopalmo/listener/GuildMessageReceivedListener.java b/src/pkg/deepCurse/nopalmo/listener/GuildMessageReceivedListener.java index 113a710..676a109 100644 --- a/src/pkg/deepCurse/nopalmo/listener/GuildMessageReceivedListener.java +++ b/src/pkg/deepCurse/nopalmo/listener/GuildMessageReceivedListener.java @@ -27,13 +27,11 @@ public class GuildMessageReceivedListener extends ListenerAdapter { if (messageRaw.contentEquals(Global.prefix + Global.prefix) && DatabaseTools.Tools.Developers.canPowerOffBot(event.getAuthor().getIdLong())) { - // message.addReaction(Reactions.getReaction("galaxyThumb")).complete(); TODO re - // enable + // message.addReaction(Reactions.getReaction("galaxyThumb")).complete(); + // TODO re enable message.delete().complete(); - // pause thread as last resort - event.getJDA().shutdown(); System.exit(0); } diff --git a/src/pkg/deepCurse/nopalmo/manager/CommandBlob.java b/src/pkg/deepCurse/nopalmo/manager/CommandBlob.java new file mode 100644 index 0000000..8ab1bcf --- /dev/null +++ b/src/pkg/deepCurse/nopalmo/manager/CommandBlob.java @@ -0,0 +1,119 @@ +package pkg.deepCurse.nopalmo.manager; + +import java.util.ArrayList; + +import net.dv8tion.jda.api.JDA; +import net.dv8tion.jda.api.entities.MessageChannel; +import net.dv8tion.jda.api.entities.PrivateChannel; +import net.dv8tion.jda.api.entities.TextChannel; +import net.dv8tion.jda.api.events.Event; +import net.dv8tion.jda.api.events.message.MessageReceivedEvent; +import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent; + +public class CommandBlob { + + // CONTAINER/TRANSLATOR CLASS FOR COMMAND BLOBS + + private Event event = null; + private CommandManager commandManager = null; + private ArrayList args = null; + private JDA bot = null; + + private long userID = 0; + private long channelID = 0; + + public CommandBlob(GuildMessageReceivedEvent event) { + this.event = event; + this.bot = event.getJDA(); + } + + public CommandBlob(MessageReceivedEvent event) { + this.event = event; + this.bot = event.getJDA(); + } + + public CommandBlob(GuildCommandBlob blob) { + this.args = blob.getArgs(); + this.channelID = blob.getChannelID(); + this.commandManager = blob.getCommandManager(); + this.event = blob.getEvent(); + this.userID = blob.getUserID(); + this.bot = blob.getEvent().getJDA(); + } + + public CommandBlob(DirectCommandBlob blob) { + this.args = blob.getArgs(); + this.channelID = blob.getChannelID(); + this.commandManager = blob.getCommandManager(); + this.event = blob.getEvent(); + this.userID = blob.getUserID(); + this.bot = blob.getEvent().getJDA(); + } + + public long getChannelID() { + return channelID; + } + + public CommandBlob setChannelID(long channelID) { + this.channelID = channelID; + return this; + } + + public MessageChannel getChannel() { + TextChannel textChannel = bot.getTextChannelById(channelID); + if (textChannel != null){ + return textChannel; + } + PrivateChannel privateChannel = bot.getPrivateChannelById(channelID); + if (privateChannel != null){ + return privateChannel; + } + return null; + } + + public MessageChannel getMessageChannel(long channelID) { + return bot.getTextChannelById(channelID); + } + + public long getUserID() { + return userID; + } + + public JDA getJDA() { + return bot; + } + + public CommandBlob setUserID(long userID) { + this.userID = userID; + return this; + } + + public ArrayList getArgs() { + return args; + } + + public CommandBlob setArgs(ArrayList args) { + this.args = args; + return this; + } + + public CommandManager getCommandManager() { + return commandManager; + + } + + public CommandBlob setCommandManager(CommandManager commandManager) { + this.commandManager = commandManager; + return this; + } + + public Event getEvent() { + if (event instanceof GuildMessageReceivedEvent) { + return (GuildMessageReceivedEvent) event; + } else if (event instanceof MessageReceivedEvent) { + return (MessageReceivedEvent) event; + } else + return null; + } + +} diff --git a/src/pkg/deepCurse/nopalmo/manager/CommandManager.java b/src/pkg/deepCurse/nopalmo/manager/CommandManager.java new file mode 100644 index 0000000..fc7cb61 --- /dev/null +++ b/src/pkg/deepCurse/nopalmo/manager/CommandManager.java @@ -0,0 +1,7 @@ +package pkg.deepCurse.nopalmo.manager; + +public abstract class CommandManager { + + + +} diff --git a/src/pkg/deepCurse/nopalmo/manager/DirectCommandBlob.java b/src/pkg/deepCurse/nopalmo/manager/DirectCommandBlob.java index adb5c01..50d8bc1 100644 --- a/src/pkg/deepCurse/nopalmo/manager/DirectCommandBlob.java +++ b/src/pkg/deepCurse/nopalmo/manager/DirectCommandBlob.java @@ -7,13 +7,12 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent; public class DirectCommandBlob { private DirectCommandManager commandManager = null; - private ArrayList args = null; - + private ArrayList args = null; + private MessageReceivedEvent event = null; + private long userID = 0; private long channelID = 0; - private MessageReceivedEvent event = null; - public DirectCommandBlob(MessageReceivedEvent event) { setUserID(event.getAuthor().getIdLong()); setChannelID(event.getChannel().getIdLong());this.event = event; diff --git a/src/pkg/deepCurse/nopalmo/manager/DirectCommandManager.java b/src/pkg/deepCurse/nopalmo/manager/DirectCommandManager.java index c54b16c..5997e4a 100644 --- a/src/pkg/deepCurse/nopalmo/manager/DirectCommandManager.java +++ b/src/pkg/deepCurse/nopalmo/manager/DirectCommandManager.java @@ -12,15 +12,15 @@ import java.util.concurrent.Executors; import java.util.regex.Pattern; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; -import pkg.deepCurse.nopalmo.command.DirectCommand; -import pkg.deepCurse.nopalmo.command.directCommand.info.DirectMessagePing; +import pkg.deepCurse.nopalmo.command.CommandInterface.DirectCommandInterface; +import pkg.deepCurse.nopalmo.command.commands.Ping; import pkg.deepCurse.nopalmo.core.Boot; import pkg.deepCurse.nopalmo.database.DatabaseTools; import pkg.deepCurse.nopalmo.global.Tools; -public class DirectCommandManager { +public class DirectCommandManager extends CommandManager { - private final Map directCommandMap = new HashMap<>(); + private final Map directCommandMap = new HashMap<>(); private static Executor executor = null; public DirectCommandManager() { @@ -30,11 +30,11 @@ public class DirectCommandManager { public void init() { - addCommand(new DirectMessagePing()); + addCommand(new Ping()); } - private void addCommand(DirectCommand c) { + private void addCommand(DirectCommandInterface c) { if (!directCommandMap.containsKey(c.getCommandName())) { directCommandMap.put(c.getCommandName(), c); } else { @@ -43,11 +43,11 @@ public class DirectCommandManager { } } - public Collection getDirectCommands() { + public Collection getDirectCommands() { return directCommandMap.values(); } - public DirectCommand getCommand(String commandName) { + public DirectCommandInterface getCommand(String commandName) { if (commandName != null) { return directCommandMap.get(commandName); } @@ -69,11 +69,8 @@ public class DirectCommandManager { long commandStartTime = System.currentTimeMillis(); try { - // ArrayList newArguments = new ArrayList(); - // ArrayList commandFlags = new ArrayList(); - DirectCommandBlob commandBlob = new DirectCommandBlob(messageReceivedEvent); - DirectCommand directCommand = directCommandMap.get(command); + DirectCommandInterface directCommand = directCommandMap.get(command); HashMap argumentList = new HashMap(); boolean printTime = false; @@ -142,7 +139,7 @@ public class DirectCommandManager { commandBlob.setCommandManager(this); if (remainsValid) { - directCommand.runCommand(commandBlob, argumentList); + directCommand.runDirectCommand(commandBlob, argumentList); } if (printTime) { diff --git a/src/pkg/deepCurse/nopalmo/manager/GuildCommandManager.java b/src/pkg/deepCurse/nopalmo/manager/GuildCommandManager.java index 5120557..3882207 100644 --- a/src/pkg/deepCurse/nopalmo/manager/GuildCommandManager.java +++ b/src/pkg/deepCurse/nopalmo/manager/GuildCommandManager.java @@ -12,17 +12,17 @@ import java.util.concurrent.Executors; import java.util.regex.Pattern; import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent; -import pkg.deepCurse.nopalmo.command.GuildCommand; -import pkg.deepCurse.nopalmo.command.guildCommand.info.Git; -import pkg.deepCurse.nopalmo.command.guildCommand.info.Help; -import pkg.deepCurse.nopalmo.command.guildCommand.info.Ping; +import pkg.deepCurse.nopalmo.command.CommandInterface.GuildCommandInterface; +import pkg.deepCurse.nopalmo.command.commands.Git; +import pkg.deepCurse.nopalmo.command.commands.Help; +import pkg.deepCurse.nopalmo.command.commands.Ping; import pkg.deepCurse.nopalmo.core.Boot; import pkg.deepCurse.nopalmo.database.DatabaseTools; import pkg.deepCurse.nopalmo.global.Tools; -public class GuildCommandManager { +public class GuildCommandManager extends CommandManager { - private final Map guildCommandMap = new HashMap<>(); + private final Map guildCommandMap = new HashMap<>(); private static Executor executor = null; public GuildCommandManager() { @@ -36,7 +36,7 @@ public class GuildCommandManager { addCommand(new Git()); } - private void addCommand(GuildCommand c) { + private void addCommand(GuildCommandInterface c) { if (!guildCommandMap.containsKey(c.getCommandName())) { guildCommandMap.put(c.getCommandName(), c); } else { @@ -45,11 +45,11 @@ public class GuildCommandManager { } } - public Collection getGuildCommands() { + public Collection getGuildCommands() { return guildCommandMap.values(); } - public GuildCommand getCommand(String commandName) { + public GuildCommandInterface getCommand(String commandName) { if (commandName != null) { return guildCommandMap.get(commandName); } @@ -75,7 +75,7 @@ public class GuildCommandManager { // ArrayList commandFlags = new ArrayList(); GuildCommandBlob commandBlob = new GuildCommandBlob(guildMessage); - GuildCommand guildCommand = guildCommandMap.get(command); + GuildCommandInterface guildCommand = guildCommandMap.get(command); HashMap argumentList = new HashMap(); boolean printTime = false; @@ -144,7 +144,7 @@ public class GuildCommandManager { commandBlob.setCommandManager(this); if (remainsValid) { - guildCommand.runCommand(commandBlob, argumentList); + guildCommand.runGuildCommand(commandBlob, argumentList); } if (printTime) { diff --git a/src/pkg/deepCurse/nopalmo/utils/UptimePing.java b/src/pkg/deepCurse/nopalmo/utils/UptimePing.java index f95bba3..12e8266 100644 --- a/src/pkg/deepCurse/nopalmo/utils/UptimePing.java +++ b/src/pkg/deepCurse/nopalmo/utils/UptimePing.java @@ -1,9 +1,7 @@ package pkg.deepCurse.nopalmo.utils; -import java.io.IOException; import java.net.InetAddress; import java.net.InetSocketAddress; -import java.net.UnknownHostException; import java.nio.channels.SocketChannel; import java.util.Date;