misc: Improved ChatRegulator Expansion registration

Author: 4drian3d

plugin/src/main/java/io/github/_4drian3d/chatregulator/plugin/placeholders/RegulatorExpansion.java

@@ -1,39 +1,33 @@
 package io.github._4drian3d.chatregulator.plugin.placeholders;
 
 import com.velocitypowered.api.proxy.Player;
+import io.github._4drian3d.chatregulator.api.InfractionPlayer;
+import io.github._4drian3d.chatregulator.api.PlayerManager;
 import io.github._4drian3d.chatregulator.api.enums.InfractionType;
-import io.github._4drian3d.chatregulator.plugin.impl.InfractionPlayerImpl;
-import io.github._4drian3d.chatregulator.plugin.impl.PlayerManagerImpl;
 import io.github.miniplaceholders.api.Expansion;
-import net.kyori.adventure.text.Component;
+import net.kyori.adventure.identity.Identity;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 
 import java.util.Locale;
+import java.util.UUID;
 
 public final class RegulatorExpansion {
     private RegulatorExpansion(){}
-    public static Expansion getExpansion(PlayerManagerImpl manager){
+    public static Expansion getExpansion(PlayerManager manager) {
         return Expansion.builder("chatregulator")
             .filter(Player.class)
             .audiencePlaceholder("infractions_count", (aud, queue, ctx) -> {
-                InfractionPlayerImpl player = manager.getPlayer((Player)aud);
-                String type = queue.popOr(() -> "you need to introduce the infraction type").value();
-                return Tag.selfClosingInserting(
-                    Component.text(
-                        player.getInfractions().getCount(
-                            switch(type.toLowerCase(Locale.ROOT)){
-                                case "flood" -> InfractionType.FLOOD;
-                                case "spam" -> InfractionType.SPAM;
-                                case "regular" -> InfractionType.REGEX;
-                                case "command" -> InfractionType.BLOCKED_COMMAND;
-                                case "unicode" -> InfractionType.UNICODE;
-                                case "syntax" -> InfractionType.SYNTAX;
-                                case "global" -> InfractionType.GLOBAL;
-                                default -> throw ctx.newException("Invalid Infraction Type");
-                            }
-                        )
-                    )
-                );
+                final UUID uuid = aud.get(Identity.UUID).orElse(null);
+                if (uuid == null) {
+                    return null;
+                }
+
+                final InfractionPlayer player = manager.getPlayer(uuid);
+                final String type = queue.popOr("you need to introduce the infraction type")
+                        .value().toUpperCase(Locale.ROOT);
+                final InfractionType infractionType = InfractionType.INDEX.valueOrThrow(type);
+
+                return Tag.preProcessParsed(Integer.toString(player.getInfractions().getCount(infractionType)));
             })
             .build();
     }