diff --git a/src/main/kotlin/de/arindy/dicetower/DiceResource.kt b/src/main/kotlin/de/arindy/dicetower/DiceResource.kt index b786484..bd69959 100644 --- a/src/main/kotlin/de/arindy/dicetower/DiceResource.kt +++ b/src/main/kotlin/de/arindy/dicetower/DiceResource.kt @@ -29,7 +29,7 @@ final class DiceResource(@Context val sse: Sse) { if (!sseBroadcasters.containsKey(id)) { sseBroadcasters[id] = sse.newBroadcaster() } - data.roll = data.command.split(" ").toTypedArray() + data.roll = data.command.split(" ", "&", "and").filter { it.isNotEmpty() }.map { it.trim() }.toTypedArray() data.room = id.split(":")[0] data.user = id.split(":")[1] sseBroadcasters[id]?.broadcast( @@ -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!!, data.themeColor)) } } @@ -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, val themeColor: String) {} } diff --git a/src/main/resources/templates/overlay.html b/src/main/resources/templates/overlay.html index df5515e..7621b04 100644 --- a/src/main/resources/templates/overlay.html +++ b/src/main/resources/templates/overlay.html @@ -70,6 +70,8 @@ httpRequest.setRequestHeader('Content-Type', 'application/json') httpRequest.send(JSON.stringify({ name: data.name, + user: data.user, + themeColor: data.themeColor, results: rollResult, } )) } diff --git a/src/main/resources/templates/pub/index.html b/src/main/resources/templates/pub/index.html index a26a732..3d8e59d 100644 --- a/src/main/resources/templates/pub/index.html +++ b/src/main/resources/templates/pub/index.html @@ -4,12 +4,14 @@ Dice-Tower - - +

Dice-Tower

Welcome to Dice-Tower

-
+


-