Merge remote-tracking branch 'refs/remotes/origin/master' into room-optimize

src/socket.io/admin/user.js

@@ -88,7 +88,6 @@ User.banUser = function(uid, callback) {
 
 			websockets.in('uid_' + uid).emit('event:banned');
 
-			websockets.logoutUser(uid);
 			callback();
 		});
 	});
@@ -193,7 +192,6 @@ User.deleteUsers = function(socket, uids, callback) {
 					ip: socket.ip
 				});
 
-				websockets.logoutUser(uid);
 				next();
 			});
 		});

src/socket.io/index.js

@@ -71,14 +71,12 @@ function onConnect(socket) {
 				return;
 			}
 
-			socket.emit('event:connect');
 			if (userData.status !== 'offline') {
 				socket.broadcast.emit('event:user_status_change', {uid: socket.uid, status: userData.status || 'online'});
 			}
 		});
 	} else {
 		rooms.enter(socket, 'online_guests');
-		socket.emit('event:connect');
 	}
 }
 
@@ -208,10 +206,6 @@ function callMethod(method, socket, params, callback) {
 	});
 }
 
-Sockets.logoutUser = function(uid) {
-	io.in('uid_' + uid).emit('event:disconnect');
-};
-
 Sockets.in = function(room) {
 	return io.in(room);
 };