fix: make code make more sense

ArikSquad · ArikSquad · commit 5353092f4deb · 2026-04-06T13:06:47.000+03:00
diff --git a/commons/src/main/java/net/swofty/commons/protocol/objects/election/CastVoteProtocolObject.java b/commons/src/main/java/net/swofty/commons/protocol/objects/election/CastVoteProtocolObject.java
@@ -4,6 +4,8 @@
 import net.swofty.commons.protocol.Serializer;
 import org.json.JSONObject;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.UUID;
 
 public class CastVoteProtocolObject
@@ -44,16 +46,24 @@ public Serializer<CastVoteResponse> getReturnSerializer() {
             public String serialize(CastVoteResponse value) {
                 JSONObject json = new JSONObject();
                 json.put("success", value.success());
-                json.put("talliesJson", value.talliesJson());
+                json.put("tallies", value.tallies() == null ? null : new JSONObject(value.tallies()));
                 return json.toString();
             }
 
             @Override
             public CastVoteResponse deserialize(String json) {
                 JSONObject obj = new JSONObject(json);
+                Map<String, Long> tallies = null;
+                if (!obj.isNull("tallies")) {
+                    tallies = new HashMap<>();
+                    JSONObject talliesObject = obj.getJSONObject("tallies");
+                    for (String key : talliesObject.keySet()) {
+                        tallies.put(key, talliesObject.getLong(key));
+                    }
+                }
                 return new CastVoteResponse(
                         obj.getBoolean("success"),
-                        obj.optString("talliesJson", null)
+                    tallies
                 );
             }
 
@@ -66,5 +76,6 @@ public CastVoteResponse clone(CastVoteResponse value) {
 
     public record CastVoteMessage(UUID accountId, String candidateName) {}
 
-    public record CastVoteResponse(boolean success, String talliesJson) {}
+    public record CastVoteResponse(boolean success, Map<String, Long> tallies) {
+    }
 }
diff --git a/commons/src/main/java/net/swofty/commons/protocol/objects/election/GetCandidatesProtocolObject.java b/commons/src/main/java/net/swofty/commons/protocol/objects/election/GetCandidatesProtocolObject.java
@@ -4,6 +4,7 @@
 import com.google.gson.reflect.TypeToken;
 import net.swofty.commons.protocol.ProtocolObject;
 import net.swofty.commons.protocol.Serializer;
+import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.util.List;
@@ -17,7 +18,7 @@ public Serializer<GetCandidatesMessage> getSerializer() {
         return new Serializer<>() {
             @Override
             public String serialize(GetCandidatesMessage value) {
-                return new JSONObject().put("_", true).toString();
+                return "";
             }
 
             @Override
@@ -41,7 +42,7 @@ public Serializer<GetCandidatesResponse> getReturnSerializer() {
             public String serialize(GetCandidatesResponse value) {
                 JSONObject json = new JSONObject();
                 json.put("electionOpen", value.electionOpen());
-                json.put("candidates", gson.toJson(value.candidates()));
+                json.put("candidates", value.candidates() == null ? null : new JSONArray(gson.toJson(value.candidates())));
                 return json.toString();
             }
 
@@ -52,7 +53,7 @@ public GetCandidatesResponse deserialize(String json) {
                 List<CandidateInfo> candidates = List.of();
                 if (!obj.isNull("candidates")) {
                     candidates = gson.fromJson(
-                            obj.getString("candidates"),
+                        obj.getJSONArray("candidates").toString(),
                             new TypeToken<List<CandidateInfo>>() {}.getType()
                     );
                 }
diff --git a/commons/src/main/java/net/swofty/commons/protocol/objects/election/GetElectionDataProtocolObject.java b/commons/src/main/java/net/swofty/commons/protocol/objects/election/GetElectionDataProtocolObject.java
@@ -13,7 +13,7 @@ public Serializer<GetElectionDataMessage> getSerializer() {
         return new Serializer<>() {
             @Override
             public String serialize(GetElectionDataMessage value) {
-                return new JSONObject().put("_", true).toString();
+                return "";
             }
 
             @Override
diff --git a/service.elections/src/main/java/net/swofty/service/election/endpoints/CastVoteEndpoint.java b/service.elections/src/main/java/net/swofty/service/election/endpoints/CastVoteEndpoint.java
@@ -15,8 +15,6 @@ public class CastVoteEndpoint implements ServiceEndpoint
         <CastVoteProtocolObject.CastVoteMessage,
                 CastVoteProtocolObject.CastVoteResponse> {
 
-    private static final Gson GSON = new Gson();
-
     @Override
     public ProtocolObject<CastVoteProtocolObject.CastVoteMessage,
             CastVoteProtocolObject.CastVoteResponse> associatedProtocolObject() {
@@ -34,7 +32,7 @@ public CastVoteProtocolObject.CastVoteResponse onMessage(
                 return new CastVoteProtocolObject.CastVoteResponse(false, null);
             }
 
-            Map<String, Object> data = GSON.fromJson(rawData, Map.class);
+            Map<String, Object> data = new Gson().fromJson(rawData, Map.class);
             Boolean electionOpen = (Boolean) data.get("electionOpen");
             if (electionOpen == null || !electionOpen) {
                 return new CastVoteProtocolObject.CastVoteResponse(false, null);
@@ -60,7 +58,7 @@ public CastVoteProtocolObject.CastVoteResponse onMessage(
             );
 
             Map<String, Long> tallies = ElectionDatabase.getTallies(electionYear);
-            return new CastVoteProtocolObject.CastVoteResponse(true, GSON.toJson(tallies));
+            return new CastVoteProtocolObject.CastVoteResponse(true, tallies);
         } catch (Exception e) {
             Logger.error(e, "Failed to cast vote");
             return new CastVoteProtocolObject.CastVoteResponse(false, null);
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/elections/ElectionManager.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/elections/ElectionManager.java
@@ -1,7 +1,6 @@
 package net.swofty.type.skyblockgeneric.elections;
 
 import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
 import lombok.Getter;
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.timer.TaskSchedule;
@@ -143,12 +142,8 @@ public static CompletableFuture<Void> castVote(UUID accountId, String candidateN
         ).thenAccept(response -> {
             if (response.success()) {
                 playerVoteCache.put(accountId, candidateName);
-                if (response.talliesJson() != null) {
-                    Map<String, Long> tallies = GSON.fromJson(
-                        response.talliesJson(),
-                        new TypeToken<Map<String, Long>>(){}.getType()
-                    );
-                    electionData.updateTallies(tallies);
+                if (response.tallies() != null) {
+                    electionData.updateTallies(response.tallies());
                 }
             }
         }).exceptionally(e -> {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public Serializer<GetElectionDataMessage> getSerializer() {`
`13`	`13`	`return new Serializer<>() {`
`14`	`14`	`@Override`
`15`	`15`	`public String serialize(GetElectionDataMessage value) {`
`16`		`- return new JSONObject().put("_", true).toString();`
	`16`	`+ return "";`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`@Override`