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 @@