mrflos/memo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sessionId to id

Browse source
This commit is contained in:
Will Langstroth 2011-09-05 22:17:30 -04:00
parent 2e7b58ae85
commit d03cc8ba38
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
server.js
View file

@ -285,7 +285,7 @@ function scrub( text ) {
var msg = {}; var msg = {};
msg.action = 'nameChangeAnnounce'; msg.action = 'nameChangeAnnounce';
msg.data = { sid: client.sessionId, user_name: clean_message.data }; msg.data = { sid: client.id, user_name: clean_message.data };
broadcastToRoom( client, msg ); broadcastToRoom( client, msg );
break; break;
@ -390,11 +390,11 @@ function initClient ( client )
var j = 0; var j = 0;
for (i in roommates_clients) for (i in roommates_clients)
{ {
if (roommates_clients[i].sessionId != client.sessionId) if (roommates_clients[i].id != client.id)
{ {
roommates[j] = { roommates[j] = {
sid: roommates_clients[i].sessionId, sid: roommates_clients[i].id,
user_name: sids_to_user_names[roommates_clients[i].sessionId] user_name: sids_to_user_names[roommates_clients[i].id]
}; };
j++; j++;
} }
@ -416,7 +416,7 @@ function joinRoom (client, room, successFunction)
{ {
var msg = {}; var msg = {};
msg.action = 'join-announce'; msg.action = 'join-announce';
msg.data = { sid: client.sessionId, user_name: client.user_name }; msg.data = { sid: client.id, user_name: client.user_name };
rooms.add_to_room_and_announce(client, room, msg); rooms.add_to_room_and_announce(client, room, msg);
successFunction(); successFunction();
@ -424,13 +424,13 @@ function joinRoom (client, room, successFunction)
function leaveRoom (client) function leaveRoom (client)
{ {
console.log (client.sessionId + ' just left'); console.log (client.id + ' just left');
var msg = {}; var msg = {};
msg.action = 'leave-announce'; msg.action = 'leave-announce';
msg.data = { sid: client.sessionId }; msg.data = { sid: client.id };
rooms.remove_from_all_rooms_and_announce(client, msg); rooms.remove_from_all_rooms_and_announce(client, msg);
delete sids_to_user_names[client.sessionId]; delete sids_to_user_names[client.id];
} }
function broadcastToRoom ( client, message ) { function broadcastToRoom ( client, message ) {
@ -464,7 +464,7 @@ function roundRand( max )
function getRoom( client , callback ) function getRoom( client , callback )
{ {
room = rooms.get_room( client ); room = rooms.get_room( client );
//console.log( 'client: ' + client.sessionId + " is in " + room); //console.log( 'client: ' + client.id + " is in " + room);
callback(room); callback(room);
} }
@ -472,7 +472,7 @@ function getRoom( client , callback )
function setUserName ( client, name ) function setUserName ( client, name )
{ {
client.user_name = name; client.user_name = name;
sids_to_user_names[client.sessionId] = name; sids_to_user_names[client.id] = name;
console.log('sids to user names: '); console.log('sids to user names: ');
console.dir(sids_to_user_names); console.dir(sids_to_user_names);
} }