Unverified Commit 5962d159 authored by Simon Esposito's avatar Simon Esposito Committed by GitHub
Browse files

Add groups get random runtime function (#926) 

Add provider payload and status code to iap validation error message.
parent b20c41ac

CHANGELOG.md

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ All notable changes to this project are documented below. 
The format is based on [keep a changelog](http://keepachangelog.com) and this project uses [semantic versioning](http://semver.org).



## [Unreleased]

### Added

- Add new GroupsGetRandom function to the runtimes.



### Changed

- More consistent signature and handling between JavaScript runtime Base64 encode functions.

- Improve group list cursor handling for messages with close timestamps.
@@ -12,6 +15,7 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr 
- Improve signature of JavaScript runtime Base64 decode functions.

- Improve signature of JavaScript runtime Base16 encode and decode functions.

- Token and credential inputs on unlink operations are now optional.

- Improve runtime iap operation errors to include provider payload in error message.



### Fixed

- Graceful handling of storage list errors in JavaScript runtime.

go.mod

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ require ( 
	github.com/gorilla/mux v1.8.0

	github.com/gorilla/websocket v1.4.2

	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0

	github.com/heroiclabs/nakama-common v0.0.0-20221007130012-74541b4d1596

	github.com/heroiclabs/nakama-common v1.24.1-0.20221012104822-a3054a3e1c6b

	github.com/jackc/pgconn v1.10.0

	github.com/jackc/pgerrcode v0.0.0-20201024163028-a0d42d470451

	github.com/jackc/pgtype v1.8.1

go.sum

+2 −2
Original line number Diff line number Diff line
@@ -291,8 +291,8 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO 
github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=

github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=

github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=

github.com/heroiclabs/nakama-common v0.0.0-20221007130012-74541b4d1596 h1:7p7XAW1d3qbNaP+8dN/5SwTBv4HBo7uKRY/yg6NahNM=

github.com/heroiclabs/nakama-common v0.0.0-20221007130012-74541b4d1596/go.mod h1:WF4YG46afwY3ibzsXnkt3zvhQ3tBY03IYeU7xSLr8HE=

github.com/heroiclabs/nakama-common v1.24.1-0.20221012104822-a3054a3e1c6b h1:nLjagyakGRCoeNGN/C0uUxX3zW9iwL3EhDQWAOACvIo=

github.com/heroiclabs/nakama-common v1.24.1-0.20221012104822-a3054a3e1c6b/go.mod h1:WF4YG46afwY3ibzsXnkt3zvhQ3tBY03IYeU7xSLr8HE=

github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=

github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=

github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=

iap/iap.go

+10 −7
Original line number Diff line number Diff line
@@ -59,7 +59,9 @@ type ValidationError struct { 
	Payload    string

}



func (e *ValidationError) Error() string { return e.Err.Error() }

func (e *ValidationError) Error() string {

	return fmt.Sprintf("%s, status: %d, payload: %s", e.Err.Error(), e.StatusCode, e.Payload)

}

func (e *ValidationError) Unwrap() error { return e.Err }



var (
@@ -249,6 +251,7 @@ type ValidateReceiptGoogleResponse struct { 
// A helper function to unwrap a receipt response from the Android Publisher API.

//

// The standard structure looks like:

//

//	"{\"json\":\"{\\\"orderId\\\":\\\"..\\\",\\\"packageName\\\":\\\"..\\\",\\\"productId\\\":\\\"..\\\",

//	    \\\"purchaseTime\\\":1607721533824,\\\"purchaseState\\\":0,\\\"purchaseToken\\\":\\\"..\\\",

//	    \\\"acknowledged\\\":false}\",\"signature\":\"..\",\"skuDetails\":\"{\\\"productId\\\":\\\"..\\\",

server/core_group.go

+61 −0
Original line number Diff line number Diff line
@@ -2169,6 +2169,67 @@ WHERE group_edge.destination_id = $1` 
	return nil

}



func GetRandomGroups(ctx context.Context, logger *zap.Logger, db *sql.DB, count int) ([]*api.Group, error) {

	if count == 0 {

		return []*api.Group{}, nil

	}



	query := `

SELECT id, creator_id, name, description, avatar_url, state, edge_count, lang_tag, max_count, metadata, create_time, update_time

FROM groups

WHERE id > $1

LIMIT $2`

	rows, err := db.QueryContext(ctx, query, uuid.Must(uuid.NewV4()).String(), count)

	if err != nil {

		logger.Error("Error retrieving random groups.", zap.Error(err))

		return nil, err

	}

	groups := make([]*api.Group, 0, count)

	for rows.Next() {

		group, _, err := convertToGroup(rows)

		if err != nil {

			_ = rows.Close()

			logger.Error("Error retrieving random groups.", zap.Error(err))

			return nil, err

		}

		groups = append(groups, group)

	}

	_ = rows.Close()



	if len(groups) < count {

		// Need more groups.

		rows, err = db.QueryContext(ctx, query, uuid.Nil.String(), count)

		if err != nil {

			logger.Error("Error retrieving random groups.", zap.Error(err))

			return nil, err

		}

		for rows.Next() {

			group, _, err := convertToGroup(rows)

			if err != nil {

				_ = rows.Close()

				logger.Error("Error retrieving random groups.", zap.Error(err))

				return nil, err

			}

			var found bool

			for _, existing := range groups {

				if existing.Id == group.Id {

					found = true

					break

				}

			}

			if !found {

				groups = append(groups, group)

			}

			if len(groups) >= count {

				break

			}

		}

		_ = rows.Close()

	}



	return groups, nil

}



func getGroup(ctx context.Context, logger *zap.Logger, db *sql.DB, groupID uuid.UUID) (*api.Group, error) {

	query := `SELECT id, creator_id, name, description, avatar_url, state, edge_count, lang_tag, max_count, metadata, create_time, update_time

	FROM groups WHERE id = $1`