From 77f392ed7710ceecaea3e2fe497c1d291411d4b6 Mon Sep 17 00:00:00 2001
From: Arindy <dietmar.roth.23@gmail.com>
Date: Mon, 10 Feb 2025 00:05:05 +0100
Subject: [PATCH] fixes result for same names

---
 src/main/kotlin/de/arindy/dicetower/DiceResource.kt | 4 ++--
 src/main/resources/templates/overlay.html           | 1 +
 src/main/resources/templates/pub/index.html         | 8 +++++---
 src/main/resources/templates/results.html           | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/kotlin/de/arindy/dicetower/DiceResource.kt b/src/main/kotlin/de/arindy/dicetower/DiceResource.kt
index b786484..a78ca40 100644
--- a/src/main/kotlin/de/arindy/dicetower/DiceResource.kt
+++ b/src/main/kotlin/de/arindy/dicetower/DiceResource.kt
@@ -37,7 +37,7 @@ final class DiceResource(@Context val sse: Sse) {
                 .mediaType(MediaType.APPLICATION_JSON_TYPE).data(data).build()
         )
         if (data.roll.all { it.trim().isNotEmpty() }) {
-            results(data.room!!, Result(data.name))
+            results(data.room!!, Result(data.name, data.user!!))
         }
     }
 
@@ -72,6 +72,6 @@ final class DiceResource(@Context val sse: Sse) {
     }
 
     @RegisterForReflection
-    data class Result(val name: String) {}
+    data class Result(val name: String, val user: String) {}
 
 }
diff --git a/src/main/resources/templates/overlay.html b/src/main/resources/templates/overlay.html
index df5515e..eec752f 100644
--- a/src/main/resources/templates/overlay.html
+++ b/src/main/resources/templates/overlay.html
@@ -70,6 +70,7 @@
                 httpRequest.setRequestHeader('Content-Type', 'application/json')
                 httpRequest.send(JSON.stringify({
                     name: data.name,
+                    user: data.user,
                     results: rollResult,
                 } ))
             }
diff --git a/src/main/resources/templates/pub/index.html b/src/main/resources/templates/pub/index.html
index e774e6b..95c2340 100644
--- a/src/main/resources/templates/pub/index.html
+++ b/src/main/resources/templates/pub/index.html
@@ -45,9 +45,11 @@
         <label for="room" id="roomLabel">Room </label><input type="text" id="room" style="width: 75%" required onkeyup="start(event)"/><br/>
     </div>
     <div id="dice-tower" hidden class="w3-panel w3-white w3-card w3-display-container" style="padding: 25px">
-        <label for="overlayId">Dice-Overlay </label><input type="text" readonly id="overlayId" style="width: 75%"/><br/>
-        <label for="resultsId">Results-Overlay </label><input type="text" readonly id="resultsId" style="width: 75%"/><br/>
-        <hr style="width:100%;color:black;background-color:black;height:1px">
+        <button type="button" class="collapsible" style="color: white; font-weight: bold">Overlay URLs</button>
+        <div class="content">
+            <label for="overlayId">Dice-Overlay </label><input type="text" readonly id="overlayId" style="width: 75%"/><br/>
+            <label for="resultsId">Results-Overlay </label><input type="text" readonly id="resultsId" style="width: 75%"/><br/>
+        </div>
         <button type="button" class="collapsible" style="color: white; font-weight: bold">Customize Dice</button>
         <div class="content">
             <label for="theme">Theme </label>
diff --git a/src/main/resources/templates/results.html b/src/main/resources/templates/results.html
index a380593..f24a091 100644
--- a/src/main/resources/templates/results.html
+++ b/src/main/resources/templates/results.html
@@ -14,8 +14,8 @@
     const evtSource = new EventSource(url() + '/dice/{room}/results');
     evtSource.addEventListener('message', function (event) {
         let data = JSON.parse(event.data);
-        let name = document.getElementById(data.name) ?? document.createElement('div');
-        name.id = data.name;
+        let name = document.getElementById(data.user) ?? document.createElement('div');
+        name.id = data.user;
         name.replaceChildren(...[]);
         let node = document.createElement('p');
         let resultText = ''