|
|
|
@ -52,14 +52,14 @@ SocketMeta.rooms.enter = function(socket, data, callback) {
|
|
|
|
|
if (data.enter) {
|
|
|
|
|
rooms.enter(socket, data.enter);
|
|
|
|
|
socket.currentRoom = data.enter;
|
|
|
|
|
if (data.enter.indexOf('topic') !== -1) {
|
|
|
|
|
data.uid = socket.uid;
|
|
|
|
|
data.picture = validator.escape(data.picture);
|
|
|
|
|
data.username = validator.escape(data.username);
|
|
|
|
|
data.userslug = validator.escape(data.userslug);
|
|
|
|
|
|
|
|
|
|
websockets.in(data.enter).emit('event:user_enter', data);
|
|
|
|
|
}
|
|
|
|
|
// if (data.enter.indexOf('topic') !== -1) {
|
|
|
|
|
// data.uid = socket.uid;
|
|
|
|
|
// data.picture = validator.escape(data.picture);
|
|
|
|
|
// data.username = validator.escape(data.username);
|
|
|
|
|
// data.userslug = validator.escape(data.userslug);
|
|
|
|
|
|
|
|
|
|
// websockets.in(data.enter).emit('event:user_enter', data);
|
|
|
|
|
// }
|
|
|
|
|
}
|
|
|
|
|
callback();
|
|
|
|
|
};
|
|
|
|
@ -75,9 +75,9 @@ SocketMeta.rooms.leaveCurrent = function(socket, data, callback) {
|
|
|
|
|
function leaveCurrentRoom(socket) {
|
|
|
|
|
if (socket.currentRoom) {
|
|
|
|
|
rooms.leave(socket, socket.currentRoom);
|
|
|
|
|
if (socket.currentRoom.indexOf('topic') !== -1) {
|
|
|
|
|
websockets.in(socket.currentRoom).emit('event:user_leave', socket.uid);
|
|
|
|
|
}
|
|
|
|
|
// if (socket.currentRoom.indexOf('topic') !== -1) {
|
|
|
|
|
// websockets.in(socket.currentRoom).emit('event:user_leave', socket.uid);
|
|
|
|
|
// }
|
|
|
|
|
socket.currentRoom = '';
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|