From 3c4c4c38bd3a5ccf65efeed12f7383da6d05c8ac Mon Sep 17 00:00:00 2001 From: Salmonllama Date: Fri, 27 Nov 2020 12:10:41 -0500 Subject: [PATCH] Clean up irrelevant/fixed TODOs --- src/main/java/dev/salmonllama/fsbot/Main.java | 4 +--- .../fsbot/commands/developer/CreateGalleryCommand.java | 4 ++-- .../dev/salmonllama/fsbot/commands/general/OutfitCommand.java | 4 ++-- .../dev/salmonllama/fsbot/commands/general/StatsCommand.java | 2 +- .../salmonllama/fsbot/endpoints/imgur/ImgurAPIConnection.java | 2 +- src/main/java/dev/salmonllama/fsbot/guthix/Registry.java | 2 +- .../java/dev/salmonllama/fsbot/listeners/ServerJoined.java | 2 +- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/main/java/dev/salmonllama/fsbot/Main.java b/src/main/java/dev/salmonllama/fsbot/Main.java index a6a3494..47cb97c 100644 --- a/src/main/java/dev/salmonllama/fsbot/Main.java +++ b/src/main/java/dev/salmonllama/fsbot/Main.java @@ -17,8 +17,7 @@ import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -// TODO: auto-switching status messages. -// TODO: Add an official Logger --> logging to Discord, not console + @SpringBootApplication public class Main { @@ -28,7 +27,6 @@ public class Main { public static void main(String[] args) { String configLocation = Constants.BOT_FOLDER.concat(Constants.CONFIG_NAME); BotConfig.initConfig(configLocation, false); - // TODO: Use args to dictate newFiling. Also use args to dictate database setup. FSDB.init(); diff --git a/src/main/java/dev/salmonllama/fsbot/commands/developer/CreateGalleryCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/developer/CreateGalleryCommand.java index 1a38b3d..a58c5f7 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/developer/CreateGalleryCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/developer/CreateGalleryCommand.java @@ -16,7 +16,7 @@ import java.awt.*; import java.util.Arrays; import java.util.List; -public class CreateGalleryCommand extends Command { // TODO: This command needs help. +public class CreateGalleryCommand extends Command { @Override public String name() { return "Create Gallery"; } @Override public String description() { return "Creates a channel gallery, tracking any posted images"; } @Override public String usage() { return "creategallery "; } @@ -27,7 +27,7 @@ public class CreateGalleryCommand extends Command { // TODO: This command needs @Override public void onCommand(CommandContext ctx) { if (ctx.isPrivateMessage()) { - ctx.reply("This command can only be used in a server!"); // TODO: Stop this. Turn this into a preset no-no embed. + ctx.reply("This command can only be used in a server!"); return; } if (ctx.getArgs().length < 1) { diff --git a/src/main/java/dev/salmonllama/fsbot/commands/general/OutfitCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/general/OutfitCommand.java index e530526..196238a 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/general/OutfitCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/general/OutfitCommand.java @@ -49,7 +49,7 @@ public class OutfitCommand extends Command { switch (args.length) { case 0: // Send one single random outfit of the given tag - OutfitController.findRandomByTag(command).thenAccept(possibleOutfit -> { // TODO: Add an orElse case + OutfitController.findRandomByTag(command).thenAccept(possibleOutfit -> { possibleOutfit.ifPresent(outfit -> { ctx.getApi().getUserById(outfit.getSubmitter()).thenAcceptAsync(user -> { EmbedBuilder response = new EmbedBuilder() @@ -91,7 +91,7 @@ public class OutfitCommand extends Command { }); }); } else { - ctx.reply("Improper command usage"); // TODO: Logging update reminder + ctx.reply("Improper command usage"); } } } diff --git a/src/main/java/dev/salmonllama/fsbot/commands/general/StatsCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/general/StatsCommand.java index b8f78c0..43ac046 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/general/StatsCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/general/StatsCommand.java @@ -27,7 +27,7 @@ public class StatsCommand extends Command { int userCount = ctx.getApi().getCachedUsers().size(); // Will these be accurate with sharding? int serverCount = ctx.getApi().getServers().size(); - EmbedBuilder embed = new EmbedBuilder(); // TODO: Standard embeds yeah? + EmbedBuilder embed = new EmbedBuilder(); embed.setTitle("Stats"); embed.addField("Users:", String.valueOf(userCount)); embed.addField("Servers:", String.valueOf(serverCount)); diff --git a/src/main/java/dev/salmonllama/fsbot/endpoints/imgur/ImgurAPIConnection.java b/src/main/java/dev/salmonllama/fsbot/endpoints/imgur/ImgurAPIConnection.java index ff7417b..2313189 100644 --- a/src/main/java/dev/salmonllama/fsbot/endpoints/imgur/ImgurAPIConnection.java +++ b/src/main/java/dev/salmonllama/fsbot/endpoints/imgur/ImgurAPIConnection.java @@ -51,7 +51,7 @@ public class ImgurAPIConnection { try (Response response = client.newCall(request).execute()) { json = new JSONObject(response.body().string()).getJSONObject("data"); } catch (IOException e) { - e.printStackTrace(); // TODO: Do tha logging thang. + e.printStackTrace(); return null; } diff --git a/src/main/java/dev/salmonllama/fsbot/guthix/Registry.java b/src/main/java/dev/salmonllama/fsbot/guthix/Registry.java index 642790c..49e8a77 100644 --- a/src/main/java/dev/salmonllama/fsbot/guthix/Registry.java +++ b/src/main/java/dev/salmonllama/fsbot/guthix/Registry.java @@ -19,7 +19,7 @@ class Registry { commandsMap = new HashMap<>(); } - Predicate valueMatch(String input) { // TODO: Move to a helper class + Predicate valueMatch(String input) { return str -> str.equals(input); } diff --git a/src/main/java/dev/salmonllama/fsbot/listeners/ServerJoined.java b/src/main/java/dev/salmonllama/fsbot/listeners/ServerJoined.java index 54efc79..71a813f 100644 --- a/src/main/java/dev/salmonllama/fsbot/listeners/ServerJoined.java +++ b/src/main/java/dev/salmonllama/fsbot/listeners/ServerJoined.java @@ -10,7 +10,7 @@ import org.javacord.api.listener.server.ServerJoinListener; public class ServerJoined implements ServerJoinListener { - public void onServerJoin(ServerJoinEvent event) { // TODO: This needs fixing yo + public void onServerJoin(ServerJoinEvent event) { // db.newServerProcess(event.getServer()); // EmbedBuilder embed = new EmbedBuilder()