Merge branch 'master' into daveProtocol

# Conflicts:
#	gradle.properties

Author: Darkside138

gradle.properties

@@ -1,2 +1,2 @@
-projectVersion=4.1.47
+projectVersion=4.1.48
 org.gradle.configuration-cache=false

src/main/java/net/dirtydeeds/discordsoundboard/util/UserRoleConfig.java

@@ -48,6 +48,7 @@ public class UserRoleConfig {
     /**
      * Get roles for a specific user
      * Database roles take precedence over configuration file roles
+     * Default "user" role is only assigned to authenticated users (non-null/non-empty userId)
      */
     public List<String> getUserRoles(String userId) {
         List<String> returnRoles = new ArrayList<>();
@@ -77,6 +78,12 @@ public List<String> getUserRoles(String userId) {
         // 3. Fallback to YAML roles map
         returnRoles.addAll(roles.getOrDefault(userId, new ArrayList<>()));
 
+        // If the user is not authenticated then return the configured roles. This is intended to just skip the defaulting
+        // of the "user" role.
+        if (userId == null || userId.isEmpty()) {
+            return returnRoles;
+        }
+
         // 4. If no roles assigned, give default "user" role
         if (returnRoles.isEmpty()) {
             returnRoles.add("user");