ci: bump version to v4.6.0

feat(api): BAC-11 Websocket - Return to Lobby (#94 )
Reviewed-on: #94 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>
2025-12-01 19:07:26 +00:00 · 2025-12-01 20:04:17 +01:00 · 2025-12-01 18:53:23 +00:00 · 2025-12-01 19:50:19 +01:00
7 changed files with 31 additions and 5 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -172,3 +172,13 @@

 * **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))
--- a/knockoutwhistweb/app/model/sessions/UserSession.scala
+++ b/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()
--- a/knockoutwhistweb/app/views/ingame/finishedMatch.scala.html
+++ b/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">
--- a/knockoutwhistweb/app/views/lobby/lobby.scala.html
+++ b/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>
--- a/knockoutwhistweb/public/javascripts/events.js
+++ b/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;">
--- a/knockoutwhistweb/public/javascripts/interact.js
+++ b/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")
+}
--- a/versions.env
+++ b/versions.env
@@ -1,3 +1,3 @@
 MAJOR=4
-MINOR=4
+MINOR=6
 PATCH=0
Author	SHA1	Message	Date
TeamCity	f115c03ecb	ci: bump version to v4.6.0	2025-12-01 19:07:26 +00:00
Janis	fd2467a9ea	feat(api): BAC-11 Websocket - Return to Lobby (#94 ) Reviewed-on: #94 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-12-01 20:04:17 +01:00
TeamCity	9d3f3940a9	ci: bump version to v4.5.0	2025-12-01 18:53:23 +00:00
Janis	0541bb58d1	feat(api): BAC-10 Websockets - Kick Users (#93 ) Reviewed-on: #93 Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>	2025-12-01 19:50:19 +01:00