From 6f5451f37df560579f25e402020ae7ec954acc7f Mon Sep 17 00:00:00 2001 From: anthorob Date: Fri, 24 Jun 2022 15:20:39 -0400 Subject: [PATCH] renamed a couple of things --- docker-compose.yml | 3 ++- .../netneutrality/command/basic/HelpCommand.java | 6 +++--- .../netneutrality/command/basic/PingCommand.java | 2 +- .../command/bot/ConfigureCommand.java | 16 ++++++++-------- .../command/crypto/BitcoinPriceCommand.java | 2 +- .../command/crypto/CryptoPriceCommand.java | 2 +- .../command/crypto/EthereumPriceCommand.java | 2 +- .../command/crypto/LitecoinPriceCommand.java | 2 +- .../command/message/BlacklistCommand.java | 2 +- .../command/message/PruneCommand.java | 4 ++-- .../command/music/DeleteQueueCommand.java | 8 ++++---- .../netneutrality/command/music/SkipCommand.java | 2 +- .../command/music/VolumeCommand.java | 2 +- .../command/specific/DatabaseCommand.java | 2 +- .../core/context/CommandContext.java | 8 ++------ src/main/java/netneutrality/utils/JpaUtils.java | 2 +- 16 files changed, 31 insertions(+), 34 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2a8d877..15a9e7b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,7 @@ version: '3.3' services: db: image: mariadb:10.7 + container_name: db restart: always volumes: - netneutrality-db:/var/lib/mysql @@ -18,7 +19,7 @@ services: - internal bot: - image: netneutrality:dev + container_name: bot build: ./ restart: always depends_on: diff --git a/src/main/java/netneutrality/command/basic/HelpCommand.java b/src/main/java/netneutrality/command/basic/HelpCommand.java index c8eef3e..94e9e2f 100644 --- a/src/main/java/netneutrality/command/basic/HelpCommand.java +++ b/src/main/java/netneutrality/command/basic/HelpCommand.java @@ -59,15 +59,15 @@ public class HelpCommand extends AbstractCommand { @Override public void execute(CommandContext context) { - if (context.getArgumentsAsArray().length == 0) { + if (context.getArgs().length == 0) { List help = MessageFunction.buildHelpMessage(CommandManager.commands, UserFunction.isAdmin(context.getGuildUser())); context.reply(new MessageBuilder().append(context.getDiscordUser()).append(" help has been sent your way!").build()); context.replyPrivate(help); } - if (context.getArgumentsAsArray().length == 1) { - String cmd = context.getArg(0); + if (context.getArgs().length == 1) { + String cmd = context.getArgument(0); if (CommandManager.commands.containsKey(cmd) || CommandManager.commandsAlias.containsKey(cmd)) { AbstractCommand c = CommandManager.commands.containsKey(cmd) ? CommandManager.commands.get(cmd) : CommandManager.commandsAlias.get(cmd); diff --git a/src/main/java/netneutrality/command/basic/PingCommand.java b/src/main/java/netneutrality/command/basic/PingCommand.java index 432c9bf..6551022 100644 --- a/src/main/java/netneutrality/command/basic/PingCommand.java +++ b/src/main/java/netneutrality/command/basic/PingCommand.java @@ -50,7 +50,7 @@ public class PingCommand extends AbstractCommand { @Override public void execute(CommandContext context) { - if (context.getArgumentsAsArray().length == 0) + if (context.getArgs().length == 0) context.reply(String.format("Pong! [%d ms]", context.getJDA().getGatewayPing())); } diff --git a/src/main/java/netneutrality/command/bot/ConfigureCommand.java b/src/main/java/netneutrality/command/bot/ConfigureCommand.java index b564262..9a1b550 100644 --- a/src/main/java/netneutrality/command/bot/ConfigureCommand.java +++ b/src/main/java/netneutrality/command/bot/ConfigureCommand.java @@ -57,13 +57,13 @@ public class ConfigureCommand extends AbstractCommand { @Override public void execute(CommandContext context) { - String[] args = context.getArgumentsAsArray(); + String[] args = context.getArgs(); GuildManager guildManager = GuildManager.getManager(context.getGuild()); if (args.length > 0) { // Role for music commands - if (context.getArg(0).equals("music-role")) { + if (context.getArgument(0).equals("music-role")) { if (args.length == 1) { String roleDb = guildManager.getSetting(GuildManager.Settings.MUSIC_ROLE); Role role = null; @@ -76,7 +76,7 @@ public class ConfigureCommand extends AbstractCommand { } if (args.length == 2) { - if (context.getArg(1).equals("reset")) { + if (context.getArgument(1).equals("reset")) { if (!guildManager.getSetting(GuildManager.Settings.MUSIC_ROLE).isEmpty()) { guildManager.setSettingValue(GuildManager.Settings.MUSIC_ROLE, null); } @@ -96,7 +96,7 @@ public class ConfigureCommand extends AbstractCommand { } // Role for music commands - if (context.getArg(0).equals("music-channel")) { + if (context.getArgument(0).equals("music-channel")) { if (args.length == 1) { String channelDb = guildManager.getSetting(GuildManager.Settings.MUSIC_CHANNEL); TextChannel channel = null; @@ -109,7 +109,7 @@ public class ConfigureCommand extends AbstractCommand { } if (args.length == 2) { - if (context.getArg(1).equals("reset")) { + if (context.getArgument(1).equals("reset")) { if (!guildManager.getSetting(GuildManager.Settings.MUSIC_CHANNEL).isEmpty()) { guildManager.setSettingValue(GuildManager.Settings.MUSIC_CHANNEL, null); } @@ -129,7 +129,7 @@ public class ConfigureCommand extends AbstractCommand { } // Default volume for music player - if (context.getArg(0).equals("music-volume")) { + if (context.getArgument(0).equals("music-volume")) { if (args.length == 1) { int volume = Integer.parseInt(guildManager.getSetting(GuildManager.Settings.MUSIC_VOLUME)); @@ -156,7 +156,7 @@ public class ConfigureCommand extends AbstractCommand { } // Music topic change - if (context.getArg(0).equals("music-topic")) { + if (context.getArgument(0).equals("music-topic")) { if (args.length == 1) { boolean enabled = "1".equals(guildManager.getSetting(GuildManager.Settings.MUSIC_TOPIC)); @@ -178,7 +178,7 @@ public class ConfigureCommand extends AbstractCommand { } // Debug - if (context.getArg(0).equals("debug")) { + if (context.getArgument(0).equals("debug")) { if (args.length == 1) { boolean debug = guildManager.isDebugEnabled(); diff --git a/src/main/java/netneutrality/command/crypto/BitcoinPriceCommand.java b/src/main/java/netneutrality/command/crypto/BitcoinPriceCommand.java index 8e31c2d..f9a907e 100644 --- a/src/main/java/netneutrality/command/crypto/BitcoinPriceCommand.java +++ b/src/main/java/netneutrality/command/crypto/BitcoinPriceCommand.java @@ -63,7 +63,7 @@ public class BitcoinPriceCommand extends AbstractCommand { @Override public void execute(CommandContext context) { - String[] args = context.getArgumentsAsArray(); + String[] args = context.getArgs(); String currency = "USD"; if (args.length == 1) { diff --git a/src/main/java/netneutrality/command/crypto/CryptoPriceCommand.java b/src/main/java/netneutrality/command/crypto/CryptoPriceCommand.java index 1a220bb..1706b26 100644 --- a/src/main/java/netneutrality/command/crypto/CryptoPriceCommand.java +++ b/src/main/java/netneutrality/command/crypto/CryptoPriceCommand.java @@ -63,7 +63,7 @@ public class CryptoPriceCommand extends AbstractCommand { @Override public void execute(CommandContext context) { - String[] args = context.getArgumentsAsArray(); + String[] args = context.getArgs(); String currency = "USD"; if (args.length > 0) { diff --git a/src/main/java/netneutrality/command/crypto/EthereumPriceCommand.java b/src/main/java/netneutrality/command/crypto/EthereumPriceCommand.java index 414f445..214813f 100644 --- a/src/main/java/netneutrality/command/crypto/EthereumPriceCommand.java +++ b/src/main/java/netneutrality/command/crypto/EthereumPriceCommand.java @@ -63,7 +63,7 @@ public class EthereumPriceCommand extends AbstractCommand { @Override public void execute(CommandContext context) { - String[] args = context.getArgumentsAsArray(); + String[] args = context.getArgs(); String currency = "USD"; if (args.length == 1) { diff --git a/src/main/java/netneutrality/command/crypto/LitecoinPriceCommand.java b/src/main/java/netneutrality/command/crypto/LitecoinPriceCommand.java index 4a1efb7..662d120 100644 --- a/src/main/java/netneutrality/command/crypto/LitecoinPriceCommand.java +++ b/src/main/java/netneutrality/command/crypto/LitecoinPriceCommand.java @@ -63,7 +63,7 @@ public class LitecoinPriceCommand extends AbstractCommand { @Override public void execute(CommandContext context) { - String[] args = context.getArgumentsAsArray(); + String[] args = context.getArgs(); String currency = "USD"; if (args.length == 1) { diff --git a/src/main/java/netneutrality/command/message/BlacklistCommand.java b/src/main/java/netneutrality/command/message/BlacklistCommand.java index 920b88d..d442c2e 100644 --- a/src/main/java/netneutrality/command/message/BlacklistCommand.java +++ b/src/main/java/netneutrality/command/message/BlacklistCommand.java @@ -56,7 +56,7 @@ public class BlacklistCommand extends AbstractCommand { @Override public void execute(CommandContext context) { - String[] args = context.getArgumentsAsArray(); + String[] args = context.getArgs(); DBBlacklist controller = DBController.get(DBBlacklist.class); if (args.length > 0 && args.length < 3) { diff --git a/src/main/java/netneutrality/command/message/PruneCommand.java b/src/main/java/netneutrality/command/message/PruneCommand.java index e9179de..6cc7848 100644 --- a/src/main/java/netneutrality/command/message/PruneCommand.java +++ b/src/main/java/netneutrality/command/message/PruneCommand.java @@ -53,8 +53,8 @@ public class PruneCommand extends AbstractCommand { @Override public void execute(CommandContext context) { - if (context.getArgumentsAsArray().length == 1) - ChannelFunction.bulkDeleteMessage(context.getChannel(), Integer.parseInt(context.getArgumentsAsArray()[0])); + if (context.getArgs().length == 1) + ChannelFunction.bulkDeleteMessage(context.getChannel(), Integer.parseInt(context.getArgument(0))); else context.getChannel().sendMessage("Failed to delete messages!").queue(); } diff --git a/src/main/java/netneutrality/command/music/DeleteQueueCommand.java b/src/main/java/netneutrality/command/music/DeleteQueueCommand.java index 9efd1bd..a44a62a 100644 --- a/src/main/java/netneutrality/command/music/DeleteQueueCommand.java +++ b/src/main/java/netneutrality/command/music/DeleteQueueCommand.java @@ -56,15 +56,15 @@ public class DeleteQueueCommand extends AbstractMusicCommand { if (!MusicUtils.checkIfConnected(player, context)) return; - if (context.getArgumentsAsArray().length == 0) { + if (context.getArgs().length == 0) { context.reply("Select the track you want to delete from the queue (track# or all)"); context.reply(MessageFunction.buildViewQueueMessage(player, context.getGuildUser(), true)); } - if (context.getArgumentsAsArray().length > 0) { + if (context.getArgs().length > 0) { int queueSize = player.getQueueSize(); - if (context.getArg(0).equals("all")) { + if (context.getArgument(0).equals("all")) { if (queueSize > 0) { player.getScheduler().getQueueManager().clearQueue(); @@ -75,7 +75,7 @@ public class DeleteQueueCommand extends AbstractMusicCommand { } else { try { - int num = Integer.parseInt(context.getArg(0)); + int num = Integer.parseInt(context.getArgument(0)); if (num > 0) { if (player.removeFromQueue(num)) { diff --git a/src/main/java/netneutrality/command/music/SkipCommand.java b/src/main/java/netneutrality/command/music/SkipCommand.java index eb784f3..09eab88 100644 --- a/src/main/java/netneutrality/command/music/SkipCommand.java +++ b/src/main/java/netneutrality/command/music/SkipCommand.java @@ -50,7 +50,7 @@ public class SkipCommand extends AbstractMusicCommand { if (UserFunction.isAdmin(context.getGuildUser())) { if (context.getArgs().length > 0) { try { - int skips = Integer.parseInt(context.getArg(0)); + int skips = Integer.parseInt(context.getArgument(0)); player.skip(skips); context.reply("Skipping %s track%s", skips, (skips > 1 ? "s" : "")); diff --git a/src/main/java/netneutrality/command/music/VolumeCommand.java b/src/main/java/netneutrality/command/music/VolumeCommand.java index 95ac941..cafd404 100644 --- a/src/main/java/netneutrality/command/music/VolumeCommand.java +++ b/src/main/java/netneutrality/command/music/VolumeCommand.java @@ -46,7 +46,7 @@ public class VolumeCommand extends AbstractMusicCommand { if (MusicUtils.checkIfConnected(player, context) && MusicUtils.isDj(player, context)) { try { - int volume = Integer.parseInt(context.getArg(0)); + int volume = Integer.parseInt(context.getArgument(0)); if (volume > 0 && volume <= 100) { player.setVolume(volume); diff --git a/src/main/java/netneutrality/command/specific/DatabaseCommand.java b/src/main/java/netneutrality/command/specific/DatabaseCommand.java index edd2928..965daa7 100644 --- a/src/main/java/netneutrality/command/specific/DatabaseCommand.java +++ b/src/main/java/netneutrality/command/specific/DatabaseCommand.java @@ -61,7 +61,7 @@ public class DatabaseCommand extends AbstractCommand { @Override public void execute(CommandContext context) { //TODO: Clean up the mess - String[] args = context.getArgumentsAsArray(); + String[] args = context.getArgs(); context.getMessage().delete().queue(); if (!context.getGuildUser().getId().equals(Settings.getInstance().getCreatorId())) diff --git a/src/main/java/netneutrality/core/context/CommandContext.java b/src/main/java/netneutrality/core/context/CommandContext.java index 22a08d4..4173d53 100644 --- a/src/main/java/netneutrality/core/context/CommandContext.java +++ b/src/main/java/netneutrality/core/context/CommandContext.java @@ -64,15 +64,11 @@ public class CommandContext { return new CommandContext(message, member, user, guild, channel, jda); } - public String getArg(int index) { - return getArgumentsAsArray()[index]; + public String getArgument(int index) { + return getArgs()[index]; } public String[] getArgs() { - return getArgumentsAsArray(); - } - - public String[] getArgumentsAsArray() { String msg = message.getContentDisplay().trim(); msg = msg.substring(Settings.getInstance().get("BOT_PREFIX", "$").length()).trim(); String cmd = msg.split(" ", 2)[0]; diff --git a/src/main/java/netneutrality/utils/JpaUtils.java b/src/main/java/netneutrality/utils/JpaUtils.java index 6ad9d58..29d004b 100644 --- a/src/main/java/netneutrality/utils/JpaUtils.java +++ b/src/main/java/netneutrality/utils/JpaUtils.java @@ -41,7 +41,7 @@ public class JpaUtils { if (object instanceof OGuild oGuild) { String cachedId = oGuild.getGuildId(); - Sentry.captureMessage("Trying to load Guild[" + cachedId + "] while deleted from database, reloading entity..", SentryLevel.ERROR); + Sentry.captureMessage("Trying to load Guild[" + cachedId + "] while entity doesn't exist in database, reloading..", SentryLevel.ERROR); GuildManager guildManager = GuildManager.getManager(cachedId); guildManager.reloadEntity();