fix(punishment): update protocol objects and endpoints for per-type queries

- GetActivePunishmentMessage now requires a type field
- UnpunishPlayerMessage now carries a type field (enables /unmute)
- UnpunishPlayerEndpoint no longer hard-codes BAN-only
- PunishPlayerEndpoint wraps save in try/catch returning DATABASE_ERROR
- PunishPlayerEndpoint includes tags in pub/sub JSON payload
- Fixed UnpunishPlayerProtocolObject null deserialization (optString -> isNull)

Author: Swofty-Developments

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

@@ -23,14 +23,16 @@ public Serializer<GetActivePunishmentMessage> getSerializer() {
             public String serialize(GetActivePunishmentMessage value) {
                 JSONObject json = new JSONObject();
                 json.put("target", value.target().toString());
+                json.put("type", value.type());
                 return json.toString();
             }
 
             @Override
             public GetActivePunishmentMessage deserialize(String json) {
                 JSONObject obj = new JSONObject(json);
                 return new GetActivePunishmentMessage(
-                        UUID.fromString(obj.getString("target"))
+                        UUID.fromString(obj.getString("target")),
+                        obj.getString("type")
                 );
             }
 
@@ -87,7 +89,8 @@ public GetActivePunishmentResponse clone(GetActivePunishmentResponse value) {
     }
 
     public record GetActivePunishmentMessage(
-            @NotNull UUID target
+            @NotNull UUID target,
+            @NotNull String type
     ) {}
 
     public record GetActivePunishmentResponse(

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

@@ -20,6 +20,7 @@ public String serialize(UnpunishPlayerMessage value) {
                 JSONObject json = new JSONObject();
                 json.put("target", value.target().toString());
                 json.put("staff", value.staff().toString());
+                json.put("type", value.type());
                 return json.toString();
             }
 
@@ -28,7 +29,8 @@ public UnpunishPlayerMessage deserialize(String json) {
                 JSONObject obj = new JSONObject(json);
                 return new UnpunishPlayerMessage(
                         UUID.fromString(obj.getString("target")),
-                        UUID.fromString(obj.getString("staff"))
+                        UUID.fromString(obj.getString("staff")),
+                        obj.getString("type")
                 );
             }
 
@@ -55,7 +57,7 @@ public UnpunishPlayerResponse deserialize(String json) {
                 JSONObject obj = new JSONObject(json);
                 return new UnpunishPlayerResponse(
                         obj.getBoolean("success"),
-                        obj.optString("errorMessage", null)
+                        obj.isNull("errorMessage") ? null : obj.getString("errorMessage")
                 );
             }
 
@@ -68,7 +70,8 @@ public UnpunishPlayerResponse clone(UnpunishPlayerResponse value) {
 
     public record UnpunishPlayerMessage(
             @NotNull UUID target,
-            @NotNull UUID staff
+            @NotNull UUID staff,
+            @NotNull String type
     ) {}
 
     public record UnpunishPlayerResponse(

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

@@ -7,6 +7,7 @@
 import net.swofty.commons.punishment.PunishmentRedis;
 import net.swofty.service.generic.redis.ServiceEndpoint;
 
+import java.util.List;
 import java.util.Optional;
 
 public class GetActivePunishmentEndpoint implements ServiceEndpoint
@@ -20,9 +21,9 @@ public ProtocolObject<GetActivePunishmentProtocolObject.GetActivePunishmentMessa
 
     @Override
     public GetActivePunishmentProtocolObject.GetActivePunishmentResponse onMessage(ServiceProxyRequest message, GetActivePunishmentProtocolObject.GetActivePunishmentMessage messageObject) {
-        Optional<ActivePunishment> existing = PunishmentRedis.getActive(messageObject.target());
+        Optional<ActivePunishment> existing = PunishmentRedis.getActive(messageObject.target(), messageObject.type());
         if (existing.isEmpty()) {
-            return new GetActivePunishmentProtocolObject.GetActivePunishmentResponse(false, null, null, null, 0, java.util.List.of());
+            return new GetActivePunishmentProtocolObject.GetActivePunishmentResponse(false, null, null, null, 0, List.of());
         }
 
         ActivePunishment punishment = existing.get();

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

@@ -1,5 +1,6 @@
 package net.swofty.service.punishment.endpoints;
 
+import com.google.gson.Gson;
 import net.swofty.commons.impl.ServiceProxyRequest;
 import net.swofty.commons.protocol.ProtocolObject;
 import net.swofty.commons.protocol.objects.punishment.PunishPlayerProtocolObject;
@@ -38,28 +39,32 @@ public PunishPlayerProtocolObject.PunishPlayerResponse onMessage(ServiceProxyReq
 
         boolean hasOverwriteTag = messageObject.tags() != null && messageObject.tags().contains(PunishmentTag.OVERWRITE);
         if (!hasOverwriteTag) {
-            Optional<ActivePunishment> existing = PunishmentRedis.getActive(messageObject.target());
+            Optional<ActivePunishment> existing = PunishmentRedis.getActive(messageObject.target(), messageObject.type());
             if (existing.isPresent()) {
-                ActivePunishment active = existing.get();
-                PunishmentType existingType = PunishmentType.valueOf(active.type());
-                if (existingType == punishmentType) {
-                    return new PunishPlayerProtocolObject.PunishPlayerResponse(false, null,
-                            PunishPlayerProtocolObject.ErrorCode.ALREADY_PUNISHED, active.banId());
-                }
+                return new PunishPlayerProtocolObject.PunishPlayerResponse(false, null,
+                        PunishPlayerProtocolObject.ErrorCode.ALREADY_PUNISHED, existing.get().banId());
             }
         }
 
         PunishmentReason reason = messageObject.reason();
         PunishmentId id = PunishmentId.generateId();
 
-        PunishmentRedis.saveActivePunishment(
-                messageObject.target(),
-                messageObject.type(),
-                id.id(),
-                reason,
-                messageObject.expiresAt(),
-                messageObject.tags()
-        );
+        try {
+            PunishmentRedis.saveActivePunishment(
+                    messageObject.target(),
+                    messageObject.type(),
+                    id.id(),
+                    reason,
+                    messageObject.expiresAt(),
+                    messageObject.tags()
+            );
+        } catch (Exception e) {
+            Logger.error("Failed to save punishment to Redis", e);
+            return new PunishPlayerProtocolObject.PunishPlayerResponse(false, null,
+                    PunishPlayerProtocolObject.ErrorCode.DATABASE_ERROR, "Failed to save punishment.");
+        }
+
+        Gson gson = new Gson();
         ProxyRedis.publishToProxy(ToProxyChannels.PUNISH_PLAYER, new JSONObject()
                 .put("target", messageObject.target())
                 .put("type", messageObject.type())
@@ -69,6 +74,7 @@ public PunishPlayerProtocolObject.PunishPlayerResponse onMessage(ServiceProxyReq
                 .put("staff", messageObject.staff())
                 .put("issuedAt", now.toEpochMilli())
                 .put("expiresAt", messageObject.expiresAt())
+                .put("tags", messageObject.tags() != null ? gson.toJson(messageObject.tags()) : null)
         );
         Logger.info("Issued {} punishment to {} for reason '{}' (expires at: {})",
                 messageObject.type(),

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

@@ -5,7 +5,6 @@
 import net.swofty.commons.protocol.objects.punishment.UnpunishPlayerProtocolObject;
 import net.swofty.commons.punishment.ActivePunishment;
 import net.swofty.commons.punishment.PunishmentRedis;
-import net.swofty.commons.punishment.PunishmentType;
 import net.swofty.service.generic.redis.ServiceEndpoint;
 import org.tinylog.Logger;
 
@@ -22,20 +21,20 @@ public ProtocolObject<UnpunishPlayerProtocolObject.UnpunishPlayerMessage, Unpuni
 
     @Override
     public UnpunishPlayerProtocolObject.UnpunishPlayerResponse onMessage(ServiceProxyRequest message, UnpunishPlayerProtocolObject.UnpunishPlayerMessage messageObject) {
-        Optional<ActivePunishment> existing = PunishmentRedis.getActive(messageObject.target());
+        Optional<ActivePunishment> existing = PunishmentRedis.getActive(messageObject.target(), messageObject.type());
         if (existing.isEmpty()) {
-            return new UnpunishPlayerProtocolObject.UnpunishPlayerResponse(false, "No active punishment found for this player.");
+            return new UnpunishPlayerProtocolObject.UnpunishPlayerResponse(false, "No active " + messageObject.type().toLowerCase() + " found for this player.");
         }
 
-        ActivePunishment punishment = existing.get();
-        PunishmentType type = PunishmentType.valueOf(punishment.type());
-        if (type != PunishmentType.BAN) {
-            return new UnpunishPlayerProtocolObject.UnpunishPlayerResponse(false, "Player is not banned (active punishment is " + type.name() + ").");
+        try {
+            PunishmentRedis.revoke(messageObject.target(), messageObject.type());
+        } catch (Exception e) {
+            Logger.error("Failed to revoke punishment", e);
+            return new UnpunishPlayerProtocolObject.UnpunishPlayerResponse(false, "Failed to revoke punishment from database.");
         }
 
-        PunishmentRedis.revoke(messageObject.target()).join();
-        Logger.info("Revoked ban for {} by staff {}",
-                messageObject.target(), messageObject.staff());
+        Logger.info("Revoked {} for {} by staff {}",
+                messageObject.type(), messageObject.target(), messageObject.staff());
         return new UnpunishPlayerProtocolObject.UnpunishPlayerResponse(true, null);
     }
 }