* merging in FriendUpdate

This commit is contained in:
Seth Call 2012-10-13 17:48:35 -05:00
commit ba473ee9c9
1 changed files with 21 additions and 11 deletions

View File

@ -11,12 +11,14 @@ message ClientMessage {
enum Type {
LOGIN = 100;
LOGIN_ACK = 101;
LOGIN_MUSIC_SESSION = 102;
LOGIN_MUSIC_SESSION_ACK = 103;
USER_JOINED_MUSIC_SESSION = 104;
LEAVE_MUSIC_SESSION = 105;
LEAVE_MUSIC_SESSION_ACK = 106;
HEARTBEAT = 107;
FRIEND_UPDATE = 108;
TEST_SESSION_MESSAGE = 200;
@ -24,7 +26,7 @@ message ClientMessage {
PING_ACK = 301;
TEST_CLIENT_MESSAGE = 302;
SERVER_GENERIC_ERROR = 1000;
SERVER_GENERIC_ERROR = 1000;
SERVER_REJECTION_ERROR = 1001;
SERVER_PERMISSION_ERROR = 1002;
}
@ -39,17 +41,18 @@ 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 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 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
// Client-Session messages (to/from)
optional TestSessionMessage test_session_message = 200;
optional TestSessionMessage test_session_message = 200;
// Client-Client messages (to/from)
optional PingRequest ping_request = 300;
@ -148,7 +151,14 @@ message TestClientMessage {
// route_to: server
// send from client to server periodically to know if session is gone
message Heartbeat {
}
// target: client
// send from server to client when a user logs in
message FriendUpdate {
optional string user_id = 1;
optional bool online = 2;
}
// route_to: client