Merge branch 'master' into notif_pruning

package.json

@@ -41,7 +41,7 @@
     "prompt": "~0.2.11",
     "uglify-js": "~2.4.0",
     "validator": "~1.5.1",
-    "nodebb-plugin-mentions": "~0.1.12",
+    "nodebb-plugin-mentions": "~0.1.13",
     "nodebb-plugin-markdown": "~0.1.7",
     "nodebb-theme-vanilla": "designcreateplay/nodebb-theme-vanilla",
     "nodebb-theme-cerulean": "0.0.3"

public/src/forum/unread.js

@@ -87,7 +87,7 @@ define(function() {
 		function loadMoreTopics() {
 			loadingMoreTopics = true;
 			socket.emit('api:topics.loadMoreUnreadTopics', {
-				after: parseInt($('#topics-container').attr('data-next-start'), 10);
+				after: parseInt($('#topics-container').attr('data-next-start'), 10)
 			}, function(data) {
 				if (data.topics && data.topics.length) {
 					onTopicsLoaded(data.topics);

src/posts.js

@@ -33,7 +33,7 @@ var RDB = require('./redis.js'),
 					} else {
 						callback(posts);
 					}
-				});			
+				});
 			} else {
 				callback([]);
 			}
@@ -175,7 +175,7 @@ var RDB = require('./redis.js'),
 				data = data || {};
 				data.pid = pid;
 				data.field = field;
-				
+
 				plugins.fireHook('filter:post.getField', data, function(err, data) {
 					callback(data);
 				});
@@ -464,7 +464,7 @@ var RDB = require('./redis.js'),
 					posts: data[1] ? data[1] : 0
 				};
 
-				socket.emit('post.stats', stats);
+				io.sockets.emit('post.stats', stats);
 			} else
 				console.log(err);
 		});

src/websockets.js

@@ -244,7 +244,7 @@ module.exports.init = function(io) {
 		});
 
 		socket.on('post.stats', function(data) {
-			posts.getTopicPostStats(socket);
+			posts.getTopicPostStats();
 		});
 
 		socket.on('user.latest', function(data) {
@@ -373,7 +373,7 @@ module.exports.init = function(io) {
 				}
 
 				if (result) {
-					posts.getTopicPostStats(socket);
+					posts.getTopicPostStats();
 
 					socket.emit('event:alert', {
 						title: 'Thank you for posting',
@@ -426,7 +426,7 @@ module.exports.init = function(io) {
 
 				if (result) {
 
-					posts.getTopicPostStats(socket);
+					posts.getTopicPostStats();
 
 					socket.emit('event:alert', {
 						title: 'Reply Successful',
@@ -476,7 +476,7 @@ module.exports.init = function(io) {
 		socket.on('api:topic.delete', function(data) {
 			threadTools.delete(data.tid, uid, function(err) {
 				if (!err) {
-					posts.getTopicPostStats(socket);
+					posts.getTopicPostStats();
 					socket.emit('api:topic.delete', {
 						status: 'ok',
 						tid: data.tid
@@ -487,7 +487,7 @@ module.exports.init = function(io) {
 
 		socket.on('api:topic.restore', function(data) {
 			threadTools.restore(data.tid, uid, socket, function(err) {
-				posts.getTopicPostStats(socket);
+				posts.getTopicPostStats();
 
 				socket.emit('api:topic.restore', {
 					status: 'ok',
@@ -547,13 +547,13 @@ module.exports.init = function(io) {
 
 		socket.on('api:posts.delete', function(data) {
 			postTools.delete(uid, data.pid, function() {
-				posts.getTopicPostStats(socket);
+				posts.getTopicPostStats();
 			});
 		});
 
 		socket.on('api:posts.restore', function(data) {
 			postTools.restore(uid, data.pid, function() {
-				posts.getTopicPostStats(socket);
+				posts.getTopicPostStats();
 			});
 		});