Commit a2636cca authored by Mo Firouz's avatar Mo Firouz Committed by Andrei Mihu
Browse files

Check max group size when promoting users. (#278)

parent dcea34d2

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr 
- Leaderboard and tournament reset runtime callbacks now receive the correct reset time.

- Tournament end runtime callbacks now receive the correct end time.

- Leaderboard and tournament runtime callbacks no longer trigger twice when time delays are observed.

- Check group max allowed user when promoting a user.



## [2.2.1] - 2018-11-20

### Added

api/api.pb.go

+2 −1
Original line number Diff line number Diff line
@@ -5,10 +5,11 @@ package api 


import (

	fmt "fmt"

	math "math"



	proto "github.com/golang/protobuf/proto"

	timestamp "github.com/golang/protobuf/ptypes/timestamp"

	wrappers "github.com/golang/protobuf/ptypes/wrappers"

	math "math"

)



// Reference imports to suppress errors if they are not otherwise used.

server/api_friend.go

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ package server 


import (

	"fmt"

	"time"



	"github.com/gofrs/uuid"

	"github.com/golang/protobuf/ptypes/empty"

	"github.com/heroiclabs/nakama/api"
@@ -26,7 +28,6 @@ import ( 
	"golang.org/x/net/context"

	"google.golang.org/grpc/codes"

	"google.golang.org/grpc/status"

	"time"

)



func (s *ApiServer) ListFriends(ctx context.Context, in *empty.Empty) (*api.Friends, error) {

server/api_group.go

+4 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ package server 


import (

	"fmt"

	"time"



	"github.com/gofrs/uuid"

	"github.com/golang/protobuf/ptypes/empty"

	"github.com/heroiclabs/nakama/api"
@@ -26,7 +28,6 @@ import ( 
	"golang.org/x/net/context"

	"google.golang.org/grpc/codes"

	"google.golang.org/grpc/status"

	"time"

)



func (s *ApiServer) CreateGroup(ctx context.Context, in *api.CreateGroupRequest) (*api.Group, error) {
@@ -594,6 +595,8 @@ func (s *ApiServer) PromoteGroupUsers(ctx context.Context, in *api.PromoteGroupU 
	if err != nil {

		if err == ErrGroupPermissionDenied {

			return nil, status.Error(codes.NotFound, "Group not found or permission denied.")

		} else if err == ErrGroupFull {

			return nil, status.Error(codes.InvalidArgument, "Group is full.")

		}

		return nil, status.Error(codes.Internal, "Error while trying to promote users in a group.")

	}

server/api_storage.go

+2 −1
Original line number Diff line number Diff line
@@ -17,11 +17,12 @@ package server 
import (

	"encoding/json"

	"fmt"

	"time"



	"go.opencensus.io/stats"

	"go.opencensus.io/tag"

	"go.opencensus.io/trace"

	"go.uber.org/zap"

	"time"



	"github.com/gofrs/uuid"

	"github.com/golang/protobuf/ptypes/empty"