2.4.4 - Fixes

* updated to latest dev branch `5213b02`
* fixed null pointer in messageDeleteEvent.
+ added a login check when sail autosaves files every 5 mins.
- Removed .Class files from commit

.gitignore

@@ -63,4 +63,5 @@ Storage
 *.json1
 *.json2
 *.json3
-bot.log
+bot.log
+*.class

DiscordSAIL.iml

@@ -13,7 +13,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: org.json:json:20140107" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
-    <orderEntry type="library" name="Maven: com.github.austinv11:Discord4j:shaded:5d4c4db" level="project" />
+    <orderEntry type="library" name="Maven: com.github.austinv11:Discord4j:shaded:5213b02" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />

dependency-reduced-pom.xml

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

genGource.bat

@@ -0,0 +1 @@
+gource -a 0.1 --file-filter .class --file-filter .idea --viewport 1080x720 --file-filter FrenchGirl --user-image-dir E:\Repositories\GitUserAvatars

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.vaerys</groupId>
     <artifactId>DiscordSAIL</artifactId>
-    <version>2.4.3</version>
+    <version>2.4.4</version>
 
     <build>
         <resources>
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>com.github.austinv11</groupId>
             <artifactId>Discord4j</artifactId>
-            <version>5d4c4db</version>
+            <version>5213b02</version>
             <classifier>shaded</classifier>
         </dependency>
         <dependency>

src/main/java/Commands/CC/EditCC.java

@@ -145,7 +145,7 @@ public String type() {
 
     @Override
     public String channel() {
-        return CHANNEL_BOT_COMMANDS;
+        return null;
     }
 
     @Override

src/main/java/Commands/Admin/FinalTally.java → src/main/java/Commands/Competition/FinalTally.java

@@ -1,4 +1,4 @@
-package Commands.Admin;
+package Commands.Competition;
 
 import Commands.Command;
 import Commands.CommandObject;
@@ -57,7 +57,7 @@ public String usage() {
 
     @Override
     public String type() {
-        return TYPE_ADMIN;
+        return TYPE_COMPETITION;
     }
 
     @Override

src/main/java/Commands/Admin/GetCompEntries.java → src/main/java/Commands/Competition/GetCompEntries.java

@@ -1,4 +1,4 @@
-package Commands.Admin;
+package Commands.Competition;
 
 import Commands.Command;
 import Commands.CommandObject;
@@ -43,7 +43,7 @@ public String usage() {
 
     @Override
     public String type() {
-        return TYPE_ADMIN;
+        return TYPE_COMPETITION;
     }
 
     @Override

src/main/java/Listeners/AnnotationListener.java

@@ -93,7 +93,7 @@ public void onReadyEvent(ReadyEvent event) {
         Utility.updateUsername(Globals.botName);
     }
 
-
+    // TODO: 15/02/2017 ---------------PIXEL XP-----------------
     // TODO: 16/01/2017 add xp system 20 xp per min max, decay of 150 xp per day, level up to be exponential unsure at what rate tho
     // TODO: 16/01/2017 roles removed when level threshold is no longer high enough, ability to set role to gain on level,
     // TODO: 16/01/2017 min word limit to gain xp default = 10 words,
@@ -245,21 +245,27 @@ public void onMessageDeleteEvent(MessageDeleteEvent event){
         String content;
         IChannel logging = command.client.getChannelByID(command.guildConfig.getChannelTypeID(Command.CHANNEL_SERVER_LOG));
         IUser ourUser = command.client.getOurUser();
-        if (command.guildConfig.getChannelTypeID(Command.CHANNEL_INFO).equals(command.channelID) && ourUser.getID().equals(command.authorID)){
+        String infoID = command.guildConfig.getChannelTypeID(Command.CHANNEL_INFO);
+        String serverLogID = command.guildConfig.getChannelTypeID(Command.CHANNEL_SERVER_LOG);
+        String adminLogID = command.guildConfig.getChannelTypeID(Command.CHANNEL_ADMIN_LOG);
+        if (event.getMessage() == null){
+            return;
+        }
+        if (serverLogID != null && serverLogID.equals(command.channelID) && ourUser.getID().equals(command.authorID)){
             return;
         }
-        if (command.guildConfig.getChannelTypeID(Command.CHANNEL_SERVER_LOG).equals(command.channelID) && ourUser.getID().equals(command.authorID)){
+        if (infoID != null && serverLogID.equals(command.channelID) && ourUser.getID().equals(command.authorID)){
             return;
         }
-        if (command.guildConfig.getChannelTypeID(Command.CHANNEL_ADMIN_LOG).equals(command.channelID) && ourUser.getID().equals(command.authorID)){
+        if (adminLogID != null && serverLogID.equals(command.channelID) && ourUser.getID().equals(command.authorID)){
             return;
         }
         if (logging != null && command.guildConfig.doDeleteLogging()){
             if (command.message.getContent().isEmpty()){
                 return;
             }
-            int charlimit = 1800;
-            if (command.message.getContent().length() > charlimit){
+            int charLimit = 1800;
+            if (command.message.getContent().length() > charLimit){
                 content = command.message.getContent().substring(0,1800);
             }else {
                 content = command.message.getContent();

src/main/java/Main/Globals.java

@@ -10,6 +10,8 @@
 import Commands.Command;
 import Commands.Competition.EnterComp;
 import Commands.Competition.EnterVote;
+import Commands.Competition.FinalTally;
+import Commands.Competition.GetCompEntries;
 import Commands.DMCommand;
 import Commands.DMCommands.BlockUser;
 import Commands.DMCommands.HelpDM;

src/main/java/Main/TimedEvents.java

@@ -5,11 +5,14 @@
 import Objects.ReminderObject;
 import Objects.TimedObject;
 import Objects.WaiterObject;
+import POGOs.GlobalData;
 import POGOs.GuildConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sx.blah.discord.api.IDiscordClient;
 import sx.blah.discord.handle.obj.IChannel;
+import sx.blah.discord.handle.obj.IUser;
+import sx.blah.discord.util.DiscordException;
 import sx.blah.discord.util.Image;
 
 import java.io.File;
@@ -80,7 +83,7 @@ private static void dailyTasks() {
             @Override
             public void run() {
                 ZonedDateTime timeNow = ZonedDateTime.now(ZoneOffset.UTC);
-                String dailyFileName = Globals.dailyAvatarName.replace("#day#",timeNow.getDayOfWeek().toString());
+                String dailyFileName = Globals.dailyAvatarName.replace("#day#", timeNow.getDayOfWeek().toString());
                 DayOfWeek day = timeNow.getDayOfWeek();
                 File avatarFile;
 
@@ -234,8 +237,22 @@ private static void doTaskFiveMin() {
         timer.schedule(new TimerTask() {
             @Override
             public void run() {
+                //Sending isAlive Check.
+                try {
+                    Globals.getClient().checkLoggedIn("IsAlive");
+                } catch (DiscordException e) {
+                    logger.error(e.getErrorMessage());
+                    logger.info("Logging back in.");
+                    try {
+                        Globals.getClient().login();
+                        return;
+                    } catch (IllegalStateException ex) {
+                        //ignore exception
+                    }
+                }
                 Globals.saveFiles();
             }
-        }, 2* 60 * 1000, 5 * 60 * 1000);
+        }, 2 * 60 * 1000, 5 * 60 * 1000);
     }
+
 }

target/classes/project.properties

@@ -1 +1 @@
-version=2.4.3
+version=2.4.4

target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Feb 13 18:55:32 AEDT 2017
-version=2.4.3
+#Thu Feb 16 17:43:19 AEDT 2017
+version=2.4.4
 groupId=com.github.vaerys
 artifactId=DiscordSAIL