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 270786b..3987258 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/developer/CreateGalleryCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/developer/CreateGalleryCommand.java @@ -31,7 +31,7 @@ public class CreateGalleryCommand extends Command { // TODO: This command needs @Override public String usage() { return "creategallery "; } @Override public String category() { return "Developer"; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.OWNER); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("creategallery", "addgallery", "addgall")); } + @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("creategallery", "addgallery", "newgallery")); } static final RethinkDB R = RethinkDB.r; static final Connection CONN = R.connection().hostname("localhost").port(28015).connect(); @@ -42,6 +42,10 @@ public class CreateGalleryCommand extends Command { // TODO: This command needs ctx.reply("This command can only be used in a server!"); // TODO: Stop this. Turn this into a preset no-no embed. return; } + if (ctx.getArgs().length != 1) { + ctx.reply("Args are incorrect"); + return; + } // Check if the channel is already a registered gallery channel. // Create a gallery channel of the current channel. // Store the gallery channel in the database. @@ -53,12 +57,15 @@ public class CreateGalleryCommand extends Command { // TODO: This command needs return; } } catch (SQLException e) { - ctx.reply("An error occurred"); // TODO: error logging. + ctx.reply(String.format("Error: %s", e.getMessage())); // TODO: error logging. + return; } + String tag = ctx.getArgs()[0]; + GalleryChannel gallery = new GalleryChannel(); gallery.channelId = channelId; - String tag = ctx.getArgs()[0]; + gallery.tag = tag; ctx.getServer().ifPresent(server -> { gallery.serverId = server.getIdAsString(); @@ -70,16 +77,17 @@ public class CreateGalleryCommand extends Command { // TODO: This command needs try { GalleryController.insert(gallery); } catch(SQLException e) { - ctx.reply("An error occurred."); // TODO: error logging. + ctx.reply(String.format("Error: %s", e.getMessage())); // TODO: error logging. + return; } EmbedBuilder embed = new EmbedBuilder() .setColor(Color.GREEN) - .addField("Success", "Channel added to storage with the following values:") + .addField("Success", "Gallery has been created:") .addField("Channel Name:", gallery.channelName) .addField("Channel Id:", gallery.channelId) .addField("Tag:", tag) - .addField("End:", String.format("Table \"%s\" created for images in this channel", tag)); + .addField("End:", String.format("This channel is now being tracked under: %s", tag)); ctx.getChannel().sendMessage(embed); } } diff --git a/src/main/java/dev/salmonllama/fsbot/database/controllers/GalleryController.java b/src/main/java/dev/salmonllama/fsbot/database/controllers/GalleryController.java index 9a40b13..d4b35a9 100644 --- a/src/main/java/dev/salmonllama/fsbot/database/controllers/GalleryController.java +++ b/src/main/java/dev/salmonllama/fsbot/database/controllers/GalleryController.java @@ -38,9 +38,9 @@ public class GalleryController { } public static boolean galleryExists(String channelId) throws SQLException { - ResultSet rs = FSDB.get().select("SELECT EXISTS(SELECT 1 AS exists FROM galleries WHERE channel_id = ?", channelId); + ResultSet rs = FSDB.get().select("SELECT EXISTS(SELECT 1 FROM galleries WHERE channel_id = ?) AS hmm", channelId); - boolean exists = rs.getBoolean("exists"); + boolean exists = rs.getBoolean("hmm"); FSDB.get().close(rs); return exists; diff --git a/src/main/java/dev/salmonllama/fsbot/guthix/CommandContext.java b/src/main/java/dev/salmonllama/fsbot/guthix/CommandContext.java index a59b78d..f997a1c 100644 --- a/src/main/java/dev/salmonllama/fsbot/guthix/CommandContext.java +++ b/src/main/java/dev/salmonllama/fsbot/guthix/CommandContext.java @@ -125,6 +125,7 @@ public class CommandContext { String usedAlias, String[] args ) { + this.event = event; this.api = event.getApi(); this.message = event.getMessage(); this.author = event.getMessageAuthor();