feat(punishment): persist PunishmentTags to Redis with active punishments

Swofty-Developments · Swofty-Developments · commit d52b19c32551 · 2026-02-17T23:57:52.000+11:00
diff --git a/commons/src/main/java/net/swofty/commons/protocol/objects/punishment/GetActivePunishmentProtocolObject.java b/commons/src/main/java/net/swofty/commons/protocol/objects/punishment/GetActivePunishmentProtocolObject.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 GetActivePunishmentProtocolObject
@@ -44,28 +46,36 @@ public Serializer<GetActivePunishmentResponse> getReturnSerializer() {
         return new Serializer<>() {
             @Override
             public String serialize(GetActivePunishmentResponse value) {
+                Gson gson = new Gson();
                 JSONObject json = new JSONObject();
                 json.put("found", value.found());
                 json.put("type", value.type());
                 json.put("banId", value.banId());
-                json.put("reason", value.reason() != null ? new Gson().toJson(value.reason()) : null);
+                json.put("reason", value.reason() != null ? gson.toJson(value.reason()) : null);
                 json.put("expiresAt", value.expiresAt());
+                json.put("tags", value.tags() != null ? gson.toJson(value.tags()) : null);
                 return json.toString();
             }
 
             @Override
             public GetActivePunishmentResponse deserialize(String json) {
+                Gson gson = new Gson();
                 JSONObject obj = new JSONObject(json);
                 boolean found = obj.getBoolean("found");
                 if (!found) {
-                    return new GetActivePunishmentResponse(false, null, null, null, 0);
+                    return new GetActivePunishmentResponse(false, null, null, null, 0, List.of());
+                }
+                List<PunishmentTag> tags = List.of();
+                if (!obj.isNull("tags")) {
+                    tags = List.of(gson.fromJson(obj.getString("tags"), PunishmentTag[].class));
                 }
                 return new GetActivePunishmentResponse(
                         true,
                         obj.optString("type", null),
                         obj.optString("banId", null),
-                        obj.isNull("reason") ? null : new Gson().fromJson(obj.getString("reason"), PunishmentReason.class),
-                        obj.getLong("expiresAt")
+                        obj.isNull("reason") ? null : gson.fromJson(obj.getString("reason"), PunishmentReason.class),
+                        obj.getLong("expiresAt"),
+                        tags
                 );
             }
 
@@ -85,6 +95,7 @@ public record GetActivePunishmentResponse(
             @Nullable String type,
             @Nullable String banId,
             @Nullable PunishmentReason reason,
-            long expiresAt
+            long expiresAt,
+            @NotNull List<PunishmentTag> tags
     ) {}
 }
diff --git a/commons/src/main/java/net/swofty/commons/punishment/ActivePunishment.java b/commons/src/main/java/net/swofty/commons/punishment/ActivePunishment.java
@@ -1,3 +1,5 @@
 package net.swofty.commons.punishment;
 
-public record ActivePunishment(String type, String banId, PunishmentReason reason, long expiresAt) {}
+import java.util.List;
+
+public record ActivePunishment(String type, String banId, PunishmentReason reason, long expiresAt, List<PunishmentTag> tags) {}
diff --git a/commons/src/main/java/net/swofty/commons/punishment/PunishmentRedis.java b/commons/src/main/java/net/swofty/commons/punishment/PunishmentRedis.java
@@ -10,7 +10,6 @@
 import java.time.Duration;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
@@ -61,17 +60,20 @@ public static boolean isInitialized() {
         return initialized && jedisPool != null && !jedisPool.isClosed();
     }
 
-    public static void saveActivePunishment(UUID playerId, String type, String id, PunishmentReason reason, long expiresAt) {
+    public static void saveActivePunishment(UUID playerId, String type, String id, PunishmentReason reason, long expiresAt, java.util.List<PunishmentTag> tags) {
         try (Jedis jedis = jedisPool.getResource()) {
             String key = PREFIX + "active:" + playerId;
 
             Gson gson = new Gson();
-            Map<String, String> data = Map.of(
+            java.util.HashMap<String, String> data = new java.util.HashMap<>(Map.of(
                     "type", type,
                     "banId", id,
-                    "reason", gson.toJson(reason), // most likely not optimal for performance
+                    "reason", gson.toJson(reason),
                     "expiresAt", String.valueOf(expiresAt)
-            );
+            ));
+            if (tags != null && !tags.isEmpty()) {
+                data.put("tags", gson.toJson(tags));
+            }
 
             jedis.hset(key, data);
             if (expiresAt > 0) {
@@ -100,9 +102,15 @@ public static Optional<ActivePunishment> getActive(UUID playerId) {
             }
 
             Gson gson = new Gson();
-            PunishmentReason reason = gson.fromJson(data.get("reason"), PunishmentReason.class); // most likely not optimal for performance
+            PunishmentReason reason = gson.fromJson(data.get("reason"), PunishmentReason.class);
+
+            java.util.List<PunishmentTag> tags = java.util.List.of();
+            String tagsJson = data.get("tags");
+            if (tagsJson != null && !tagsJson.isBlank()) {
+                tags = java.util.List.of(gson.fromJson(tagsJson, PunishmentTag[].class));
+            }
 
-            return Optional.of(new ActivePunishment(type, banId, reason, expiresAt));
+            return Optional.of(new ActivePunishment(type, banId, reason, expiresAt, tags));
         }
     }
 
@@ -114,21 +122,4 @@ public static CompletableFuture<Long> revoke(UUID playerId) {
             }
         });
     }
-
-    public static Set<String> getAllBannedPlayerIds() {
-        try (Jedis jedis = jedisPool.getResource()) {
-            var cursor = "0";
-            Set<String> result = new java.util.HashSet<>();
-            var params = new redis.clients.jedis.params.ScanParams().match(PREFIX + "active:*").count(100);
-            do {
-                var scanResult = jedis.scan(cursor, params);
-                for (String key : scanResult.getResult()) {
-                    result.add(key.substring((PREFIX + "active:").length()));
-                }
-                cursor = scanResult.getCursor();
-            } while (!"0".equals(cursor));
-            return result;
-        }
-    }
-
 }
diff --git a/service.punishment/src/main/java/net/swofty/service/punishment/endpoints/GetActivePunishmentEndpoint.java b/service.punishment/src/main/java/net/swofty/service/punishment/endpoints/GetActivePunishmentEndpoint.java
@@ -22,7 +22,7 @@ public ProtocolObject<GetActivePunishmentProtocolObject.GetActivePunishmentMessa
     public GetActivePunishmentProtocolObject.GetActivePunishmentResponse onMessage(ServiceProxyRequest message, GetActivePunishmentProtocolObject.GetActivePunishmentMessage messageObject) {
         Optional<ActivePunishment> existing = PunishmentRedis.getActive(messageObject.target());
         if (existing.isEmpty()) {
-            return new GetActivePunishmentProtocolObject.GetActivePunishmentResponse(false, null, null, null, 0);
+            return new GetActivePunishmentProtocolObject.GetActivePunishmentResponse(false, null, null, null, 0, java.util.List.of());
         }
 
         ActivePunishment punishment = existing.get();
@@ -31,7 +31,8 @@ public GetActivePunishmentProtocolObject.GetActivePunishmentResponse onMessage(S
                 punishment.type(),
                 punishment.banId(),
                 punishment.reason(),
-                punishment.expiresAt()
+                punishment.expiresAt(),
+                punishment.tags()
         );
     }
 }
diff --git a/service.punishment/src/main/java/net/swofty/service/punishment/endpoints/PunishPlayerEndpoint.java b/service.punishment/src/main/java/net/swofty/service/punishment/endpoints/PunishPlayerEndpoint.java
@@ -57,7 +57,8 @@ public PunishPlayerProtocolObject.PunishPlayerResponse onMessage(ServiceProxyReq
                 messageObject.type(),
                 id.id(),
                 reason,
-                messageObject.expiresAt()
+                messageObject.expiresAt(),
+                messageObject.tags()
         );
         ProxyRedis.publishToProxy(ToProxyChannels.PUNISH_PLAYER, new JSONObject()
                 .put("target", messageObject.target())
diff --git a/type.generic/src/main/java/net/swofty/type/generic/event/actions/ActionPlayerMute.java b/type.generic/src/main/java/net/swofty/type/generic/event/actions/ActionPlayerMute.java
@@ -28,7 +28,7 @@ public void onPlayerChat(PlayerChatEvent event) {
             if (response instanceof GetActivePunishmentProtocolObject.GetActivePunishmentResponse r
                     && r.found() && PunishmentType.valueOf(r.type()) == PunishmentType.MUTE) {
                 event.setCancelled(true);
-                var punishment = new ActivePunishment(r.type(), r.banId(), r.reason(), r.expiresAt());
+                var punishment = new ActivePunishment(r.type(), r.banId(), r.reason(), r.expiresAt(), r.tags());
                 player.sendMessage(PunishmentMessages.muteMessage(punishment));
             }
         } catch (Exception ignored) {
diff --git a/velocity.extension/src/main/java/net/swofty/velocity/SkyBlockVelocity.java b/velocity.extension/src/main/java/net/swofty/velocity/SkyBlockVelocity.java
@@ -230,7 +230,7 @@ public boolean punished(Player player) {
 			}
 
 			ActivePunishment punishment = new ActivePunishment(
-					r.type(), r.banId(), r.reason(), r.expiresAt());
+					r.type(), r.banId(), r.reason(), r.expiresAt(), r.tags());
 			PunishmentType type = PunishmentType.valueOf(r.type());
 			if (type == PunishmentType.BAN) {
 				player.disconnect(PunishmentMessages.banMessage(punishment));
diff --git a/velocity.extension/src/main/java/net/swofty/velocity/redis/listeners/ListenerPlayerPunished.java b/velocity.extension/src/main/java/net/swofty/velocity/redis/listeners/ListenerPlayerPunished.java
@@ -54,7 +54,7 @@ public JSONObject receivedMessage(JSONObject message, UUID serverUUID) {
         PunishmentType punishmentType = PunishmentType.valueOf(type);
         PunishmentReason finalReason = reason;
         SkyBlockVelocity.getServer().getPlayer(target).ifPresent((player) -> {
-            ActivePunishment activePunishment = new ActivePunishment(type, id, finalReason, expiresAt);
+            ActivePunishment activePunishment = new ActivePunishment(type, id, finalReason, expiresAt, java.util.List.of());
             switch (punishmentType) {
                 case BAN -> {
                     player.disconnect(PunishmentMessages.banMessage(activePunishment));

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public ProtocolObject<GetActivePunishmentProtocolObject.GetActivePunishmentMessa`
`22`	`22`	`public GetActivePunishmentProtocolObject.GetActivePunishmentResponse onMessage(ServiceProxyRequest message, GetActivePunishmentProtocolObject.GetActivePunishmentMessage messageObject) {`
`23`	`23`	`Optional<ActivePunishment> existing = PunishmentRedis.getActive(messageObject.target());`
`24`	`24`	`if (existing.isEmpty()) {`
`25`		`- return new GetActivePunishmentProtocolObject.GetActivePunishmentResponse(false, null, null, null, 0);`
	`25`	`+ return new GetActivePunishmentProtocolObject.GetActivePunishmentResponse(false, null, null, null, 0, java.util.List.of());`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`ActivePunishment punishment = existing.get();`
`@@ -31,7 +31,8 @@ public GetActivePunishmentProtocolObject.GetActivePunishmentResponse onMessage(S`
`31`	`31`	`punishment.type(),`
`32`	`32`	`punishment.banId(),`
`33`	`33`	`punishment.reason(),`
`34`		`- punishment.expiresAt()`
	`34`	`+ punishment.expiresAt(),`
	`35`	`+ punishment.tags()`
`35`	`36`	`);`
`36`	`37`	`}`
`37`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public void onPlayerChat(PlayerChatEvent event) {`
`28`	`28`	`if (response instanceof GetActivePunishmentProtocolObject.GetActivePunishmentResponse r`
`29`	`29`	`&& r.found() && PunishmentType.valueOf(r.type()) == PunishmentType.MUTE) {`
`30`	`30`	`event.setCancelled(true);`
`31`		`- var punishment = new ActivePunishment(r.type(), r.banId(), r.reason(), r.expiresAt());`
	`31`	`+ var punishment = new ActivePunishment(r.type(), r.banId(), r.reason(), r.expiresAt(), r.tags());`
`32`	`32`	`player.sendMessage(PunishmentMessages.muteMessage(punishment));`
`33`	`33`	`}`
`34`	`34`	`} catch (Exception ignored) {`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ public boolean punished(Player player) {`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`ActivePunishment punishment = new ActivePunishment(`
`233`		`- r.type(), r.banId(), r.reason(), r.expiresAt());`
	`233`	`+ r.type(), r.banId(), r.reason(), r.expiresAt(), r.tags());`
`234`	`234`	`PunishmentType type = PunishmentType.valueOf(r.type());`
`235`	`235`	`if (type == PunishmentType.BAN) {`
`236`	`236`	`player.disconnect(PunishmentMessages.banMessage(punishment));`