Release 2.5.1: Bugfixes, Javadoc

Author: Nikos410

build.gradle

@@ -16,6 +16,12 @@ apply plugin: 'application'
 apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: "com.github.spotbugs"
 
+javadoc {
+    source = sourceSets.main.allJava
+    classpath = configurations.compile
+    failOnError = false
+}
+
 spotbugs {
     ignoreFailures = true
 }
@@ -25,7 +31,7 @@ tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"
 }
 
-version = '2.5.0'
+version = '2.5.1'
 sourceCompatibility = 1.8
 mainClassName = 'de.nikos410.discordbot.DiscordBot'
 

src/main/java/de/nikos410/discordbot/modules/ModStuff.java

@@ -339,6 +339,10 @@ public void command_unmute(final IMessage message, final String userString) {
      * @param channel The channel to send error messages to. Can be null.
      */
     private void muteUserForGuild(final IUser user, final IGuild guild, final int muteDuration, final ChronoUnit muteDurationUnit, final IChannel channel) {
+        if (!guild.getUsers().contains(user)) {
+            throw new IllegalArgumentException("Specified user is not a member of the specified guild!");
+        }
+
         // Get mute role for this guild
         final IRole muteRole = getMuteRoleForGuild(guild);
         if (muteRole == null) {
@@ -801,10 +805,15 @@ public void onStartup(final ReadyEvent event) {
 
             final long guildLongID = Long.parseLong(guildStringID);
             final IGuild guild = event.getClient().getGuildByID(guildLongID);
-            LOG.debug("Found guild '{}'.", guild.getName());
 
-            restoreGuildUserMutes(guild);
-            restoreGuildChannelMutes(guild);
+            if (guild == null) {
+                LOG.warn("Found modstuff entry for guild with invalid ID '%l'. Skipping.", guildLongID);
+            }
+            else {
+                LOG.debug("Found guild '{}'.", guild.getName());
+                restoreGuildUserMutes(guild);
+                restoreGuildChannelMutes(guild);
+            }
         }
 
         LOG.info("Restored all mutes.");
@@ -841,7 +850,11 @@ private void restoreGuildUserMutes(final IGuild guild) {
                 final String unmuteTimestampString = currentUserMute.getString("mutedUntil");
                 final LocalDateTime unmuteTimestamp = LocalDateTime.parse(unmuteTimestampString, formatter);
 
-                if (LocalDateTime.now().isBefore(unmuteTimestamp)) {
+                if (user == null) {
+                    LOG.info("Mute for user with id {} on guild '{}' (ID: {}) could not be restored. User is not a member of the guild",
+                            userLongID, guild.getName(), guild.getStringID());
+                }
+                else if (LocalDateTime.now().isBefore(unmuteTimestamp)) {
                     final int delaySeconds = (int)LocalDateTime.now().until(unmuteTimestamp, ChronoUnit.SECONDS);
                     muteUserForGuild(user, guild, delaySeconds, ChronoUnit.SECONDS, null);
                     LOG.info("Restored mute for user '{}' (ID: {}) on guild '{}' (ID: {}). Muted until {}",

src/main/java/de/nikos410/discordbot/util/discord/DiscordIO.java

@@ -26,7 +26,7 @@ private DiscordIO() {
     }
 
     /**
-     * Send a list of lines to the specified channel. If the message gets too long (>2000 characters)
+     * Send a list of lines to the specified channel. If the message gets too long (>2000 characters)
      * it will be split into multiple messages. The individual lines will not be split.
      *
      * Will try 20 times, once every 0.5 seconds, if the bot gets rate limited.
@@ -61,7 +61,7 @@ public static synchronized List<IMessage> sendMessage(final IChannel channel, fi
     }
 
     /**
-     * Send a string to a channel. If the string is too long (>2000 characters), it will be split into
+     * Send a string to a channel. If the string is too long (&gt;2000 characters), it will be split into
      * multiple messages. Will split in the middle of lines or words.
      *
      * Will try 20 times, once every 0.5 seconds, if the bot gets rate limited.