show start message also in self play

Author: h908714124

src/main/client/src/component/Chat.jsx

@@ -109,26 +109,21 @@ export const Chat = ({chatId, className}) => {
       bottomElement={<>
         {messages.map(message => (
           <p key={message.n}>
-            {
-              message.user ? (
-                <span>{message.user + ": " + message.message}</span>
-              ) : (
-                message.type ? (
-                  <>
-                    <table className="table-fixed italic text-gray-400">
-                          <th>Spiel gestartet</th>
-                      {Object.keys(message.pair).map((key, i) => (
-                        <tr key={i}>
-                          <td>{key}</td>
-                          <td>{message.pair[key]}</td>
-                        </tr>
-                      ))}
-                    </table>
-                  </>
-                ) : (
-                  <span className="italic text-gray-400">{message.message}</span>
-                )
-              )}
+            {message.type === "start" && <>
+              <div className="w-full grid grid-cols-2 text-stone-100">
+                {Object.keys(message.rows).map((key) => <>
+                  <div>{key}</div>
+                  <div>{message.rows[key]}</div>
+                </>)}
+              </div>
+              <div className="my-2 italic text-gray-400">{message.message}</div>
+            </>}
+            {message.type === "status" && (
+              <div className="my-2 italic text-gray-400">{message.message}</div>
+            )}
+            {message.type === "user" && (
+              <div>{message.user + ": " + message.message}</div>
+            )}
           </p>
         ))}
       </>}

src/main/java/com/bernd/ChatController.java

@@ -48,7 +48,7 @@ public ChatWithUsers getChat(@PathVariable String id) {
   public void sendChat(ChatRequest chatRequest, Principal principal) {
     String user = Auth.getPrincipal(principal);
     Chat chat = chats.get(chatRequest.id());
-    ChatMessage message = new ChatMessage(chat.counter().getAndIncrement(), chatRequest.message(), user, false, null);
+    ChatMessage message = new ChatMessage(chat.counter().getAndIncrement(), chatRequest.message(), user, "user", null);
     chat.messages().add(message);
     roomManager.updateRooms(user, chat.id());
     operations.convertAndSend("/topic/chat/" + chat.id(), message);

src/main/java/com/bernd/GameController.java

@@ -11,7 +11,6 @@
 import com.bernd.model.OpenGame;
 import com.bernd.model.ViewGame;
 import com.bernd.util.RandomString;
-import java.util.HashMap;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.messaging.core.MessageSendingOperations;
@@ -87,7 +86,7 @@ public void action(Move move, Principal p) {
     Move lastMove = game.getLastMove();
     if (lastMove.end()) {
       Chat chat = chats.get(game.id());
-      ChatMessage message = new ChatMessage(chat.counter().getAndIncrement(), game.getScore(), null, false, null);
+      ChatMessage message = new ChatMessage(chat.counter().getAndIncrement(), game.getScore(), null, "status", null);
       chat.messages().add(message);
       operations.convertAndSend("/topic/chat/" + chat.id(), message);
     }
@@ -137,13 +136,9 @@ public ResponseEntity<?> accept(@RequestBody AcceptRequest acceptRequest) {
     activeGames.put(ActiveGame.fromGame(fullGame));
     Chat chat = chats.get(openGame.id());
 
-    HashMap<String, String> spielwerte = new HashMap<>();
-    spielwerte.put("Handicap", Integer.toString(fullGame.handicap()));
-    spielwerte.put("Black", fullGame.black());
-    spielwerte.put("White", fullGame.white());
-    ChatMessage typeMessage = new ChatMessage(chat.counter().getAndIncrement(), "", null,true, spielwerte);
-    chat.messages().add(typeMessage);
-    operations.convertAndSend("/topic/chat/" + chat.id(), typeMessage);
+    ChatMessage startMessage = ChatMessage.createStartMessage(chat, fullGame);
+    chat.messages().add(startMessage);
+    operations.convertAndSend("/topic/chat/" + chat.id(), startMessage);
     operations.convertAndSend("/topic/game/" + fullGame.id(), fullGame.toView());
     operations.convertAndSend("/topic/lobby/open_games", openGames.games());
     operations.convertAndSend("/topic/lobby/active_games", activeGames.games());

src/main/java/com/bernd/LobbyController.java

@@ -3,6 +3,8 @@
 import com.bernd.game.MoveList;
 import com.bernd.model.ActiveGame;
 import com.bernd.model.ActiveGameList;
+import com.bernd.model.Chat;
+import com.bernd.model.ChatMessage;
 import com.bernd.model.Game;
 import com.bernd.model.MatchRequest;
 import com.bernd.model.OpenGameList;
@@ -25,18 +27,21 @@ public class LobbyController {
   private final Games games;
   private final OpenGames openGames;
   private final ActiveGames activeGames;
+  private final Chats chats;
 
   LobbyController(
       MessageSendingOperations<String> operations,
       LobbyUsers lobbyUsers,
       OpenGames openGames,
       Games games,
-      ActiveGames activeGames) {
+      ActiveGames activeGames,
+      Chats chats) {
     this.operations = operations;
     this.lobbyUsers = lobbyUsers;
     this.games = games;
     this.openGames = openGames;
     this.activeGames = activeGames;
+    this.chats = chats;
   }
 
   @GetMapping(value = "/api/lobby/hello")
@@ -78,6 +83,9 @@ public ViewGame startEdit(@RequestBody MatchRequest request) {
         new int[]{-1, -1},
         MoveList.create(request.dim())));
     activeGames.put(ActiveGame.fromGame(game));
+    Chat chat = chats.get(game.id());
+    ChatMessage startMessage = ChatMessage.createStartMessage(chat, game);
+    chat.messages().add(startMessage);
     return game.toView();
   }
 

src/main/java/com/bernd/model/ChatMessage.java

@@ -1,11 +1,21 @@
 package com.bernd.model;
 
-import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 public record ChatMessage(
     int n,
     String message,
     String user,
-    boolean type,
-    HashMap<String, String> pair) {
+    String type,
+    Map<String, String> rows) {
+
+  public static ChatMessage createStartMessage(Chat chat, Game game) {
+    Map<String, String> rows = new LinkedHashMap<>();
+    rows.put("Black", game.black());
+    rows.put("White", game.white());
+    int handicap = game.handicap();
+    rows.put("Handicap", handicap == 0 ? "-" : Integer.toString(handicap));
+    return new ChatMessage(chat.counter().getAndIncrement(), "Game Start", null, "start", rows);
+  }
 }