Fix various JS runtime properties mappings. (#940) (5ca43033) · Commits · public-projects / Nakama

apigrpc/apigrpc.pb.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		// Code generated by protoc-gen-go. DO NOT EDIT.
		// versions:
		// protoc-gen-go v1.27.1
		// protoc v3.19.4
		// protoc v3.21.9
		// source: apigrpc.proto

		package apigrpc

apigrpc/apigrpc.swagger.json

+41 −37

Original line number	Diff line number	Diff line
		@@ -1748,7 +1748,30 @@
		"in": "body",
		"required": true,
		"schema": {
		"$ref": "#/definitions/apiUpdateGroupRequest"
		"type": "object",
		"properties": {
		"name": {
		"type": "string",
		"description": "Name."
		},
		"description": {
		"type": "string",
		"description": "Description string."
		},
		"langTag": {
		"type": "string",
		"description": "Lang tag."
		},
		"avatarUrl": {
		"type": "string",
		"description": "Avatar URL."
		},
		"open": {
		"type": "boolean",
		"description": "Open is true if anyone should be allowed to join, or false if joins must be approved by a group admin."
		}
		},
		"description": "Update fields in a given group."
		}
		}
		],
		@@ -2504,6 +2527,13 @@
		"required": false,
		"type": "string",
		"format": "int64"
		},
		{
		"name": "cursor",
		"description": "A next or previous page cursor.",
		"in": "query",
		"required": false,
		"type": "string"
		}
		],
		"tags": [
		@@ -3293,6 +3323,13 @@
		"required": false,
		"type": "string",
		"format": "int64"
		},
		{
		"name": "cursor",
		"description": "A next or previous page cursor.",
		"in": "query",
		"required": false,
		"type": "string"
		}
		],
		"tags": [
		@@ -4664,36 +4701,6 @@
		},
		"description": "Update a user's account details."
		},
		"apiUpdateGroupRequest": {
		"type": "object",
		"properties": {
		"groupId": {
		"type": "string",
		"description": "The ID of the group to update."
		},
		"name": {
		"type": "string",
		"description": "Name."
		},
		"description": {
		"type": "string",
		"description": "Description string."
		},
		"langTag": {
		"type": "string",
		"description": "Lang tag."
		},
		"avatarUrl": {
		"type": "string",
		"description": "Avatar URL."
		},
		"open": {
		"type": "boolean",
		"description": "Open is true if anyone should be allowed to join, or false if joins must be approved by a group admin."
		}
		},
		"description": "Update fields in a given group."
		},
		"apiUser": {
		"type": "object",
		"properties": {
		@@ -5039,15 +5046,12 @@
		"protobufAny": {
		"type": "object",
		"properties": {
		"typeUrl": {
		"@type": {
		"type": "string"
		},
		"value": {
		"type": "string",
		"format": "byte"
		}
		}
		},
		"additionalProperties": {}
		},
		"rpcStatus": {
		"type": "object",
		"properties": {

console/console.pb.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		// Code generated by protoc-gen-go. DO NOT EDIT.
		// versions:
		// protoc-gen-go v1.27.1
		// protoc v3.19.1
		// protoc v3.21.9
		// source: console.proto

		package console

server/runtime_javascript.go

+10 −1

Original line number	Diff line number	Diff line
		@@ -1843,6 +1843,7 @@ func (rp RuntimeProviderJS) TournamentEnd(ctx context.Context, tournament api.
		rp.Put(r)
		return fmt.Errorf("failed to convert metadata to json: %s", err.Error())
		}
		pointerizeSlices(metadataMap)
		tournamentObj.Set("metadata", metadataMap)
		tournamentObj.Set("createTime", tournament.CreateTime.Seconds)
		tournamentObj.Set("startTime", tournament.StartTime.Seconds)
		@@ -1912,6 +1913,7 @@ func (rp RuntimeProviderJS) TournamentReset(ctx context.Context, tournament ap
		rp.Put(r)
		return fmt.Errorf("failed to convert metadata to json: %s", err.Error())
		}
		pointerizeSlices(metadataMap)
		tournamentObj.Set("metadata", metadataMap)
		tournamentObj.Set("createTime", tournament.CreateTime.Seconds)
		tournamentObj.Set("startTime", tournament.StartTime.Seconds)
		@@ -1972,7 +1974,14 @@ func (rp RuntimeProviderJS) LeaderboardReset(ctx context.Context, leaderboard
		if leaderboard.NextReset != 0 {
		leaderboardObj.Set("nextReset", leaderboard.NextReset)
		}
		leaderboardObj.Set("metadata", leaderboard.Metadata)
		metadataMap := make(map[string]interface{})
		err = json.Unmarshal([]byte(leaderboard.Metadata), &metadataMap)
		if err != nil {
		rp.Put(r)
		return fmt.Errorf("failed to convert metadata to json: %s", err.Error())
		}
		pointerizeSlices(metadataMap)
		leaderboardObj.Set("metadata", metadataMap)
		leaderboardObj.Set("createTime", leaderboard.CreateTime)

		fn, ok := goja.AssertFunction(r.vm.Get(jsFn))

server/runtime_javascript_nakama.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -8176,7 +8176,7 @@ func getJsLeaderboardData(leaderboard *api.Leaderboard) (map[string]interface{},
		}
		pointerizeSlices(metadataMap)
		leaderboardMap["metadata"] = metadataMap
		leaderboardMap["createTime"] = leaderboard.CreateTime
		leaderboardMap["createTime"] = leaderboard.CreateTime.Seconds
		if leaderboard.PrevReset != 0 {
		leaderboardMap["prevReset"] = leaderboard.PrevReset
		}