De-mattify variable names and update Discord username regex

CSSUoB · Aug 31, 2024 · 99c1df5 · 99c1df5
1 parent 7e0ccfd
commit 99c1df5
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/...rc/main/java/com/cssbham/cssminecraft/common/command/handler/MakeGreenCommandHandler.java b/...rc/main/java/com/cssbham/cssminecraft/common/command/handler/MakeGreenCommandHandler.java
@@ -14,6 +14,8 @@
 
 public class MakeGreenCommandHandler implements CommandHandler {
 
+    private static final String DISCORD_USERNAME_PATTERN = "[a-z0-9._]{2,32}";
+
     private final DiscordClientService discordClientService;
     private final PermissionPluginService permissionPluginService;
 
@@ -35,7 +37,7 @@ public void handle(CommandSender sender, CommandContext context) {
         }
 
         String arg = String.join(" ", context.args());
-        if (!arg.matches("[a-z0-9._]{2,32}|.{2,32}#[0-9]{4}")) {
+        if (!arg.matches(DISCORD_USERNAME_PATTERN)) {
             sender.sendMessage(Component.text("Invalid Discord tag format.").color(NamedTextColor.RED));
             return;
         }

diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/config/source/YamlConfigSource.java b/common/src/main/java/com/cssbham/cssminecraft/common/config/source/YamlConfigSource.java
@@ -65,28 +65,28 @@ private void createDefaultIfNotExists() throws IOException {
     @Override
     public int getInteger(String path, int def) {
         if (null == data) return def;
-        Object val = data.getOrDefault(path, def);
-        if (!(val instanceof Number)) return def;
+        Object object = data.getOrDefault(path, def);
+        if (!(object instanceof Number value)) return def;
 
-        return ((Number) val).intValue();
+        return value.intValue();
     }
 
     @Override
     public long getLong(String path, long def) {
         if (null == data) return def;
-        Object val = data.getOrDefault(path, def);
-        if (!(val instanceof Number)) return def;
+        Object object = data.getOrDefault(path, def);
+        if (!(object instanceof Number value)) return def;
 
-        return ((Number) val).longValue();
+        return value.longValue();
     }
 
     @Override
     public boolean getBoolean(String path, boolean def) {
         if (null == data) return def;
-        Object val = data.getOrDefault(path, def);
-        if (!(val instanceof Boolean)) return def;
+        Object object = data.getOrDefault(path, def);
+        if (!(object instanceof Boolean value)) return def;
 
-        return (boolean) val;
+        return value;
     }
 
     @Override

diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/JDADiscordClient.java b/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/JDADiscordClient.java
@@ -86,15 +86,16 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
 
     @Override
     public boolean isMember(String identifier) {
-        Guild g = jda.getGuildById(discordServerId);
-        if (g == null) return false;
-        Member m = g.getMembers().stream()
-                .filter(mm ->
-                        (mm.getUser().getName() + "#" + mm.getUser().getDiscriminator()).equalsIgnoreCase(identifier) ||
-                                mm.getUser().getName().equalsIgnoreCase(identifier)
-                ).findFirst().orElse(null);
-        if (m == null) return false;
-        return m.getRoles().stream().anyMatch(r -> r.getIdLong() == memberRoleId);
+        Guild guild = jda.getGuildById(discordServerId);
+        if (null == guild) return false;
+
+        Member member = guild.getMembers().stream()
+                .filter(m -> m.getUser().getName().equalsIgnoreCase(identifier))
+                .findFirst()
+                .orElse(null);
+        if (null == member) return false;
+
+        return member.getRoles().stream().anyMatch(r -> r.getIdLong() == memberRoleId);
     }
 
 }