chop chop

src/routes/authentication.js

@@ -232,8 +232,6 @@
 			function(next) {
 				user.logIP(uid, req.ip);
 
-				require('../socket.io').emitUserCount();
-
 				user.notifications.sendWelcomeNotification(uid);
 
 				plugins.fireHook('filter:register.complete', {uid: uid, referrer: req.body.referrer}, next);

src/socket.io/index.js

@@ -14,7 +14,6 @@ var	SocketIO = require('socket.io'),
 	user = require('../user'),
 	topics = require('../topics'),
 	logger = require('../logger'),
-	meta = require('../meta'),
 	ratelimit = require('../middleware/ratelimit'),
 
 	Sockets = {},
@@ -183,7 +182,6 @@ Sockets.init = function(server) {
 			var socketCount = Sockets.getUserSocketCount(uid);
 			if (uid && socketCount <= 1) {
 				socket.broadcast.emit('event:user_status_change', {uid: uid, status: 'offline'});
-				emitOnlineUserCount();
 			}
 
 			onUserDisconnect(uid, socket.id, socketCount);
@@ -252,12 +250,6 @@ Sockets.logoutUser = function(uid) {
 	});
 };
 
-Sockets.emitUserCount = function() {
-	user.count(function(err, count) {
-		io.sockets.emit('user.count', err ? {message:err.message} : null, count);
-	});
-};
-
 Sockets.in = function(room) {
 	return io.sockets.in(room);
 };
@@ -344,9 +336,6 @@ Sockets.getUserRooms = function(uid) {
 	return rooms;
 };
 
-
-/* Helpers */
-
 Sockets.reqFromSocket = function(socket) {
 	var headers = socket.handshake.headers,
 		host = headers.host,
@@ -363,25 +352,22 @@ Sockets.reqFromSocket = function(socket) {
 	};
 };
 
-Sockets.isUserOnline = isUserOnline;
+Sockets.isUserOnline = function(uid) {
-function isUserOnline(uid) {
 	if (!io) {
 		// Special handling for install script (socket.io not initialised)
 		return false;
 	}
 
 	return Array.isArray(io.sockets.manager.rooms['/uid_' + uid]);
-}
+};
 
 Sockets.isUsersOnline = function(uids, callback) {
-	var data = uids.map(isUserOnline);
+	var data = uids.map(Sockets.isUserOnline);
 
 	callback(null, data);
 };
 
-Sockets.updateRoomBrowsingText = updateRoomBrowsingText;
+Sockets.updateRoomBrowsingText = function (roomName, selfUid) {
-function updateRoomBrowsingText(roomName, selfUid) {
-
 	if (!roomName) {
 		return;
 	}
@@ -410,7 +396,7 @@ function updateRoomBrowsingText(roomName, selfUid) {
 			total: Math.max(0, total - uids.length)
 		});
 	});
-}
+};
 
 Sockets.getUidsInRoom = function(roomName) {
 	var uids = [];
@@ -434,44 +420,6 @@ Sockets.getUidsInRoom = function(roomName) {
 	return uids;
 };
 
-Sockets.emitTopicPostStats = emitTopicPostStats;
-function emitTopicPostStats(callback) {
-	db.getObjectFields('global', ['topicCount', 'postCount'], function(err, data) {
-		if (err) {
-			return winston.err(err);
-		}
-
-		var stats = {
-			topics: data.topicCount ? data.topicCount : 0,
-			posts: data.postCount ? data.postCount : 0
-		};
-
-		if (!callback) {
-			io.sockets.in('online_users').emit('meta.getUsageStats', null, stats);
-		} else {
-			callback(null, stats);
-		}
-	});
-}
-
-Sockets.emitOnlineUserCount = emitOnlineUserCount;
-function emitOnlineUserCount(callback) {
-	var anon = Sockets.getOnlineAnonCount();
-	var registered = Sockets.getOnlineUserCount();
-
-	var returnObj = {
-		users: registered + anon,
-		anon: anon
-	};
-
-	if (callback) {
-		callback(null, returnObj);
-	} else {
-		io.sockets.in('online_users').emit('user.getActiveUsers', null, returnObj);
-	}
-}
-
-
 
 /* Exporting */
 module.exports = Sockets;

src/socket.io/meta.js

@@ -1,16 +1,17 @@
 'use strict';
 
-var	meta = require('../meta'),
+var	nconf = require('nconf'),
+	gravatar = require('gravatar'),
+	winston = require('winston'),
+	validator = require('validator'),
+
+	meta = require('../meta'),
 	user = require('../user'),
 	topics = require('../topics'),
 	logger = require('../logger'),
 	plugins = require('../plugins'),
 	emitter = require('../emitter'),
 
-	nconf = require('nconf'),
-	gravatar = require('gravatar'),
-	winston = require('winston'),
-	validator = require('validator'),
 	websockets = require('./'),
 
 	SocketMeta = {
@@ -56,10 +57,6 @@ SocketMeta.buildTitle = function(socket, text, callback) {
 	}
 };
 
-SocketMeta.getUsageStats = function(socket, data, callback) {
-	module.parent.exports.emitTopicPostStats(callback);
-};
-
 /* Rooms */
 
 SocketMeta.rooms.enter = function(socket, data, callback) {

src/socket.io/posts.js

@@ -63,8 +63,6 @@ SocketPosts.reply = function(socket, data, callback) {
 				}
 			});
 		});
-
-		websockets.emitTopicPostStats();
 	});
 };
 
@@ -223,17 +221,15 @@ SocketPosts.restore = function(socket, data, callback) {
 };
 
 function deleteOrRestore(command, socket, data, callback) {
-	if(!data) {
+	if (!data) {
 		return callback(new Error('[[error:invalid-data]]'));
 	}
 
 	postTools[command](socket.uid, data.pid, function(err, postData) {
-		if(err) {
+		if (err) {
 			return callback(err);
 		}
 
-		websockets.emitTopicPostStats();
-
 		var eventName = command === 'restore' ? 'event:post_restored' : 'event:post_deleted';
 		websockets.server.sockets.in('topic_' + data.tid).emit(eventName, postData);
 
@@ -250,8 +246,6 @@ SocketPosts.purge = function(socket, data, callback) {
 			return callback(err);
 		}
 
-		websockets.emitTopicPostStats();
-
 		websockets.server.sockets.in('topic_' + data.tid).emit('event:post_purged', data.pid);
 
 		callback();

src/socket.io/topics.js

@@ -59,8 +59,6 @@ SocketTopics.post = function(socket, data, callback) {
 				}
 			});
 		});
-
-		websockets.emitTopicPostStats();
 	});
 };
 
@@ -210,7 +208,7 @@ SocketTopics.purge = function(socket, data, callback) {
 		if (err) {
 			return callback(err);
 		}
-		websockets.emitTopicPostStats();
+
 		websockets.in('category_' + data.cid).emit('event:topic_purged', data.tids);
 		async.each(data.tids, function(tid, next) {
 			websockets.in('topic_' + tid).emit('event:topic_purged', tid);

src/socket.io/user.js

@@ -31,10 +31,6 @@ SocketUser.deleteAccount = function(socket, data, callback) {
 	}
 };
 
-SocketUser.count = function(socket, data, callback) {
-	user.count(callback);
-};
-
 SocketUser.emailExists = function(socket, data, callback) {
 	if(data && data.email) {
 		user.email.exists(data.email, callback);
@@ -326,10 +322,6 @@ SocketUser.getUnreadChatCount = function(socket, data, callback) {
 	messaging.getUnreadCount(socket.uid, callback);
 };
 
-SocketUser.getActiveUsers = function(socket, data, callback) {
-	module.parent.exports.emitOnlineUserCount(callback);
-};
-
 SocketUser.loadMore = function(socket, data, callback) {
 	if(!data || !data.set || parseInt(data.after, 10) < 0) {
 		return callback(new Error('[[error:invalid-data]]'));

src/threadTools.js

@@ -62,8 +62,6 @@ var winston = require('winston'),
 
 				events[isDelete ? 'logTopicDelete' : 'logTopicRestore'](uid, tid);
 
-				websockets.emitTopicPostStats();
-
 				emitTo('topic_' + tid);
 				emitTo('category_' + topicData.cid);
 

src/user.js

@@ -268,12 +268,6 @@ var	async = require('async'),
 		});
 	};
 
-	User.count = function(callback) {
-		db.getObjectField('global', 'userCount', function(err, count) {
-			callback(err, count ? count : 0);
-		});
-	};
-
 	User.getUidByUsername = function(username, callback) {
 		db.getObjectField('username:uid', username, callback);
 	};