Small updates to fix warnings. Updated how we grab random numbers to be thread safe.

Author: Darkside138

gradle.properties

@@ -1,2 +1,2 @@
-projectVersion=4.1.50
+projectVersion=4.1.51
 org.gradle.configuration-cache=false

src/main/java/net/dirtydeeds/discordsoundboard/SoundPlayer.java

@@ -35,6 +35,7 @@
 import java.nio.file.*;
 import java.time.ZonedDateTime;
 import java.util.*;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
@@ -212,8 +213,7 @@ public SoundFile playRandomSoundFile(String User, MessageReceivedEvent event, St
         try {
             Map<String, SoundFile> sounds = getAvailableSoundFiles();
             List<String> keysAsArray = new ArrayList<>(sounds.keySet());
-            Random r = new Random();
-            SoundFile randomValue = sounds.get(keysAsArray.get(r.nextInt(keysAsArray.size())));
+            SoundFile randomValue = sounds.get(keysAsArray.get(ThreadLocalRandom.current().nextInt(keysAsArray.size())));
 
             LOG.info("Attempting to play random file: {}, requested by : {}", randomValue.getSoundFileId(), requestingUser);
             try {
@@ -371,11 +371,7 @@ private void playFile(String fileName, Guild guild, Integer repeatTimes, String
      */
     public String stop(String user, String voiceChannelId) {
         Guild guild = getGuildForUserOrChannelId(user, voiceChannelId);
-        String soundFileId = stopPlayback(guild);
-
-        if (soundFileId != null) return soundFileId;
-
-        return null;
+        return stopPlayback(guild);
     }
 
     @Nullable
@@ -482,7 +478,12 @@ public net.dv8tion.jda.api.entities.User retrieveUserById(String idOrName) {
         try {
             return bot.retrieveUserById(idOrName).complete();
         } catch (Exception e) {
-            return bot.getUsersByName(idOrName, true).get(0);
+            try {
+                return bot.getUsersByName(idOrName, true).getFirst();
+            } catch (Exception ex) {
+                LOG.error(ex.getMessage(), ex);
+                return null;
+            }
         }
     }
 

src/main/java/net/dirtydeeds/discordsoundboard/listeners/MovedChannelListener.java

@@ -97,6 +97,9 @@ public void onGuildVoiceUpdate(@NotNull GuildVoiceUpdateEvent event) {
                     LOG.debug("Could not find entrance or disconnect sound for {}, so ignoring GuildVoiceMoveEvent.", users);
                 }
             }
+            if (isAlone(event.getGuild()) && botConfig.isLeaveOnEmptyChannel()) {
+                soundPlayer.disconnectFromChannel(event.getGuild());
+            }
             soundPlayer.updateUsersInDb();
             discordUserController.broadcastUpdate();
         }