Commit 62fc8c36 authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Improve numeric conversions for leaderboard and tournament Lua runtime fields.

parent a3a5227b

server/runtime_lua.go

+6 −5
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import ( 
	"os"

	"path/filepath"

	"sort"

	"strconv"

	"strings"

	"sync"
@@ -1620,7 +1621,7 @@ func (rp *RuntimeProviderLua) TournamentEnd(ctx context.Context, tournament *api 
	tournamentTable.RawSetString("title", lua.LString(tournament.Title))

	tournamentTable.RawSetString("description", lua.LString(tournament.Description))

	tournamentTable.RawSetString("category", lua.LNumber(tournament.Category))

	tournamentTable.RawSetString("sort_order", lua.LString(tournament.SortOrder))

	tournamentTable.RawSetString("sort_order", lua.LString(strconv.FormatUint(uint64(tournament.SortOrder), 10)))

	tournamentTable.RawSetString("size", lua.LNumber(tournament.Size))

	tournamentTable.RawSetString("max_size", lua.LNumber(tournament.MaxSize))

	tournamentTable.RawSetString("max_num_score", lua.LNumber(tournament.MaxNumScore))
@@ -1693,7 +1694,7 @@ func (rp *RuntimeProviderLua) TournamentReset(ctx context.Context, tournament *a 
	tournamentTable.RawSetString("title", lua.LString(tournament.Title))

	tournamentTable.RawSetString("description", lua.LString(tournament.Description))

	tournamentTable.RawSetString("category", lua.LNumber(tournament.Category))

	tournamentTable.RawSetString("sort_order", lua.LString(tournament.SortOrder))

	tournamentTable.RawSetString("sort_order", lua.LString(strconv.FormatUint(uint64(tournament.SortOrder), 10)))

	tournamentTable.RawSetString("size", lua.LNumber(tournament.Size))

	tournamentTable.RawSetString("max_size", lua.LNumber(tournament.MaxSize))

	tournamentTable.RawSetString("max_num_score", lua.LNumber(tournament.MaxNumScore))
@@ -1762,13 +1763,13 @@ func (rp *RuntimeProviderLua) LeaderboardReset(ctx context.Context, leaderboard 


	leaderboardTable.RawSetString("id", lua.LString(leaderboard.Id))

	leaderboardTable.RawSetString("authoritative", lua.LBool(leaderboard.Authoritative))

	leaderboardTable.RawSetString("sort_order", lua.LString(leaderboard.SortOrder))

	leaderboardTable.RawSetString("sort_order", lua.LString(strconv.FormatUint(uint64(leaderboard.SortOrder), 10)))

	leaderboardTable.RawSetString("operator", lua.LString(strings.ToLower(leaderboard.Operator.String())))

	if leaderboard.PrevReset != 0 {

		leaderboardTable.RawSetString("prev_reset", lua.LString(leaderboard.PrevReset))

		leaderboardTable.RawSetString("prev_reset", lua.LString(strconv.FormatUint(uint64(leaderboard.PrevReset), 10)))

	}

	if leaderboard.NextReset != 0 {

		leaderboardTable.RawSetString("next_reset", lua.LString(leaderboard.NextReset))

		leaderboardTable.RawSetString("next_reset", lua.LString(strconv.FormatUint(uint64(leaderboard.NextReset), 10)))

	}

	metadataMap := make(map[string]interface{})

	err = json.Unmarshal([]byte(leaderboard.Metadata), &metadataMap)

server/runtime_lua_nakama.go

+3 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import ( 
	"io"

	"io/ioutil"

	"net/http"

	"strconv"

	"strings"

	"sync"

	"time"
@@ -5782,7 +5783,7 @@ func leaderboardToLuaTable(l *lua.LState, leaderboard *api.Leaderboard) (*lua.LT 
	lt.RawSetString("id", lua.LString(leaderboard.Id))

	lt.RawSetString("authoritative", lua.LBool(leaderboard.Authoritative))

	lt.RawSetString("operator", lua.LString(strings.ToLower(leaderboard.Operator.String())))

	lt.RawSetString("sort_order", lua.LString(leaderboard.SortOrder))

	lt.RawSetString("sort_order", lua.LString(strconv.FormatUint(uint64(leaderboard.SortOrder), 10)))

	metadataMap := make(map[string]interface{})

	err := json.Unmarshal([]byte(leaderboard.Metadata), &metadataMap)

	if err != nil {
@@ -6192,7 +6193,7 @@ func tournamentToLuaTable(l *lua.LState, tournament *api.Tournament) (*lua.LTabl 
	tt.RawSetString("title", lua.LString(tournament.Title))

	tt.RawSetString("description", lua.LString(tournament.Description))

	tt.RawSetString("category", lua.LNumber(tournament.Category))

	tt.RawSetString("sort_order", lua.LString(tournament.SortOrder))

	tt.RawSetString("sort_order", lua.LString(strconv.FormatUint(uint64(tournament.SortOrder), 10)))

	tt.RawSetString("size", lua.LNumber(tournament.Size))

	tt.RawSetString("max_size", lua.LNumber(tournament.MaxSize))

	tt.RawSetString("max_num_score", lua.LNumber(tournament.MaxNumScore))