From e0065f25503f87d00328e72734fe955879618ad9 Mon Sep 17 00:00:00 2001 From: NovaFox161 Date: Fri, 5 Jan 2018 14:58:59 -0600 Subject: [PATCH] Change version numbers. --- pom.xml | 2 +- .../com/cloudcraftgaming/discal/Main.java | 2 +- .../module/command/AnnouncementCommand.java | 36 +++++++++---------- .../bot/module/command/EventCommand.java | 10 ++---- 4 files changed, 21 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index 43a102d0..46846b04 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.cloudcraftgaming DisCal - 1.1.0 + 1.2.0 1.8 diff --git a/src/main/java/com/cloudcraftgaming/discal/Main.java b/src/main/java/com/cloudcraftgaming/discal/Main.java index 6654c023..8f7019bb 100644 --- a/src/main/java/com/cloudcraftgaming/discal/Main.java +++ b/src/main/java/com/cloudcraftgaming/discal/Main.java @@ -27,7 +27,7 @@ import java.util.Properties; */ @SuppressWarnings("ThrowableNotThrown") public class Main { - public static String version = "1.1.0"; + public static String version = "1.2.0"; public static IDiscordClient client; public static void main(String[] args) throws IOException { diff --git a/src/main/java/com/cloudcraftgaming/discal/bot/module/command/AnnouncementCommand.java b/src/main/java/com/cloudcraftgaming/discal/bot/module/command/AnnouncementCommand.java index 772ae02d..b38dcd2c 100644 --- a/src/main/java/com/cloudcraftgaming/discal/bot/module/command/AnnouncementCommand.java +++ b/src/main/java/com/cloudcraftgaming/discal/bot/module/command/AnnouncementCommand.java @@ -1266,29 +1266,25 @@ public class AnnouncementCommand implements ICommand { } private void moduleEnable(String[] args, MessageReceivedEvent event, GuildSettings settings) { - if (settings.isDevGuild()) { - long guildId = event.getGuild().getLongID(); - if (args.length == 2) { - if (AnnouncementCreator.getCreator().hasAnnouncement(guildId)) { - Message.sendMessage(MessageManager.getMessage("Announcement.Enable.Creator", settings), event); - } else { - String value = args[1]; - if (!AnnouncementUtils.announcementExists(value, event)) { - Message.sendMessage(MessageManager.getMessage("Creator.Announcement.CannotFind.Announcement", settings), event); - } else { - Announcement a = DatabaseManager.getManager().getAnnouncement(UUID.fromString(value), guildId); - a.setEnabled(!a.isEnabled()); - - DatabaseManager.getManager().updateAnnouncement(a); - - Message.sendMessage(MessageManager.getMessage("Announcement.Enable.Success", "%value%", a.isEnabled() + "", settings), event); - } - } + long guildId = event.getGuild().getLongID(); + if (args.length == 2) { + if (AnnouncementCreator.getCreator().hasAnnouncement(guildId)) { + Message.sendMessage(MessageManager.getMessage("Announcement.Enable.Creator", settings), event); } else { - Message.sendMessage(MessageManager.getMessage("Announcement.Enable.Specify", settings), event); + String value = args[1]; + if (!AnnouncementUtils.announcementExists(value, event)) { + Message.sendMessage(MessageManager.getMessage("Creator.Announcement.CannotFind.Announcement", settings), event); + } else { + Announcement a = DatabaseManager.getManager().getAnnouncement(UUID.fromString(value), guildId); + a.setEnabled(!a.isEnabled()); + + DatabaseManager.getManager().updateAnnouncement(a); + + Message.sendMessage(MessageManager.getMessage("Announcement.Enable.Success", "%value%", a.isEnabled() + "", settings), event); + } } } else { - Message.sendMessage(MessageManager.getMessage("Notification.Disabled", settings), event); + Message.sendMessage(MessageManager.getMessage("Announcement.Enable.Specify", settings), event); } } diff --git a/src/main/java/com/cloudcraftgaming/discal/bot/module/command/EventCommand.java b/src/main/java/com/cloudcraftgaming/discal/bot/module/command/EventCommand.java index a1c8ed1e..ba707f8e 100644 --- a/src/main/java/com/cloudcraftgaming/discal/bot/module/command/EventCommand.java +++ b/src/main/java/com/cloudcraftgaming/discal/bot/module/command/EventCommand.java @@ -139,14 +139,10 @@ public class EventCommand implements ICommand { } break; case "restart": - if (settings.isDevGuild()) { - if (PermissionChecker.hasSufficientRole(event)) { - moduleRestart(args, event, calendarData, settings); - } else { - Message.sendMessage(MessageManager.getMessage("Notification.Perm.CONTROL_ROLE", settings), event); - } + if (PermissionChecker.hasSufficientRole(event)) { + moduleRestart(args, event, calendarData, settings); } else { - Message.sendMessage(MessageManager.getMessage("Notification.Disabled", settings), event); + Message.sendMessage(MessageManager.getMessage("Notification.Perm.CONTROL_ROLE", settings), event); } break; case "cancel":