Unify match create and join result entities. Merge heroiclabs#31

Author: zyro

CHANGELOG.md

@@ -4,6 +4,8 @@ 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]
+### Changed
+- Update response types to realtime match create/join operations.
 
 ## [0.11.2] - 2017-02-17
 ### Added

server/api.proto

@@ -123,15 +123,14 @@ message Envelope {
     TMatchLeave match_leave = 43;
     TMatchDataSend match_data_send = 44;
     TMatch match = 45;
-    TMatchPresences match_presences = 46;
-    MatchData match_data = 47;
-    MatchPresence match_presence = 48;
-
-    TStorageFetch storage_fetch = 49;
-    TStorageWrite storage_write = 50;
-    TStorageRemove storage_remove = 51;
-    TStorageData storage_data = 52;
-    TStorageKey storage_key = 53;
+    MatchData match_data = 46;
+    MatchPresence match_presence = 47;
+
+    TStorageFetch storage_fetch = 48;
+    TStorageWrite storage_write = 49;
+    TStorageRemove storage_remove = 50;
+    TStorageData storage_data = 51;
+    TStorageKey storage_key = 52;
   }
 }
 
@@ -403,17 +402,13 @@ message TopicPresence {
 }
 
 message TMatchCreate {}
-message TMatch {
-  bytes id = 1;
-  UserPresence self = 2;
-}
-
 message TMatchJoin {
   bytes match_id = 1;
 }
-message TMatchPresences {
-  repeated UserPresence presences = 1;
-  UserPresence self = 2;
+message TMatch {
+  bytes match_id = 1;
+  repeated UserPresence presences = 2;
+  UserPresence self = 3;
 }
 
 message TMatchDataSend {

server/pipeline_match.go

@@ -24,12 +24,15 @@ func (p *pipeline) matchCreate(logger zap.Logger, session *session, envelope *En
 
 	p.tracker.Track(session.id, "match:"+matchID.String(), session.userID, PresenceMeta{})
 
+	self := &UserPresence{
+		UserId:    session.userID.Bytes(),
+		SessionId: session.id.Bytes(),
+	}
+
 	session.Send(&Envelope{CollationId: envelope.CollationId, Payload: &Envelope_Match{Match: &TMatch{
-		Id: matchID.Bytes(),
-		Self: &UserPresence{
-			UserId:    session.userID.Bytes(),
-			SessionId: session.id.Bytes(),
-		},
+		MatchId:   matchID.Bytes(),
+		Presences: []*UserPresence{self},
+		Self:      self,
 	}}})
 }
 
@@ -64,7 +67,8 @@ func (p *pipeline) matchJoin(logger zap.Logger, session *session, envelope *Enve
 	}
 	userPresences[len(ps)-1] = self
 
-	session.Send(&Envelope{CollationId: envelope.CollationId, Payload: &Envelope_MatchPresences{MatchPresences: &TMatchPresences{
+	session.Send(&Envelope{CollationId: envelope.CollationId, Payload: &Envelope_Match{Match: &TMatch{
+		MatchId:   matchIDBytes,
 		Presences: userPresences,
 		Self:      self,
 	}}})