From 50494c5fbd2e94088f7cc454f4dd15deb5e768be Mon Sep 17 00:00:00 2001
From: Brian Smith <briansmith@jamkazam.com>
Date: Sat, 23 Mar 2013 03:49:19 -0400
Subject: [PATCH] VRFS-281 added friend request messages

---
 src/client_container.proto | 67 ++++++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 24 deletions(-)

diff --git a/src/client_container.proto b/src/client_container.proto
index 839b2c328..4d9cbe9dd 100644
--- a/src/client_container.proto
+++ b/src/client_container.proto
@@ -17,22 +17,24 @@ message ClientMessage {
         USER_JOINED_MUSIC_SESSION = 104;
         LEAVE_MUSIC_SESSION = 105;
         LEAVE_MUSIC_SESSION_ACK = 106;
-	HEARTBEAT = 107;
+        HEARTBEAT = 107;
         FRIEND_UPDATE = 108;
         SESSION_INVITATION = 109;
         USER_LEFT_MUSIC_SESSION = 110;
         JOIN_REQUEST = 111;
+        FRIEND_REQUEST = 112;
+        FRIEND_REQUEST_ACCEPTED = 113;
 
-	TEST_SESSION_MESSAGE = 200;
+        TEST_SESSION_MESSAGE = 200;
 
-	PING_REQUEST = 300;
-	PING_ACK     = 301;
-	PEER_MESSAGE  = 302;
-	TEST_CLIENT_MESSAGE = 303;
+        PING_REQUEST = 300;
+        PING_ACK     = 301;
+        PEER_MESSAGE  = 302;
+        TEST_CLIENT_MESSAGE = 303;
 
         SERVER_GENERIC_ERROR = 1000;
         SERVER_REJECTION_ERROR = 1001;
-	SERVER_PERMISSION_ERROR = 1002;
+        SERVER_PERMISSION_ERROR = 1002;
     }
 
     // Identifies which inner message is filled in
@@ -45,27 +47,29 @@ message ClientMessage {
     // One of the following messages can be populated:
 
     // Client-Server messages (to/from)
-    optional Login          login = 100; // to server
-    optional LoginAck           login_ack = 101; // from server
-    optional LoginMusicSession      login_music_session = 102; // to server
-    optional LoginMusicSessionAck   login_music_session_ack = 103; // from server 
+    optional Login                      login = 100; // to server
+    optional LoginAck                   login_ack = 101; // from server
+    optional LoginMusicSession          login_music_session = 102; // to server
+    optional LoginMusicSessionAck       login_music_session_ack = 103; // from server 
     optional UserJoinedMusicSession     user_joined_music_session = 104; // from server to all members
-    optional LeaveMusicSession      leave_music_session = 105;
-    optional LeaveMusicSessionAck   leave_music_session_ack = 106;
-    optional Heartbeat          heartbeat = 107;
-    optional FriendUpdate         friend_update = 108; // from server to all friends of user
-    optional SessionInvitation      session_invitation = 109; // from server to user
-    optional UserLeftMusicSession   user_left_music_session = 110;
-    optional JoinRequest join_request = 111;
+    optional LeaveMusicSession          leave_music_session = 105;
+    optional LeaveMusicSessionAck       leave_music_session_ack = 106;
+    optional Heartbeat                  heartbeat = 107;
+    optional FriendUpdate               friend_update = 108; // from server to all friends of user
+    optional SessionInvitation          session_invitation = 109; // from server to user
+    optional UserLeftMusicSession       user_left_music_session = 110;
+    optional JoinRequest                join_request = 111;
+    optional FriendRequest              friend_request = 112;
+    optional FriendRequestAccepted      friend_request_accepted = 113;
 
     // Client-Session messages (to/from)  
     optional TestSessionMessage     test_session_message = 200;
 
     // Client-Client messages (to/from)
-    optional PingRequest		ping_request = 300;
-    optional PingAck			ping_ack = 301;
+    optional PingRequest        ping_request = 300;
+    optional PingAck            ping_ack = 301;
     optional PeerMessage                peer_message = 302;
-    optional TestClientMessage		test_client_message = 303;
+    optional TestClientMessage      test_client_message = 303;
 
     // Server-to-Client errors 
     optional ServerGenericError server_generic_error = 1000;
@@ -159,7 +163,7 @@ message TestSessionMessage {
 // route_to: client:[CLIENT_ID]
 // asks a client to begin a ping session
 message PingRequest {
-	
+    
 }
 
 // route_to: client:[CLIENT_ID]
@@ -186,6 +190,23 @@ message Heartbeat {
     
 }
 
+// target: client
+// send from server to client when user sends a friend request
+message FriendRequest {
+    optional string user_id = 1;
+    optional string name = 2;
+    optional string photo_url = 3;
+    optional string friend_id = 4;
+}
+
+// target: client
+message FriendRequestAccepted {
+    optional string friend_id = 1;     // accepter
+    optional string name = 2;
+    optional string photo_url = 3;
+    optional string user_id = 4;  // original requester
+}
+
 // target: client
 // send from server to client when a user logs in
 message FriendUpdate {
@@ -193,14 +214,12 @@ message FriendUpdate {
     optional bool online = 2;
 }
 
-
 // route_to: user:[USER_ID]
 // let a user know they've been invited to a session
 message SessionInvitation {
     optional string invitation = 1;
 }
 
-
 // route_to: client
 // this indicates unhandled error on server
 // if you receive this, your connection will close after.