Veto system fields

FAForever · Nov 28, 2024 · 9bd066e · 9bd066e
1 parent 9972c3d
commit 9bd066e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/api/src/main/java/com/faforever/commons/api/dto/MatchmakerQueueMapPool.java b/api/src/main/java/com/faforever/commons/api/dto/MatchmakerQueueMapPool.java
@@ -21,7 +21,7 @@ public class MatchmakerQueueMapPool extends AbstractEntity<MatchmakerQueueMapPoo
   @ToString.Include
   private Integer maxTokensPerMap;
   @ToString.Include
-  private Float minimalMapsAllowed;
+  private Float minimumMapsAfterVeto;
 
   @Relationship("matchmakerQueue")
   @ToString.Include

diff --git a/lobby/src/main/kotlin/com/faforever/commons/lobby/FafLobbyApi.kt b/lobby/src/main/kotlin/com/faforever/commons/lobby/FafLobbyApi.kt
@@ -45,6 +45,7 @@ interface LobbyProtocolMessage {
   JsonSubTypes.Type(value = UnreadyPartyRequest::class, name = "unready_party"),
   JsonSubTypes.Type(value = SelectPartyFactionsRequest::class, name = "set_party_factions"),
   JsonSubTypes.Type(value = GameMatchmakingRequest::class, name = "game_matchmaking"),
+  JsonSubTypes.Type(value = SetPlayerVetoesRequest::class, name = "set_player_vetoes"),
   JsonSubTypes.Type(value = MatchmakerInfoRequest::class, name = "matchmaker_info"),
   JsonSubTypes.Type(value = AuthenticateRequest::class, name = "auth"),
   JsonSubTypes.Type(value = IsReadyResponse::class, name = "is_ready_response"),

diff --git a/lobby/src/main/kotlin/com/faforever/commons/lobby/FafLobbyClient.kt b/lobby/src/main/kotlin/com/faforever/commons/lobby/FafLobbyClient.kt
@@ -344,5 +344,7 @@ class FafLobbyClient(
 
   override fun setPartyFactions(factions: Set<Faction>) = send(SelectPartyFactionsRequest(factions))
 
+  override fun setPlayerVetoes(vetoes: List<VetoData>) = send(SetPlayerVetoesRequest(vetoes))
+
   override fun sendGpgGameMessage(message: GpgGameOutboundMessage) = send(message)
 }
diff --git a/lobby/src/main/kotlin/com/faforever/commons/lobby/MatchmakerApi.kt b/lobby/src/main/kotlin/com/faforever/commons/lobby/MatchmakerApi.kt
@@ -27,6 +27,8 @@ interface MatchmakerApi {
 
   fun setPartyFactions(factions: Set<Faction>)
 
+  fun setPlayerVetoes(vetoes: List<VetoData>)
+
   fun sendReady(requestId: String)
 
 }
@@ -40,6 +42,13 @@ enum class MatchmakerState {
   STOP
 }
 
+data class VetoData(
+  @JsonProperty("map_pool_map_version_id")
+  val mapPoolMapVersionId: Int,
+  @JsonProperty("veto_tokens_applied")
+  val vetoTokensApplied: Int
+)
+
 
 // ***********************
 // *** SERVER MESSAGES ***
@@ -146,6 +155,11 @@ internal data class InviteToPartyRequest(
   val playerId: Int
 ) : ClientMessage
 
+internal data class SetPlayerVetoesRequest(
+  @JsonProperty("vetoes")
+  val vetoes: List<VetoData>
+) : ClientMessage
+
 internal data class AcceptInviteToPartyRequest(
   @JsonProperty("sender_id")
   val playerId: Int