feat(base): Fixed logic for websockets and added GameStateEvent. Might've caused instability on other feature branches! (#84)
Reviewed-on: #84 Reviewed-by: lq64 <lq@blackhole.local> Co-authored-by: Janis <janis.e.20@gmx.de> Co-committed-by: Janis <janis.e.20@gmx.de>
This commit is contained in:
@@ -2,10 +2,11 @@ package util
|
||||
|
||||
import de.knockoutwhist.utils.events.SimpleEvent
|
||||
import logic.game.GameLobby
|
||||
import model.sessions.UserSession
|
||||
import play.api.libs.json.{JsValue, Json}
|
||||
import tools.jackson.databind.json.JsonMapper
|
||||
import tools.jackson.module.scala.ScalaModule
|
||||
import util.mapper.{ReceivedHandEventMapper, SimpleEventMapper}
|
||||
import util.mapper.{GameStateEventMapper, ReceivedHandEventMapper, SimpleEventMapper}
|
||||
|
||||
object WebsocketEventMapper {
|
||||
|
||||
@@ -24,10 +25,11 @@ object WebsocketEventMapper {
|
||||
|
||||
// Register all custom mappers here
|
||||
registerCustomMapper(ReceivedHandEventMapper)
|
||||
registerCustomMapper(GameStateEventMapper)
|
||||
|
||||
def toJson(obj: SimpleEvent, gameLobby: GameLobby): JsValue = {
|
||||
def toJson(obj: SimpleEvent, session: UserSession): JsValue = {
|
||||
val data: Option[JsValue] = if (customMappers.contains(obj.id)) {
|
||||
Some(customMappers(obj.id).toJson(obj))
|
||||
Some(customMappers(obj.id).toJson(obj, session))
|
||||
}else {
|
||||
None
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user