feat: start tags

Author: ArikSquad

commons/src/main/java/net/swofty/commons/protocol/objects/punishment/PunishPlayerProtocolObject.java

@@ -4,10 +4,12 @@
 import net.swofty.commons.protocol.ProtocolObject;
 import net.swofty.commons.protocol.Serializer;
 import net.swofty.commons.punishment.PunishmentReason;
+import net.swofty.commons.punishment.PunishmentTag;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.json.JSONObject;
 
+import java.util.List;
 import java.util.UUID;
 
 public class PunishPlayerProtocolObject
@@ -25,6 +27,7 @@ public String serialize(PunishPlayerMessage value) {
                 json.put("type", value.type());
                 json.put("reason", new Gson().toJson(value.reason()));
                 json.put("expiresAt", value.expiresAt());
+                json.put("tags", new Gson().toJson(value.tags()));
                 json.put("staff", value.staff().toString());
                 return json.toString();
             }
@@ -38,6 +41,7 @@ public PunishPlayerMessage deserialize(String json) {
                         obj.getString("type"),
                         new Gson().fromJson(obj.getString("reason"), PunishmentReason.class),
                         UUID.fromString(obj.getString("staff")),
+                        List.of(new Gson().fromJson(obj.getString("tags"), PunishmentTag[].class)),
                         obj.getLong("expiresAt")
                 );
             }
@@ -91,6 +95,7 @@ public record PunishPlayerMessage(
             PunishmentReason reason,
             @NotNull
             UUID staff,
+            List<PunishmentTag> tags,
             long expiresAt
     ) {
     }

commons/src/main/java/net/swofty/commons/punishment/PunishmentReason.java

@@ -9,8 +9,6 @@
 
 @Getter
 public class PunishmentReason {
-    @Nullable
-    private String custom;
     @Nullable
     private BanType banType;
     @Nullable
@@ -24,17 +22,13 @@ public PunishmentReason(@NonNull MuteType muteType) {
         this.muteType = muteType;
     }
 
-    public PunishmentReason(@NonNull String custom) {
-        this.custom = custom;
-    }
-
     public String getReasonString() {
         if (banType != null) {
             return banType.getReason();
         } else if (muteType != null) {
             return muteType.getReason();
         } else {
-            return custom;
+            return "Could not resolve reason.";
         }
     }
 }

commons/src/main/java/net/swofty/commons/punishment/PunishmentTag.java

@@ -4,25 +4,23 @@
 
 @Getter
 public enum PunishmentTag {
-    PERSONAL_PROOF("Personal proof", "P", null),
-    GOLIATH("Punishment applied via Goliath", "G", null),
-    PLAYER_REPORT("Player Report", "R", null),
-    FORUMS("Forums", "F", null),
-    SLACK("Slack", "S", null),
-    WELFARE("Punishment applied over Welfare concern", "W", 99),
-    ACCOUNT_SECURITY_ALERT(null, "ASA", null),
-    RANKED_TEAM(null, "RT", null),
-    CHECK_BEFORE_UNBAN("Check with the punisher before unbanning this user", "U", null),
-    OVERWRITE("This punishment overwrote another punishment", "O", null);
+    PERSONAL_PROOF("Personal proof", "P"),
+    GOLIATH("Punishment applied via Goliath", "G"),
+    PLAYER_REPORT("Player Report", "R"),
+    FORUMS("Forums", "F"),
+    SLACK("Slack", "S"),
+    WELFARE("Punishment applied over Welfare concern", "W"),
+    ACCOUNT_SECURITY_ALERT(null, "ASA"),
+    RANKED_TEAM(null, "RT"),
+    CHECK_BEFORE_UNBAN("Check with the punisher before unbanning this user", "U"),
+    OVERWRITE("This punishment overwrote another punishment", "O");
 
     private final String description;
     private final String shortCode;
-    private final Integer group;
 
-    PunishmentTag(String description, String shortCode, Integer group) {
+    PunishmentTag(String description, String shortCode) {
         this.description = description;
         this.shortCode = shortCode;
-        this.group = group;
     }
 
 }

service.punishment/src/main/java/net/swofty/service/punishment/endpoints/PunishPlayerEndpoint.java

@@ -52,7 +52,6 @@ public PunishPlayerProtocolObject.PunishPlayerResponse onMessage(ServiceProxyReq
                 .put("target", messageObject.target())
                 .put("type", messageObject.type())
                 .put("id", id.id())
-                .put("reason_custom", reason.getCustom() != null ? reason.getCustom() : null)
                 .put("reason_ban", reason.getBanType() != null ? reason.getBanType().name() : null)
                 .put("reason_mute", reason.getMuteType() != null ? reason.getMuteType().name() : null)
                 .put("staff", messageObject.staff())

type.generic/src/main/java/net/swofty/type/generic/command/commands/BanCommand.java

@@ -10,18 +10,25 @@
 import net.swofty.commons.StringUtility;
 import net.swofty.commons.protocol.objects.punishment.PunishPlayerProtocolObject;
 import net.swofty.commons.punishment.PunishmentReason;
+import net.swofty.commons.punishment.PunishmentRedis;
+import net.swofty.commons.punishment.PunishmentTag;
 import net.swofty.commons.punishment.PunishmentType;
 import net.swofty.commons.punishment.template.BanType;
 import net.swofty.proxyapi.ProxyPlayer;
 import net.swofty.proxyapi.ProxyService;
 import net.swofty.type.generic.command.CommandParameters;
 import net.swofty.type.generic.command.HypixelCommand;
 import net.swofty.type.generic.user.categories.Rank;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 @CommandParameters(
         aliases = "ban tempban banip tempbanip",
@@ -41,6 +48,11 @@ public void registerUsage(MinestomCommand command) {
                 suggestion.addEntry(new SuggestionEntry(type.name(), Component.text("§c" + type.getReason() + " §7| Wipe: " + type.isWipe())));
             }
         });
+        Argument<String[]> extraArg = ArgumentType.StringArray("extra").setSuggestionCallback((sender, context, suggestion) -> {
+            for (PunishmentTag tag : PunishmentTag.values()) {
+                suggestion.addEntry(new SuggestionEntry("-" + tag.getShortCode(), Component.text("§e" + tag.getShortCode() + " §7| " + (tag.getDescription() != null ? tag.getDescription() : "No description"))));
+            }
+        }); // can be -O -U etc.
 
         command.addSyntax((sender, context) -> {
             String playerName = context.get(playerArg);
@@ -68,7 +80,7 @@ public void registerUsage(MinestomCommand command) {
             long expiryTime = System.currentTimeMillis() + actualTime;
 
             CompletableFuture.runAsync(() -> {
-                banPlayer(sender, targetUuid, type, senderUuid, actualTime, expiryTime, playerName);
+                banPlayer(sender, targetUuid, type, senderUuid, actualTime, expiryTime, playerName, null);
             });
         }, playerArg, durationArg, reasonArg);
 
@@ -85,23 +97,78 @@ public void registerUsage(MinestomCommand command) {
                             sender instanceof Player player ? player.getUuid() : UUID.fromString("00000000-0000-0000-0000-000000000000"),
                             0,
                             -1,
-                            playerName);
+                            playerName, null);
                 } catch (IOException e) {
                     sender.sendMessage("§cCould not find player: " + playerName);
                     return;
                 }
             });
         }, playerArg, reasonArg);
+
+        command.addSyntax((sender, context) -> {
+            String playerName = context.get(playerArg);
+            BanType reason = BanType.valueOf(context.get(reasonArg));
+            List<PunishmentTag> tags = parseTags(List.of(context.get(extraArg)));
+
+            CompletableFuture.runAsync(() -> {
+                try {
+                    banPlayer(sender,
+                            MojangUtils.getUUID(playerName),
+                            reason,
+                            sender instanceof Player player ? player.getUuid() : UUID.fromString("00000000-0000-0000-0000-000000000000"),
+                            0,
+                            -1,
+                            playerName, tags);
+                } catch (IOException e) {
+                    sender.sendMessage("§cCould not find player: " + playerName);
+                }
+            });
+        }, playerArg, reasonArg, extraArg);
+    }
+
+    private List<PunishmentTag> parseTags(List<String> rawTags) {
+        List<PunishmentTag> tags = new ArrayList<>();
+
+        for (String rawTag : rawTags) {
+            if (rawTag.startsWith("-")) {
+                String tagCode = rawTag.substring(1).toUpperCase();
+                for (PunishmentTag tag : PunishmentTag.values()) {
+                    if (tag.getShortCode().equalsIgnoreCase(tagCode)) {
+                        tags.add(tag);
+                        break;
+                    }
+                }
+            }
+        }
+
+        return tags;
     }
 
-    private void banPlayer(CommandSender sender, UUID targetUuid, BanType type, UUID senderUuid, long actualTime, long expiryTime, String playerName) {
+    private void banPlayer(CommandSender sender, UUID targetUuid, BanType type, UUID senderUuid, long actualTime, long expiryTime, String playerName, @Nullable List<PunishmentTag> tags) {
+        if (tags != null && !tags.contains(PunishmentTag.OVERWRITE)) {
+            Optional<PunishmentRedis.ActivePunishment> activePunishment = PunishmentRedis.getActive(targetUuid);
+            AtomicBoolean alreadyBanned = new AtomicBoolean(false);
+            activePunishment.ifPresent(punishment -> {
+                PunishmentType t = PunishmentType.valueOf(punishment.type());
+                if (t == PunishmentType.BAN) {
+                    sender.sendMessage("§cThis player is already banned. If you want to replace this ban use the tag -O, Punishment ID: §7" + punishment.banId());
+                    alreadyBanned.set(true);
+                }
+            });
+            if (alreadyBanned.get()) {
+                return;
+            }
+        }
+
         ProxyService punishmentService = new ProxyService(ServiceType.PUNISHMENT);
         PunishmentReason reason = new PunishmentReason(type);
+        ArrayList<PunishmentTag> tagList = (tags != null) ? new ArrayList<>(tags) : new ArrayList<>();
         PunishPlayerProtocolObject.PunishPlayerMessage message = new PunishPlayerProtocolObject.PunishPlayerMessage(
                 targetUuid,
                 PunishmentType.BAN.name(),
                 reason,
                 senderUuid,
+                tagList,
                 actualTime > 0 ? expiryTime : -1
         );
 

velocity.extension/src/main/java/net/swofty/velocity/redis/listeners/ListenerPlayerPunished.java

@@ -1,6 +1,7 @@
 package net.swofty.velocity.redis.listeners;
 
 import com.velocitypowered.api.proxy.ProxyServer;
+import io.sentry.Sentry;
 import net.kyori.adventure.text.Component;
 import net.swofty.commons.proxy.ToProxyChannels;
 import net.swofty.commons.punishment.PunishmentId;
@@ -40,11 +41,12 @@ public JSONObject receivedMessage(JSONObject message, UUID serverUUID) {
             } else if (muteString != null) {
                 reason = new PunishmentReason(MuteType.valueOf(muteString));
             } else {
-                reason = new PunishmentReason(message.getString("reason_custom"));
+                throw new JSONException("Missing reason ban, mute or reason_mute");
             }
         } catch (IllegalArgumentException | JSONException e) {
-            reason = new PunishmentReason("Unknown Reason - Report Error");
             Logger.error("Failed to parse punishment reason from message: " + message, e);
+            Sentry.captureException(e);
+            return null;
         }