2.6.0 - First set of Overhauls

+ Patch system to allow for safe updates to file data.
* Overhauled RemindMe command, reminders are now a lot more accurate and
have a hard cap of 1 year, they are now global and persist between
restarts.
+ Dm command RemindMe added
+ ClearReminder command.
+ Dm command ClearReminder added
+ dontlogBot toggle
* Completely overhauled the channelhere system to allow for certain
channels types/settings to allow for multiple channels.
* Custom commands now use `<tag>` instead of `#tag#` for custom
commands. all previously created custom commands will be automatically
fixed to use the new system.
+ lock check for editing ccs.

dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.vaerys</groupId>
   <artifactId>DiscordSAIL</artifactId>
-  <version>2.5.5</version>
+  <version>2.6.0</version>
   <build>
     <resources>
       <resource>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.vaerys</groupId>
     <artifactId>DiscordSAIL</artifactId>
-    <version>2.5.5</version>
+    <version>2.6.0</version>
 
     <build>
         <resources>
@@ -84,11 +84,6 @@
             <artifactId>json</artifactId>
             <version>20140107</version>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>com.google.code.findbugs</groupId>-->
-            <!--<artifactId>jsr305</artifactId>-->
-            <!--<version>1.3.9</version>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>com.github.austinv11</groupId>
             <artifactId>Discord4j</artifactId>

src/main/java/ChannelSettings/InitChannels.java

@@ -0,0 +1,32 @@
+package ChannelSettings;
+
+import ChannelSettings.Settings.*;
+import ChannelSettings.Types.*;
+import Interfaces.ChannelSetting;
+
+import java.util.ArrayList;
+
+/**
+ * Created by Vaerys on 09/04/2017.
+ */
+public class InitChannels {
+
+    public static ArrayList<ChannelSetting> get() {
+        ArrayList<ChannelSetting> channelSettings = new ArrayList<>();
+
+        //Channel Types
+        channelSettings.add(new General());
+        channelSettings.add(new Info());
+        channelSettings.add(new Admin());
+        channelSettings.add(new AdminLog());
+        channelSettings.add(new ServerLog());
+
+        //Channel Settings
+        channelSettings.add(new Shitpost());
+        channelSettings.add(new Servers());
+        channelSettings.add(new BotCommands());
+        channelSettings.add(new DontLog());
+
+        return channelSettings;
+    }
+}

src/main/java/ChannelSettings/Settings/BotCommands.java

@@ -0,0 +1,19 @@
+package ChannelSettings.Settings;
+
+import Interfaces.ChannelSetting;
+import Interfaces.Command;
+
+/**
+ * Created by Vaerys on 09/04/2017.
+ */
+public class BotCommands implements ChannelSetting{
+    @Override
+    public String type() {
+        return Command.CHANNEL_BOT_COMMANDS;
+    }
+
+    @Override
+    public boolean isSetting() {
+        return true;
+    }
+}

src/main/java/ChannelSettings/Settings/DontLog.java

@@ -0,0 +1,19 @@
+package ChannelSettings.Settings;
+
+import Interfaces.ChannelSetting;
+import Interfaces.Command;
+
+/**
+ * Created by Vaerys on 09/04/2017.
+ */
+public class DontLog implements ChannelSetting {
+    @Override
+    public String type() {
+        return Command.CHANNEL_DONT_LOG;
+    }
+
+    @Override
+    public boolean isSetting() {
+        return false;
+    }
+}

src/main/java/ChannelSettings/Settings/Servers.java

@@ -0,0 +1,19 @@
+package ChannelSettings.Settings;
+
+import Interfaces.ChannelSetting;
+import Interfaces.Command;
+
+/**
+ * Created by Vaerys on 09/04/2017.
+ */
+public class Servers implements ChannelSetting {
+    @Override
+    public String type() {
+        return Command.CHANNEL_SERVERS;
+    }
+
+    @Override
+    public boolean isSetting() {
+        return true;
+    }
+}

src/main/java/ChannelSettings/Settings/Shitpost.java

@@ -0,0 +1,19 @@
+package ChannelSettings.Settings;
+
+import Interfaces.ChannelSetting;
+import Interfaces.Command;
+
+/**
+ * Created by Vaerys on 09/04/2017.
+ */
+public class Shitpost implements ChannelSetting{
+    @Override
+    public String type() {
+        return Command.CHANNEL_SHITPOST;
+    }
+
+    @Override
+    public boolean isSetting() {
+        return true;
+    }
+}

src/main/java/ChannelSettings/Types/Admin.java

@@ -0,0 +1,19 @@
+package ChannelSettings.Types;
+
+import Interfaces.ChannelSetting;
+import Interfaces.Command;
+
+/**
+ * Created by Vaerys on 09/04/2017.
+ */
+public class Admin implements ChannelSetting {
+    @Override
+    public String type() {
+        return Command.CHANNEL_ADMIN;
+    }
+
+    @Override
+    public boolean isSetting() {
+        return false;
+    }
+}

src/main/java/ChannelSettings/Types/AdminLog.java

@@ -0,0 +1,19 @@
+package ChannelSettings.Types;
+
+import Interfaces.ChannelSetting;
+import Interfaces.Command;
+
+/**
+ * Created by Vaerys on 09/04/2017.
+ */
+public class AdminLog implements ChannelSetting {
+    @Override
+    public String type() {
+        return Command.CHANNEL_ADMIN_LOG;
+    }
+
+    @Override
+    public boolean isSetting() {
+        return false;
+    }
+}

src/main/java/ChannelSettings/Types/General.java

@@ -0,0 +1,19 @@
+package ChannelSettings.Types;
+
+import Interfaces.ChannelSetting;
+import Interfaces.Command;
+
+/**
+ * Created by Vaerys on 09/04/2017.
+ */
+public class General implements ChannelSetting {
+    @Override
+    public String type() {
+        return Command.CHANNEL_GENERAL;
+    }
+
+    @Override
+    public boolean isSetting() {
+        return false;
+    }
+}

src/main/java/ChannelSettings/Types/Info.java

@@ -0,0 +1,19 @@
+package ChannelSettings.Types;
+
+import Interfaces.ChannelSetting;
+import Interfaces.Command;
+
+/**
+ * Created by Vaerys on 09/04/2017.
+ */
+public class Info implements ChannelSetting{
+    @Override
+    public String type() {
+        return Command.CHANNEL_INFO;
+    }
+
+    @Override
+    public boolean isSetting() {
+        return false;
+    }
+}

src/main/java/ChannelSettings/Types/ServerLog.java

@@ -0,0 +1,19 @@
+package ChannelSettings.Types;
+
+import Interfaces.ChannelSetting;
+import Interfaces.Command;
+
+/**
+ * Created by Vaerys on 09/04/2017.
+ */
+public class ServerLog implements ChannelSetting{
+    @Override
+    public String type() {
+        return Command.CHANNEL_SERVER_LOG;
+    }
+
+    @Override
+    public boolean isSetting() {
+        return false;
+    }
+}

src/main/java/Commands/Admin/ChannelHere.java

@@ -1,37 +1,41 @@
 package Commands.Admin;
 
 import Commands.CommandObject;
+import Interfaces.ChannelSetting;
 import Interfaces.Command;
 import Main.Utility;
 import Objects.XEmbedBuilder;
 import sx.blah.discord.handle.obj.Permissions;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Created by Vaerys on 31/01/2017.
  */
 public class ChannelHere implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        StringBuilder builder = new StringBuilder();
+        String desc = "";
         if (!args.isEmpty()) {
-            for (String channelType : command.channelTypes) {
-                if (args.equalsIgnoreCase(channelType)) {
-                    command.guildConfig.setUpChannel(channelType, command.channelID);
-                    return "> This channel is now the Server's **" + channelType + "** channel.";
+            for (ChannelSetting s : command.channelSettings) {
+                if (args.equalsIgnoreCase(s.type())) {
+                    return s.toggleSetting(command.guildConfig,command.channelID);
                 }
 
             }
-            builder.append("> Could not find channel type \"" + args + "\"\n");
+            desc = "> Could not find channel type \"" + args + "\"\n";
         }
         XEmbedBuilder embedBuilder = new XEmbedBuilder();
         String title = "> Here is a list of available Channel Types:\n";
-        ArrayList<String> channels = command.channelTypes;
-        Collections.sort(channels);
-        embedBuilder.withDesc(builder.toString());
-        Utility.listFormatterEmbed(title, embedBuilder, channels, true);
+
+        ArrayList<ChannelSetting> channelSettings = command.channelSettings;
+        List<String> types = channelSettings.stream().map(ChannelSetting::type).collect(Collectors.toList());
+        Collections.sort(types);
+        embedBuilder.withDesc(desc);
+        Utility.listFormatterEmbed(title, embedBuilder, (ArrayList<String>) types, true);
         embedBuilder.appendField(spacer, Utility.getCommandInfo(this, command), false);
         embedBuilder.withColor(Utility.getUsersColour(command.client.getOurUser(), command.guild));
         Utility.sendEmbedMessage("", embedBuilder, command.channel);
@@ -40,7 +44,7 @@ public String execute(String args, CommandObject command) {
 
     @Override
     public String[] names() {
-        return new String[]{"ChannelHere", "SetupChannel"};
+        return new String[]{"Channel", "ChannelHere", "ChannelSetting"};
     }
 
     @Override

src/main/java/Commands/Admin/UpdateInfo.java

@@ -12,7 +12,7 @@
 public class UpdateInfo implements Command {
     @Override
     public String execute(String args, CommandObject command) {
-        if (command.guildConfig.getChannelTypeID(Command.CHANNEL_INFO) == null) {
+        if (command.guildConfig.getChannelIDsByType(Command.CHANNEL_INFO) == null) {
             return "> No Info channel set up yet, you need to set one up in order to run this command.\n" + Utility.getCommandInfo(this,command);
         } else {
             new InfoHandler(command.channel, command.guild);

src/main/java/Commands/BlackList/BlacklistEditModes.java

@@ -0,0 +1,7 @@
+package Commands.BlackList;
+
+/**
+ * Created by Vaerys on 04/04/2017.
+ */
+public class BlacklistEditModes {
+}

src/main/java/Commands/BlackList/EditBlackList.java

@@ -0,0 +1,7 @@
+package Commands.BlackList;
+
+/**
+ * Created by Vaerys on 04/04/2017.
+ */
+public class EditBlackList {
+}

src/main/java/Commands/BlackList/ListBlackLists.java

@@ -0,0 +1,7 @@
+package Commands.BlackList;
+
+/**
+ * Created by Vaerys on 04/04/2017.
+ */
+public class ListBlackLists {
+}

src/main/java/Commands/BlackList/NewBlackList.java

@@ -0,0 +1,9 @@
+package Commands.BlackList;
+
+/**
+ * Created by Vaerys on 04/04/2017.
+ */
+public class NewBlackList {
+
+    //todo this.
+}