Commit aa850698 authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Rename descriptor to subcontext and import to sync.

parent 167cb6d4

CHANGELOG.md

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr 
- Clients sending data to an invalid match ID will now receive an uncollated error.



### Changed

- Rename stream 'descriptor' field to 'subcontext' to avoid protocol naming conflict.

- Rename Facebook authentication and link 'import' field to avoid language keyword conflict.

- Rejoining a match the user is already part of will now return the match label.

- Allow tournament joins before the start of the tournament active period.

- Authoritative matches now complete their stop phase faster to avoid unnecessary processing.
@@ -28,6 +30,7 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr 
- 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.

- Correct Lua runtime decoding of stream identifying parameters.



## [2.2.1] - 2018-11-20

### Added

api/api.pb.go

+211 −212

File changed.

Preview size limit exceeded, changes collapsed.

api/api.proto

+2 −2
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ message AuthenticateFacebookRequest { 
  // Set the username on the account at register. Must be unique.

  string username = 3;

  // Import Facebook friends for the user.

  google.protobuf.BoolValue import = 4;

  google.protobuf.BoolValue sync = 4;

}



// Authenticate against the server with Apple's Game Center.
@@ -465,7 +465,7 @@ message LinkFacebookRequest { 
  // The Facebook account details.

  AccountFacebook account = 1;

  // Import Facebook friends for the user.

  google.protobuf.BoolValue import = 4;

  google.protobuf.BoolValue sync = 4;

}



// List a channel's message history.

apigrpc/apigrpc.swagger.json

+2 −2
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ 
            "type": "string"

          },

          {

            "name": "import",

            "name": "sync",

            "description": "Import Facebook friends for the user.",

            "in": "query",

            "required": false,
@@ -527,7 +527,7 @@ 
            }

          },

          {

            "name": "import",

            "name": "sync",

            "description": "Import Facebook friends for the user.",

            "in": "query",

            "required": false,

rtapi/realtime.pb.go

+17 −17
Original line number Diff line number Diff line
@@ -2878,8 +2878,8 @@ type Stream struct { 
	Mode int32 `protobuf:"varint,1,opt,name=mode,proto3" json:"mode,omitempty"`

	// Subject is the primary identifier, if any.

	Subject string `protobuf:"bytes,2,opt,name=subject,proto3" json:"subject,omitempty"`

	// Descriptor is a secondary identifier, if any.

	Descriptor_ string `protobuf:"bytes,3,opt,name=descriptor,proto3" json:"descriptor,omitempty"`

	// Subcontext is a secondary identifier, if any.

	Subcontext string `protobuf:"bytes,3,opt,name=subcontext,proto3" json:"subcontext,omitempty"`

	// The label is an arbitrary identifying string, if the stream has one.

	Label                string   `protobuf:"bytes,4,opt,name=label,proto3" json:"label,omitempty"`

	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -2926,9 +2926,9 @@ func (m *Stream) GetSubject() string { 
	return ""

}



func (m *Stream) GetDescriptor_() string {

func (m *Stream) GetSubcontext() string {

	if m != nil {

		return m.Descriptor_

		return m.Subcontext

	}

	return ""

}
@@ -3181,7 +3181,7 @@ func init() { 
func init() { proto.RegisterFile("rtapi/realtime.proto", fileDescriptor_0163624496220f8c) }



var fileDescriptor_0163624496220f8c = []byte{

	// 2156 bytes of a gzipped FileDescriptorProto

	// 2153 bytes of a gzipped FileDescriptorProto

	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xcd, 0x73, 0xe3, 0x48,

	0x15, 0xb7, 0xfc, 0x95, 0xf8, 0x25, 0x4e, 0x9c, 0x8e, 0x27, 0xd1, 0x3a, 0x3b, 0x99, 0x41, 0xb3,

	0x14, 0xc3, 0x52, 0x38, 0x35, 0x1f, 0x5b, 0x05, 0x33, 0x30, 0x55, 0x89, 0xad, 0xc4, 0x1e, 0xd6,
@@ -3305,16 +3305,16 @@ var fileDescriptor_0163624496220f8c = []byte{ 
	0xec, 0x2e, 0x78, 0x05, 0xf9, 0xa0, 0xb7, 0xc2, 0xf7, 0x60, 0x2b, 0xfe, 0x64, 0xb2, 0x6c, 0xc3,

	0xcd, 0xe0, 0xdb, 0x78, 0xc3, 0xf3, 0x3c, 0x7c, 0x6c, 0x12, 0x6e, 0x51, 0xd5, 0x71, 0xac, 0x34,

	0x26, 0x86, 0x76, 0xb1, 0x66, 0x91, 0xb2, 0xc3, 0x8a, 0x14, 0xf5, 0x16, 0x2f, 0xea, 0xbd, 0xe9,

	0xf9, 0x57, 0x58, 0x0f, 0xdb, 0x2e, 0x3e, 0x44, 0x87, 0x00, 0x06, 0xf6, 0x74, 0xd7, 0x9c, 0xf8,

	0x8e, 0xcb, 0x6f, 0x9e, 0x88, 0x84, 0x78, 0x22, 0x2b, 0x31, 0x59, 0xd3, 0xca, 0x06, 0xd2, 0x6f,

	0x04, 0x80, 0xd9, 0x33, 0x0c, 0x3a, 0x22, 0x5b, 0x26, 0x23, 0xbe, 0xe5, 0xfd, 0x94, 0x97, 0x16,

	0x85, 0xc3, 0x88, 0x5d, 0x3d, 0x6c, 0x1b, 0xd8, 0xbd, 0x5d, 0x19, 0xc7, 0xc1, 0xb1, 0x8a, 0xaa,

	0xc4, 0x6b, 0xb5, 0xbf, 0xd2, 0xf3, 0x9e, 0x7b, 0xb0, 0xb9, 0xfb, 0x9e, 0x3e, 0xa4, 0x83, 0xfc,

	0x5d, 0x80, 0xcd, 0xe8, 0x04, 0x29, 0x22, 0xb9, 0x7f, 0x04, 0x11, 0xc9, 0xdc, 0x83, 0xf4, 0x8d,

	0x1e, 0xf6, 0x3c, 0xd3, 0xb1, 0x23, 0xfd, 0x26, 0x97, 0xb4, 0x8d, 0xd8, 0xb3, 0x42, 0x2e, 0xf1,

	0xac, 0xf0, 0x30, 0xfe, 0xbe, 0x93, 0xa7, 0x1d, 0x44, 0xec, 0x0d, 0x67, 0xe6, 0x6a, 0x85, 0xdb,

	0xbb, 0xda, 0xc9, 0x29, 0x1c, 0xe8, 0x8e, 0x55, 0x9f, 0xfd, 0xa9, 0x17, 0x7e, 0xb3, 0xaf, 0x4d,

	0xcc, 0x93, 0xad, 0x2e, 0x1d, 0x29, 0xdc, 0x00, 0x7d, 0xe1, 0x4d, 0x81, 0x4e, 0xfc, 0x29, 0x9b,

	0xef, 0xfe, 0xa4, 0x7f, 0xf2, 0xe7, 0x6c, 0x91, 0x01, 0xce, 0x8b, 0x74, 0x95, 0x67, 0xff, 0x0b,

	0x00, 0x00, 0xff, 0xff, 0x82, 0x5d, 0x4f, 0x51, 0x92, 0x1c, 0x00, 0x00,

	0xf9, 0x57, 0x58, 0x0f, 0xdb, 0x2e, 0x3e, 0x44, 0x87, 0x00, 0xde, 0xf4, 0x7c, 0x56, 0xd7, 0x93,

	0xc9, 0x88, 0x84, 0x78, 0x22, 0x2b, 0x31, 0x59, 0xd3, 0xca, 0x06, 0xd2, 0x6f, 0x04, 0x80, 0xd9,

	0x33, 0x0c, 0x3a, 0x22, 0x5b, 0x26, 0x23, 0xbe, 0xe5, 0xfd, 0x94, 0x97, 0x16, 0x85, 0xc3, 0x88,

	0x5d, 0x3d, 0x6c, 0x1b, 0xd8, 0xbd, 0x5d, 0x19, 0xc7, 0xc1, 0xb1, 0x8a, 0xaa, 0xc4, 0x6b, 0xb5,

	0xbf, 0xd2, 0xf3, 0x9e, 0x7b, 0xb0, 0xb9, 0xfb, 0x9e, 0x3e, 0xa4, 0x83, 0xfc, 0x5d, 0x80, 0xcd,

	0xe8, 0x04, 0x29, 0x22, 0xb9, 0x7f, 0x04, 0x11, 0xc9, 0xdc, 0x83, 0xf4, 0x8d, 0x1e, 0xf6, 0x3c,

	0xd3, 0xb1, 0x23, 0xfd, 0x26, 0x97, 0xb4, 0x8d, 0xd8, 0xb3, 0x42, 0x2e, 0xf1, 0xac, 0xf0, 0x30,

	0xfe, 0xbe, 0x93, 0xa7, 0x1d, 0x44, 0xec, 0x0d, 0x67, 0xe6, 0x6a, 0x85, 0xdb, 0xbb, 0xda, 0xc9,

	0x29, 0x1c, 0xe8, 0x8e, 0x55, 0x9f, 0xfd, 0xa9, 0x17, 0x7e, 0xb3, 0xaf, 0x4d, 0xcc, 0x93, 0xad,

	0x2e, 0x1d, 0x29, 0xdc, 0x00, 0x7d, 0xe1, 0x4d, 0x81, 0x4e, 0xfc, 0x29, 0x9b, 0xef, 0xfe, 0xa4,

	0x7f, 0xf2, 0xe7, 0x6c, 0x91, 0x01, 0xce, 0x8b, 0x74, 0x95, 0x67, 0xff, 0x0b, 0x00, 0x00, 0xff,

	0xff, 0x49, 0xe0, 0x91, 0x17, 0x92, 0x1c, 0x00, 0x00,

}