From 96bb104f280058a5db3bd6e25850d93ad396a125 Mon Sep 17 00:00:00 2001 From: Simon Esposito Date: Wed, 23 Nov 2022 21:42:51 +0000 Subject: [PATCH] Add missing fields to tournament end and reset JS runtime hooks. (#951) --- CHANGELOG.md | 1 + server/runtime_javascript.go | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f79a6bf4..a1ab5664d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr ### Added - Allow the socket acceptor to read session tokens from request headers. - Add support for custom response headers set in server configuration. +- Add missing fields to tournament end and reset JS runtime hooks. ### Changed - Stricter validation of limit in runtime storage list operations. diff --git a/server/runtime_javascript.go b/server/runtime_javascript.go index 57fd539d2..3b3e82d91 100644 --- a/server/runtime_javascript.go +++ b/server/runtime_javascript.go @@ -1836,7 +1836,13 @@ func (rp *RuntimeProviderJS) TournamentEnd(ctx context.Context, tournament *api. tournamentObj.Set("startActive", tournament.StartActive) tournamentObj.Set("endActive", tournament.EndActive) tournamentObj.Set("canEnter", tournament.CanEnter) - tournamentObj.Set("nextReset", tournament.NextReset) + if tournament.PrevReset != 0 { + tournamentObj.Set("prevReset", tournament.PrevReset) + } + if tournament.NextReset != 0 { + tournamentObj.Set("nextReset", tournament.NextReset) + } + tournamentObj.Set("operator", strings.ToLower(tournament.Operator.String())) metadataMap := make(map[string]interface{}) err = json.Unmarshal([]byte(tournament.Metadata), &metadataMap) if err != nil { @@ -1906,7 +1912,13 @@ func (rp *RuntimeProviderJS) TournamentReset(ctx context.Context, tournament *ap tournamentObj.Set("startActive", tournament.StartActive) tournamentObj.Set("endActive", tournament.EndActive) tournamentObj.Set("canEnter", tournament.CanEnter) - tournamentObj.Set("nextReset", tournament.NextReset) + if tournament.PrevReset != 0 { + tournamentObj.Set("prevReset", tournament.PrevReset) + } + if tournament.NextReset != 0 { + tournamentObj.Set("nextReset", tournament.NextReset) + } + tournamentObj.Set("operator", strings.ToLower(tournament.Operator.String())) metadataMap := make(map[string]interface{}) err = json.Unmarshal([]byte(tournament.Metadata), &metadataMap) if err != nil { -- GitLab