Send match_ready to server immediatley on match_found (#1783)

FAForever · Aug 11, 2021 · e7a40dc · e7a40dc
1 parent bba6b50
commit e7a40dc
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 0 deletions.
diff --git a/src/main/java/com/faforever/client/remote/FafServerAccessor.java b/src/main/java/com/faforever/client/remote/FafServerAccessor.java
@@ -82,6 +82,8 @@ public interface FafServerAccessor {
 
   void gameMatchmaking(MatchmakingQueue queue, MatchmakingState state);
 
+  void gameMatchmakingReady();
+
   void inviteToParty(Player recipient);
 
   void acceptPartyInvite(Player sender);

diff --git a/src/main/java/com/faforever/client/remote/FafServerAccessorImpl.java b/src/main/java/com/faforever/client/remote/FafServerAccessorImpl.java
@@ -53,6 +53,7 @@
 import com.faforever.client.remote.domain.outbound.faf.ListPersonalAvatarsMessage;
 import com.faforever.client.remote.domain.outbound.faf.LoginOauthClientMessage;
 import com.faforever.client.remote.domain.outbound.faf.MakeBroadcastMessage;
+import com.faforever.client.remote.domain.outbound.faf.MatchReadyMessage;
 import com.faforever.client.remote.domain.outbound.faf.MatchmakerInfoOutboundMessage;
 import com.faforever.client.remote.domain.outbound.faf.PingMessage;
 import com.faforever.client.remote.domain.outbound.faf.PongMessage;
@@ -558,6 +559,9 @@ public void gameMatchmaking(MatchmakingQueue queue, MatchmakingState state) {
     writeToServer(new GameMatchmakingMessage(queue.getTechnicalName(), state));
   }
 
+  @Override
+  public void gameMatchmakingReady() { writeToServer(new MatchReadyMessage()); }
+
   @Override
   public void inviteToParty(Player recipient) {
     writeToServer(new InviteToPartyMessage(recipient.getId()));

diff --git a/src/main/java/com/faforever/client/remote/FafService.java b/src/main/java/com/faforever/client/remote/FafService.java
@@ -599,6 +599,8 @@ public void updateMatchmakerState(MatchmakingQueue queue, MatchmakingState state
     fafServerAccessor.gameMatchmaking(queue, state);
   }
 
+  public void readyForMatchLaunch() { fafServerAccessor.gameMatchmakingReady(); }
+
   @Async
   public CompletableFuture<Optional<Clan>> getClanByTag(String tag) {
     return CompletableFuture.completedFuture(fafApiAccessor.getClanByTag(tag)

diff --git a/src/main/java/com/faforever/client/remote/MockFafServerAccessor.java b/src/main/java/com/faforever/client/remote/MockFafServerAccessor.java
@@ -301,6 +301,11 @@ public void gameMatchmaking(MatchmakingQueue queue, MatchmakingState state) {
 
   }
 
+  @Override
+  public void gameMatchmakingReady() {
+
+  }
+
   @Override
   public void inviteToParty(com.faforever.client.player.Player recipient) {
 

diff --git a/src/main/java/com/faforever/client/remote/domain/inbound/faf/MatchInfoMessage.java b/src/main/java/com/faforever/client/remote/domain/inbound/faf/MatchInfoMessage.java
@@ -0,0 +1,4 @@
+package com.faforever.client.remote.domain.inbound.faf;
+
+public class MatchInfoMessage {
+}
diff --git a/src/main/java/com/faforever/client/remote/domain/outbound/faf/MatchReadyMessage.java b/src/main/java/com/faforever/client/remote/domain/outbound/faf/MatchReadyMessage.java
@@ -0,0 +1,6 @@
+package com.faforever.client.remote.domain.outbound.faf;
+
+
+public class MatchReadyMessage extends FafOutboundMessage {
+  public static final String COMMAND = "match_ready";
+}
diff --git a/src/main/java/com/faforever/client/teammatchmaking/TeamMatchmakingService.java b/src/main/java/com/faforever/client/teammatchmaking/TeamMatchmakingService.java
@@ -183,6 +183,8 @@ protected void onMatchFoundMessage(MatchFoundMessage message) {
         i18n.get("teammatchmaking.notification.matchFound.title"),
         i18n.get("teammatchmaking.notification.matchFound.message")
     ));
+    fafService.readyForMatchLaunch(); // remove when implementing full match ready UI
+
     matchmakingQueues.stream()
         .filter(matchmakingQueue -> Objects.equals(matchmakingQueue.getTechnicalName(), message.getQueueName()))
         .forEach(matchmakingQueue -> matchmakingQueue.setTimedOutMatchingStatus(MatchingStatus.MATCH_FOUND, Duration.ofSeconds(60), taskScheduler));