ci: bump version to v4.6.1

Reviewed-on: #95
Co-authored-by: Janis <janis.e.20@gmx.de>
Co-committed-by: Janis <janis.e.20@gmx.de>

CHANGELOG.md

@@ -172,3 +172,18 @@
 
 * **api:** Fixed websocket routing ([#88](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/88)) ([46c96d4](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/46c96d4ceb935ac91fc515a1fdaef195e5ebc0a7))
 * **api:** fixes - reimplemented animations ([#90](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/90)) ([cfcd967](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/cfcd967ce08ecf07f3f06826c337f684eb3b0c5f))
+##  (2025-12-01)
+
+### Features
+
+* **api:** BAC-10 Websockets - Kick Users ([#93](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/93)) ([0541bb5](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/0541bb58d19efd98d134b3d0412f39b4b1001783))
+##  (2025-12-01)
+
+### Features
+
+* **api:** BAC-11 Websocket - Return to Lobby ([#94](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/94)) ([fd2467a](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/fd2467a9ea22dca64d5152a5a3e6db86d9a6f345))
+##  (2025-12-01)
+
+### Bug Fixes
+
+* **api:** BAC-23 Remove old polling code ([#95](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/95)) ([a55f0b4](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/a55f0b4b6164a47e3524422650ed99d10f9c8b0d))

knockoutwhistweb/app/model/sessions/UserSession.scala

@@ -64,6 +64,17 @@ class UserSession(val user: User, val host: Boolean, val gameLobby: GameLobby) e
             case None =>
               println("Card Index not found or is not a number.")
           }
+        case "KickPlayer" =>
+          val maybePlayerId: Option[String] = (data \ "playerId").asOpt[String]
+          maybePlayerId match {
+            case Some(id) =>
+              val playerUUID = UUID.fromString(id)
+              gameLobby.leaveGame(playerUUID, true)
+            case None =>
+              println("Player ID not found or is not a valid UUID.")
+          }
+        case "ReturnToLobby" =>
+          gameLobby.returnToLobby(this)
       }
     }
     lock.unlock()

knockoutwhistweb/app/views/ingame/finishedMatch.scala.html

@@ -10,7 +10,7 @@
         <div class="row justify-content-center align-items-center flex-grow-1">
         @if((gamelobby.getUserSession(user.get.id).host)) {
             <div class="col-12 text-center mb-5">
-                <div class="btn btn-success" onclick="backToLobby('@gamelobby.id')">Return to lobby</div>
+                <div class="btn btn-success" onclick="handleReturnToLobby()">Return to lobby</div>
             </div>
         } else {
             <div class="col-12 text-center mt-3">
@@ -23,16 +23,5 @@
     </div>
 </main>
 <script>
-        function waitForFunction(name, checkInterval = 100) {
-            return new Promise(resolve => {
-                const timer = setInterval(() => {
-                    if (typeof window[name] === "function") {
-                        clearInterval(timer);
-                        resolve(window[name]);
-                    }
-                }, checkInterval);
-            });
-        }
-        waitForFunction("pollForUpdates").then(fn => fn('@gamelobby.id'));
     connectWebSocket()
 </script>

knockoutwhistweb/app/views/ingame/ingame.scala.html

@@ -130,17 +130,6 @@
     </main>
 </div>
 <script>
-    function waitForFunction(name, checkInterval = 100) {
-        return new Promise(resolve => {
-            const timer = setInterval(() => {
-                if (typeof window[name] === "function") {
-                    clearInterval(timer);
-                    resolve(window[name]);
-                }
-            }, checkInterval);
-        });
-    }
-    waitForFunction("pollForUpdates").then(fn => fn('@gamelobby.id'));
     connectWebSocket()
     canPlayCard = @gamelobby.logic.getCurrentPlayer.contains(player);
 </script>

knockoutwhistweb/app/views/ingame/selecttrump.scala.html

@@ -64,16 +64,5 @@
     </div>
 </div>
 <script>
-        function waitForFunction(name, checkInterval = 100) {
-            return new Promise(resolve => {
-                const timer = setInterval(() => {
-                    if (typeof window[name] === "function") {
-                        clearInterval(timer);
-                        resolve(window[name]);
-                    }
-                }, checkInterval);
-            });
-        }
-        waitForFunction("pollForUpdates").then(fn => fn('@gamelobby.id'));
     connectWebSocket()
 </script>

knockoutwhistweb/app/views/ingame/tie.scala.html

@@ -110,16 +110,5 @@
     </div>
 </div>
 <script>
-        function waitForFunction(name, checkInterval = 100) {
-            return new Promise(resolve => {
-                const timer = setInterval(() => {
-                    if (typeof window[name] === "function") {
-                        clearInterval(timer);
-                        resolve(window[name]);
-                    }
-                }, checkInterval);
-            });
-        }
-        waitForFunction("pollForUpdates").then(fn => fn('@gamelobby.id'));
     connectWebSocket()
 </script>

knockoutwhistweb/app/views/lobby/lobby.scala.html

@@ -60,7 +60,7 @@
                             <a href="#" class="btn btn-danger disabled" aria-disabled="true" tabindex="-1">Remove</a>
                         } else {
                             <h5 class="card-title">@playersession.name</h5>
-                            <div class="btn btn-danger" onclick="removePlayer('@gamelobby.id', '@playersession.id')">
+                            <div class="btn btn-danger" onclick="handleKickPlayer('@playersession.id')">
                                 Remove</div>
                         }
                         </div>
@@ -98,18 +98,5 @@
     </div>
 </main>
 <script>
-/*
-        function waitForFunction(name, checkInterval = 100) {
-            return new Promise(resolve => {
-                const timer = setInterval(() => {
-                    if (typeof window[name] === "function") {
-                        clearInterval(timer);
-                        resolve(window[name]);
-                    }
-                }, checkInterval);
-            });
-        }
-        waitForFunction("pollForUpdates").then(fn => fn('@gamelobby.id'));
-*/
     connectWebSocket()
 </script>

knockoutwhistweb/public/javascripts/events.js

@@ -227,7 +227,7 @@ function receiveLobbyUpdateEvent(eventData) {
             const inner = user.self ? `<h5 class="card-title">${user.name} (You)</h5>
                                 <a href="#" class="btn btn-danger disabled" aria-disabled="true" tabindex="-1">Remove</a>`
                 : `    <h5 class="card-title">${user.name}</h5>
-                                    <div class="btn btn-danger" onclick="removePlayer('${user.id}')">Remove</div>`
+                                    <div class="btn btn-danger" onclick="handleKickPlayer('${user.id}')">Remove</div>`
 
             newHtml += `<div class="col-auto my-auto m-3">
                             <div class="card" style="width: 18rem;">

knockoutwhistweb/public/javascripts/interact.js

@@ -73,5 +73,10 @@ function handleTrumpSelection(object) {
 
 }
 function handleKickPlayer(playerId) {
-    // TODO needs implementation
+    sendEvent("KickPlayer", {
+        playerId: playerId
+    })
 }
+function handleReturnToLobby() {
+    sendEvent("ReturnToLobby")
+}

versions.env

@@ -1,3 +1,3 @@
 MAJOR=4
-MINOR=4
+MINOR=6
-PATCH=0
+PATCH=1