removed global.io

public/src/forum/account.js

@@ -72,6 +72,7 @@ define(['forum/accountheader'], function(header) {
 			socket.on('event:new_post', function(data) {
 				var html = templates.prepare(templates['account'].blocks['posts']).parse(data);
 				$('.user-recent-posts').prepend(html);
+				$('.user-recent-posts span.timeago').timeago();
 			});
 
 		});

public/src/forum/footer.js

@@ -139,7 +139,7 @@
 	});
 
 	socket.on('event:new_notification', function() {
-		document.querySelector('.notifications a i').className = 'fa-circle active';
+		document.querySelector('.notifications a i').className = 'fa fa-circle active';
 		app.alert({
 			alert_id: 'new_notif',
 			title: 'New notification',

src/categories.js

@@ -143,7 +143,13 @@ var RDB = require('./redis.js'),
 
 	Categories.getAllCategories = function(current_user, callback) {
 		RDB.lrange('categories:cid', 0, -1, function(err, cids) {
-			RDB.handle(err);
+			if(err) {
+				return callback(err);
+			}
+			if(cids && cids.length === 0) {
+				return callback(null, {categories : []});
+			}
+			
 			Categories.getCategories(cids, current_user, callback);
 		});
 	};

src/favourites.js

@@ -1,7 +1,8 @@
-var RDB = require('./redis.js'),
+var RDB = require('./redis'),
-	posts = require('./posts.js'),
+	posts = require('./posts'),
-	user = require('./user.js'),
+	user = require('./user'),
-	translator = require('./../public/src/translator.js');
+	websockets = require('./websockets')
+	translator = require('./../public/src/translator');
 
 (function (Favourites) {
 	"use strict";
@@ -37,7 +38,7 @@ var RDB = require('./redis.js'),
 					}
 
 					if (room_id) {
-						io.sockets. in (room_id).emit('event:rep_up', {
+						websockets.in(room_id).emit('event:rep_up', {
 							uid: uid !== postData.uid ? postData.uid : 0,
 							pid: pid
 						});
@@ -72,7 +73,7 @@ var RDB = require('./redis.js'),
 					}
 
 					if (room_id) {
-						io.sockets. in (room_id).emit('event:rep_down', {
+						websockets.in(room_id).emit('event:rep_down', {
 							uid: uid !== uid_of_poster ? uid_of_poster : 0,
 							pid: pid
 						});

src/notifications.js

@@ -4,15 +4,20 @@ var RDB = require('./redis'),
 	winston = require('winston'),
 	cron = require('cron').CronJob,
 
-	notifications = {
+	websockets = require('./websockets');
-		init: function() {
+
+
+
+(function(Notifications) {
+
+	Notifications.init = function() {
 		if (process.env.NODE_ENV === 'development') {
 			winston.info('[notifications.init] Registering jobs.');
 		}
+		new cron('0 0 * * *', Notifications.prune, null, true);
+	};
 	
-			new cron('0 0 * * *', notifications.prune, null, true);
+	Notifications.get = function(nid, uid, callback) {
-		},
-		get: function(nid, uid, callback) {
 		RDB.multi()
 			.hmget('notifications:' + nid, 'text', 'score', 'path', 'datetime', 'uniqueId')
 			.zrank('uid:' + uid + ':notifications:read', nid)
@@ -35,8 +40,9 @@ var RDB = require('./redis'),
 					read: readIdx !== null ? true : false
 				});
 			});
-		},
+	};
-		create: function(text, path, uniqueId, callback) {
+	
+	Notifications.create = function(text, path, uniqueId, callback) {
 		/**
 		 * uniqueId is used solely to override stale nids.
 		 * 		If a new nid is pushed to a user and an existing nid in the user's
@@ -56,8 +62,9 @@ var RDB = require('./redis'),
 				}
 			});
 		});
-		},
+	};
-		destroy: function(nid) {
+	
+	function destroy(nid) {
 		var	multi = RDB.multi();
 
 		multi.del('notifications:' + nid);
@@ -69,24 +76,22 @@ var RDB = require('./redis'),
 				winston.error(err.stack);
 			}
 		});
-		},
+	}
-		push: function(nid, uids, callback) {
+	
+	Notifications.push = function(nid, uids, callback) {
 		if (!Array.isArray(uids)) uids = [uids];
 
 		var numUids = uids.length,
 			x;
 
-			notifications.get(nid, null, function(notif_data) {
+		Notifications.get(nid, null, function(notif_data) {
 			for (x = 0; x < numUids; x++) {
 				if (parseInt(uids[x], 10) > 0) {
 					(function(uid) {
-							notifications.remove_by_uniqueId(notif_data.uniqueId, uid, function() {
+						remove_by_uniqueId(notif_data.uniqueId, uid, function() {
 							RDB.zadd('uid:' + uid + ':notifications:unread', notif_data.datetime, nid);
 
-								global.io.sockets.in('uid_' + uid).emit('event:new_notification');
+							websockets.in('uid_' + uid).emit('event:new_notification');
-
-								// TODO: moving this require to the top of the file overwrites 'notifications' figure out why -baris
-								//require('./websockets').in('uid_' + uid).emit('event:new_notification');
 
 							if (callback) {
 								callback(true);
@@ -96,14 +101,15 @@ var RDB = require('./redis'),
 				}
 			}
 		});
-		},
+	};
-		remove_by_uniqueId: function(uniqueId, uid, callback) {
+	
+	function remove_by_uniqueId(uniqueId, uid, callback) {
 		async.parallel([
 			function(next) {
 				RDB.zrange('uid:' + uid + ':notifications:unread', 0, -1, function(err, nids) {
 					if (nids && nids.length > 0) {
 						async.each(nids, function(nid, next) {
-								notifications.get(nid, uid, function(nid_info) {
+							Notifications.get(nid, uid, function(nid_info) {
 								if (nid_info.uniqueId === uniqueId) {
 									RDB.zrem('uid:' + uid + ':notifications:unread', nid);
 								}
@@ -122,7 +128,7 @@ var RDB = require('./redis'),
 				RDB.zrange('uid:' + uid + ':notifications:read', 0, -1, function(err, nids) {
 					if (nids && nids.length > 0) {
 						async.each(nids, function(nid, next) {
-								notifications.get(nid, uid, function(nid_info) {
+							Notifications.get(nid, uid, function(nid_info) {
 								if (nid_info && nid_info.uniqueId === uniqueId) {
 									RDB.zrem('uid:' + uid + ':notifications:read', nid);
 								}
@@ -142,10 +148,11 @@ var RDB = require('./redis'),
 				callback(true);
 			}
 		});
-		},
+	}
-		mark_read: function(nid, uid, callback) {
+		
+	Notifications.mark_read = function(nid, uid, callback) {
 			if (parseInt(uid) > 0) {
-				notifications.get(nid, uid, function(notif_data) {
+				Notifications.get(nid, uid, function(notif_data) {
 					RDB.zrem('uid:' + uid + ':notifications:unread', nid);
 					RDB.zadd('uid:' + uid + ':notifications:read', notif_data.datetime, nid);
 					if (callback) {
@@ -153,14 +160,15 @@ var RDB = require('./redis'),
 					}
 				});
 			}
-		},
+		}
-		mark_read_multiple: function(nids, uid, callback) {
+		
+	Notifications.mark_read_multiple = function(nids, uid, callback) {
 		if (!Array.isArray(nids) && parseInt(nids, 10) > 0) {
 			nids = [nids];
 		}
 
 		async.each(nids, function(nid, next) {
-				notifications.mark_read(nid, uid, function(err) {
+			Notifications.mark_read(nid, uid, function(err) {
 				if (!err) {
 					next(null);
 				}
@@ -170,23 +178,25 @@ var RDB = require('./redis'),
 				callback(err);
 			}
 		});
-		},
+	};
-		mark_all_read: function(uid, callback) {
+		
+	Notifications.mark_all_read = function(uid, callback) {
 		RDB.zrange('uid:' + uid + ':notifications:unread', 0, 10, function(err, nids) {
 			if (err) {
 				return callback(err);
 			}
 
 			if (nids.length > 0) {
-					notifications.mark_read_multiple(nids, uid, function(err) {
+				Notifications.mark_read_multiple(nids, uid, function(err) {
 					callback(err);
 				});
 			} else {
 				callback();
 			}
 		});
-		},
+	};
-		prune: function(cutoff) {
+	
+	Notifications.prune = function(cutoff) {
 		if (process.env.NODE_ENV === 'development') {
 			winston.info('[notifications.prune] Removing expired notifications from the database.');
 		}
@@ -240,7 +250,7 @@ var RDB = require('./redis'),
 							});
 
 						if (expired) {
-								notifications.destroy(nid);
+							destroy(nid);
 							numPruned++;
 						}
 
@@ -258,16 +268,7 @@ var RDB = require('./redis'),
 				}
 			}
 		});
-
-		}
 	};
 	
-module.exports = {
+}(exports));
-	init: notifications.init,
+
-	get: notifications.get,
-	create: notifications.create,
-	push: notifications.push,
-	mark_read: notifications.mark_read_multiple,
-	mark_all_read: notifications.mark_all_read,
-	prune: notifications.prune
-};

src/postTools.js

@@ -1,8 +1,9 @@
-var RDB = require('./redis.js'),
+var RDB = require('./redis'),
-	posts = require('./posts.js'),
+	posts = require('./posts'),
 	topics = require('./topics'),
-	threadTools = require('./threadTools.js'),
+	threadTools = require('./threadTools'),
-	user = require('./user.js'),
+	user = require('./user'),
+	websockets = require('./websockets'),
 	async = require('async'),
 	nconf = require('nconf'),
 	validator = require('validator'),
@@ -13,7 +14,7 @@ var RDB = require('./redis.js'),
 	postSearch = reds.createSearch('nodebbpostsearch'),
 	topicSearch = reds.createSearch('nodebbtopicsearch'),
 	winston = require('winston'),
-	meta = require('./meta.js'),
+	meta = require('./meta'),
 	Feed = require('./feed');
 
 (function(PostTools) {
@@ -107,7 +108,7 @@ var RDB = require('./redis.js'),
 					PostTools.parse(content, next);
 				}
 			], function(err, results) {
-				io.sockets.in('topic_' + results[0].tid).emit('event:post_edited', {
+				websockets.in('topic_' + results[0].tid).emit('event:post_edited', {
 					pid: pid,
 					title: validator.sanitize(title).escape(),
 					isMainPost: results[0].isMainPost,

src/posts.js

@@ -170,15 +170,6 @@ var RDB = require('./redis.js'),
 						if(err) {
 							return next(err);
 						}
-
-						var socketData = {
-							posts: [postData]
-						};
-
-						io.sockets.in('topic_' + tid).emit('event:new_post', socketData);
-						io.sockets.in('recent_posts').emit('event:new_post', socketData);
-						io.sockets.in('user/' + uid).emit('event:new_post', socketData);
-
 						next();
 					});
 				}
@@ -187,7 +178,7 @@ var RDB = require('./redis.js'),
 					return callback(err, null);
 				}
 
-				callback(null, 'Reply successful');
+				callback(null, postData);
 			});
 		});
 	}
@@ -485,19 +476,6 @@ var RDB = require('./redis.js'),
 		});
 	}
 
-	Posts.getTopicPostStats = function() {
-		RDB.mget(['totaltopiccount', 'totalpostcount'], function(err, data) {
-			if (err === null) {
-				var stats = {
-					topics: data[0] ? data[0] : 0,
-					posts: data[1] ? data[1] : 0
-				};
-
-				io.sockets.emit('post.stats', stats);
-			} else
-				console.log(err);
-		});
-	}
 
 	Posts.reIndexPids = function(pids, callback) {
 

src/threadTools.js

@@ -9,7 +9,8 @@ var RDB = require('./redis.js'),
 	topicSearch = reds.createSearch('nodebbtopicsearch'),
 	winston = require('winston'),
 	meta = require('./meta'),
-	nconf = require('nconf');
+	nconf = require('nconf'),
+	websockets = require('./websockets');
 
 (function(ThreadTools) {
 
@@ -51,7 +52,7 @@ var RDB = require('./redis.js'),
 		topics.setTopicField(tid, 'locked', 1);
 
 		if (socket) {
-			io.sockets.in('topic_' + tid).emit('event:topic_locked', {
+			websockets.in('topic_' + tid).emit('event:topic_locked', {
 				tid: tid,
 				status: 'ok'
 			});
@@ -69,7 +70,7 @@ var RDB = require('./redis.js'),
 		topics.setTopicField(tid, 'locked', 0);
 
 		if (socket) {
-			io.sockets.in('topic_' + tid).emit('event:topic_unlocked', {
+			websockets.in('topic_' + tid).emit('event:topic_unlocked', {
 				tid: tid,
 				status: 'ok'
 			});
@@ -92,7 +93,7 @@ var RDB = require('./redis.js'),
 
 		topicSearch.remove(tid);
 
-		io.sockets.in('topic_' + tid).emit('event:topic_deleted', {
+		websockets.in('topic_' + tid).emit('event:topic_deleted', {
 			tid: tid,
 			status: 'ok'
 		});
@@ -107,7 +108,7 @@ var RDB = require('./redis.js'),
 		RDB.incr('totaltopiccount');
 		ThreadTools.unlock(tid);
 
-		io.sockets.in('topic_' + tid).emit('event:topic_restored', {
+		websockets.in('topic_' + tid).emit('event:topic_restored', {
 			tid: tid,
 			status: 'ok'
 		});
@@ -128,7 +129,7 @@ var RDB = require('./redis.js'),
 		});
 
 		if (socket) {
-			io.sockets.in('topic_' + tid).emit('event:topic_pinned', {
+			websockets.in('topic_' + tid).emit('event:topic_pinned', {
 				tid: tid,
 				status: 'ok'
 			});
@@ -148,7 +149,7 @@ var RDB = require('./redis.js'),
 			RDB.zadd('categories:' + topicData.cid + ':tid', topicData.lastposttime, tid);
 		});
 		if (socket) {
-			io.sockets.in('topic_' + tid).emit('event:topic_unpinned', {
+			websockets.in('topic_' + tid).emit('event:topic_unpinned', {
 				tid: tid,
 				status: 'ok'
 			});
@@ -196,7 +197,7 @@ var RDB = require('./redis.js'),
 						status: 'ok'
 					});
 
-					io.sockets.in('topic_' + tid).emit('event:topic_moved', {
+					websockets.in('topic_' + tid).emit('event:topic_moved', {
 						tid: tid
 					});
 				} else {

src/topics.js

@@ -675,11 +675,9 @@ var RDB = require('./redis.js'),
 		});
 
 		user.notifications.getUnreadByUniqueId(uid, 'topic:' + tid, function(err, nids) {
-			if (nids.length > 0) {
+			notifications.mark_read_multiple(nids, uid, function() {
-				async.each(nids, function(nid, next) {
+			
-					notifications.mark_read(nid, uid, next);
 			});
-			}
 		});
 	}
 

src/websockets.js

@@ -58,8 +58,6 @@ module.exports.isUserOnline = isUserOnline;
 
 module.exports.init = function(io) {
 
-	global.io = io;
-
 	io.sockets.on('connection', function(socket) {
 		var hs = socket.handshake,
 			sessionID, uid, lastPostTime = 0;
@@ -246,7 +244,7 @@ module.exports.init = function(io) {
 		});
 
 		socket.on('post.stats', function(data) {
-			posts.getTopicPostStats();
+			emitTopicPostStats();
 		});
 
 		socket.on('user.email.exists', function(data) {
@@ -384,7 +382,7 @@ module.exports.init = function(io) {
 						posts: result.postData
 					});
 
-					posts.getTopicPostStats();
+					emitTopicPostStats();
 
 					socket.emit('event:alert', {
 						title: 'Thank you for posting',
@@ -423,7 +421,7 @@ module.exports.init = function(io) {
 				return;
 			}
 
-			posts.reply(data.topic_id, uid, data.content, function(err, result) {
+			posts.reply(data.topic_id, uid, data.content, function(err, postData) {
 				if(err) {
 
 					if(err.message === 'content-too-short') {
@@ -441,9 +439,9 @@ module.exports.init = function(io) {
 					return;
 				}
 
-				if (result) {
+				if (postData) {
 					lastPostTime = Date.now();
-					posts.getTopicPostStats();
+					emitTopicPostStats();
 
 					socket.emit('event:alert', {
 						title: 'Reply Successful',
@@ -451,6 +449,12 @@ module.exports.init = function(io) {
 						type: 'success',
 						timeout: 2000
 					});
+					var socketData = {
+						posts: [postData]
+					};
+					io.sockets.in('topic_' + postData.tid).emit('event:new_post', socketData);
+					io.sockets.in('recent_posts').emit('event:new_post', socketData);
+					io.sockets.in('user/' + postData.uid).emit('event:new_post', socketData);
 
 				}
 
@@ -495,7 +499,7 @@ module.exports.init = function(io) {
 				if (privileges.editable) {
 					threadTools.delete(data.tid, function(err) {
 						if (!err) {
-							posts.getTopicPostStats();
+							emitTopicPostStats();
 							socket.emit('api:topic.delete', {
 								status: 'ok',
 								tid: data.tid
@@ -510,7 +514,7 @@ module.exports.init = function(io) {
 			threadTools.privileges(data.tid, uid, function(privileges) {
 				if (privileges.editable) {
 					threadTools.restore(data.tid, socket, function(err) {
-						posts.getTopicPostStats();
+						emitTopicPostStats();
 
 						socket.emit('api:topic.restore', {
 							status: 'ok',
@@ -597,11 +601,12 @@ module.exports.init = function(io) {
 
 		socket.on('api:posts.delete', function(data, callback) {
 			postTools.delete(uid, data.pid, function(err) {
+
 				if(err) {
 					return callback(err);
 				}
 
-				posts.getTopicPostStats();
+				emitTopicPostStats();
 
 				io.sockets.in('topic_' + data.tid).emit('event:post_deleted', {
 					pid: data.pid
@@ -616,7 +621,7 @@ module.exports.init = function(io) {
 					return callback(err);
 				}
 
-				posts.getTopicPostStats();
+				emitTopicPostStats();
 
 				io.sockets.in('topic_' + data.tid).emit('event:post_restored', {
 					pid: data.pid
@@ -636,9 +641,10 @@ module.exports.init = function(io) {
 		});
 
 		socket.on('api:notifications.mark_all_read', function(data, callback) {
-			console.log(notifications);
+			notifications.mark_all_read(uid, function(err) {
-			require('./notifications').mark_all_read(uid, function(err) {
+				if (!err) {
-				if (!err) callback();
+					callback();
+				}
 			});
 		});
 
@@ -1011,6 +1017,22 @@ module.exports.init = function(io) {
 		socket.on('api:admin.theme.set', meta.themes.set);
 	});
 
+
+	function emitTopicPostStats() {
+		RDB.mget(['totaltopiccount', 'totalpostcount'], function(err, data) {
+			if (err) {
+				return winston.err(err);
+			}
+
+			var stats = {
+				topics: data[0] ? data[0] : 0,
+				posts: data[1] ? data[1] : 0
+			};
+
+			io.sockets.emit('post.stats', stats);
+		});
+	}
+
 	module.exports.emitUserCount = function() {
 		RDB.get('usercount', function(err, count) {
 			io.sockets.emit('user.count', {