uid fixes

src/groups/membership.js

@@ -352,14 +352,14 @@ module.exports = function (Groups) {
 	};
 
 	Groups.isInvited = function (uid, groupName, callback) {
-		if (!uid) {
+		if (uid <= 0) {
 			return setImmediate(callback, null, false);
 		}
 		db.isSetMember('group:' + groupName + ':invited', uid, callback);
 	};
 
 	Groups.isPending = function (uid, groupName, callback) {
-		if (!uid) {
+		if (uid <= 0) {
 			return setImmediate(callback, null, false);
 		}
 		db.isSetMember('group:' + groupName + ':pending', uid, callback);

src/groups/ownership.js

@@ -8,15 +8,15 @@ module.exports = function (Groups) {
 	Groups.ownership = {};
 
 	Groups.ownership.isOwner = function (uid, groupName, callback) {
-		if (!uid) {
-			return callback(null, false);
+		if (uid <= 0) {
+			return setImmediate(callback, null, false);
 		}
 		db.isSetMember('group:' + groupName + ':owners', uid, callback);
 	};
 
 	Groups.ownership.isOwners = function (uids, groupName, callback) {
 		if (!Array.isArray(uids)) {
-			return callback(null, []);
+			return setImmediate(callback, null, []);
 		}
 
 		db.isSetMembers('group:' + groupName + ':owners', uids, callback);

src/messaging/create.js

@@ -116,9 +116,7 @@ module.exports = function (Messaging) {
 		if (!uids.length) {
 			return callback();
 		}
-		var keys = uids.map(function (uid) {
-			return 'uid:' + uid + ':chat:rooms';
-		});
+		const keys = uids.map(uid => 'uid:' + uid + ':chat:rooms');
 		db.sortedSetsAdd(keys, timestamp, roomId, callback);
 	};
 
@@ -126,9 +124,7 @@ module.exports = function (Messaging) {
 		if (!uids.length) {
 			return callback();
 		}
-		var keys = uids.map(function (uid) {
-			return 'uid:' + uid + ':chat:room:' + roomId + ':mids';
-		});
+		const keys = uids.map(uid => 'uid:' + uid + ':chat:room:' + roomId + ':mids');
 		db.sortedSetsAdd(keys, timestamp, mid, callback);
 	};
 };

src/messaging/index.js

@@ -249,7 +249,7 @@ Messaging.getTeaser = function (uid, roomId, callback) {
 };
 
 Messaging.canMessageUser = function (uid, toUid, callback) {
-	if (meta.config.disableChat || !uid || uid === toUid) {
+	if (meta.config.disableChat || uid <= 0 || uid === toUid) {
 		return callback(new Error('[[error:chat-disabled]]'));
 	}
 
@@ -299,7 +299,7 @@ Messaging.canMessageUser = function (uid, toUid, callback) {
 };
 
 Messaging.canMessageRoom = function (uid, roomId, callback) {
-	if (meta.config.disableChat || !uid) {
+	if (meta.config.disableChat || uid <= 0) {
 		return callback(new Error('[[error:chat-disabled]]'));
 	}
 

src/middleware/user.js

@@ -135,7 +135,7 @@ module.exports = function (middleware) {
 
 	middleware.redirectUidToUserslug = function (req, res, next) {
 		var uid = parseInt(req.params.uid, 10);
-		if (!uid) {
+		if (uid <= 0) {
 			return next();
 		}
 		async.waterfall([

src/posts/user.js

@@ -121,24 +121,22 @@ module.exports = function (Posts) {
 	Posts.isOwner = function (pid, uid, callback) {
 		uid = parseInt(uid, 10);
 		if (Array.isArray(pid)) {
-			if (!uid) {
-				return callback(null, pid.map(function () { return false; }));
+			if (uid <= 0) {
+				return setImmediate(callback, null, pid.map(() => false));
 			}
 			Posts.getPostsFields(pid, ['uid'], function (err, posts) {
 				if (err) {
 					return callback(err);
 				}
-				posts = posts.map(function (post) {
-					return post && parseInt(post.uid, 10) === uid;
-				});
+				posts = posts.map(post => post && post.uid === uid);
 				callback(null, posts);
 			});
 		} else {
-			if (!uid) {
-				return callback(null, false);
+			if (uid <= 0) {
+				return setImmediate(callback, null, false);
 			}
 			Posts.getPostField(pid, 'uid', function (err, author) {
-				callback(err, parseInt(author, 10) === uid);
+				callback(err, author === uid);
 			});
 		}
 	};

src/posts/votes.js

@@ -217,7 +217,7 @@ module.exports = function (Posts) {
 	function vote(type, unvote, pid, uid, callback) {
 		uid = parseInt(uid, 10);
 
-		if (!uid) {
+		if (uid <= 0) {
 			return callback(new Error('[[error:not-logged-in]]'));
 		}
 		var postData;

src/routes/feeds.js

@@ -46,7 +46,7 @@ function validateTokenIfRequiresLogin(requiresLogin, cid, req, res, callback) {
 		return callback();
 	}
 
-	if (!uid || !token) {
+	if (uid <= 0 || !token) {
 		return helpers.notAllowed(req, res);
 	}
 

src/socket.io/modules.js

@@ -381,7 +381,7 @@ SocketModules.chats.getRecentChats = function (socket, data, callback) {
 };
 
 SocketModules.chats.hasPrivateChat = function (socket, uid, callback) {
-	if (!socket.uid || !uid) {
+	if (socket.uid <= 0 || uid <= 0) {
 		return callback(new Error('[[error:invalid-data]]'));
 	}
 	Messaging.hasPrivateChat(socket.uid, uid, callback);

src/socket.io/topics/unread.js

@@ -7,7 +7,7 @@ var topics = require('../../topics');
 
 module.exports = function (SocketTopics) {
 	SocketTopics.markAsRead = function (socket, tids, callback) {
-		if (!Array.isArray(tids) || !socket.uid) {
+		if (!Array.isArray(tids) || socket.uid <= 0) {
 			return callback(new Error('[[error:invalid-data]]'));
 		}
 		async.waterfall([
@@ -33,7 +33,7 @@ module.exports = function (SocketTopics) {
 	};
 
 	SocketTopics.markAllRead = function (socket, data, callback) {
-		if (!socket.uid) {
+		if (socket.uid <= 0) {
 			return callback(new Error('[[error:invalid-uid]]'));
 		}
 		async.waterfall([
@@ -59,7 +59,7 @@ module.exports = function (SocketTopics) {
 	};
 
 	SocketTopics.markUnread = function (socket, tid, callback) {
-		if (!tid || !socket.uid) {
+		if (!tid || socket.uid <= 0) {
 			return callback(new Error('[[error:invalid-data]]'));
 		}
 		async.waterfall([
@@ -78,7 +78,7 @@ module.exports = function (SocketTopics) {
 			return callback(new Error('[[error:invalid-tid]]'));
 		}
 
-		if (!socket.uid) {
+		if (socket.uid <= 0) {
 			return callback(new Error('[[error:no-privileges]]'));
 		}
 

src/socket.io/user/status.js

@@ -21,7 +21,7 @@ module.exports = function (SocketUser) {
 	};
 
 	SocketUser.setStatus = function (socket, status, callback) {
-		if (!socket.uid) {
+		if (socket.uid <= 0) {
 			return callback(new Error('[[error:invalid-uid]]'));
 		}
 

src/topics/unread.js

@@ -310,7 +310,7 @@ module.exports = function (Topics) {
 	Topics.pushUnreadCount = function (uid, callback) {
 		callback = callback || function () {};
 
-		if (!uid || parseInt(uid, 10) === 0) {
+		if (!uid || parseInt(uid, 10) <= 0) {
 			return setImmediate(callback);
 		}
 

src/topics/user.js

@@ -5,11 +5,11 @@ var db = require('../database');
 module.exports = function (Topics) {
 	Topics.isOwner = function (tid, uid, callback) {
 		uid = parseInt(uid, 10);
-		if (!uid) {
-			return callback(null, false);
+		if (uid <= 0) {
+			return setImmediate(callback, null, false);
 		}
 		Topics.getTopicField(tid, 'uid', function (err, author) {
-			callback(err, parseInt(author, 10) === uid);
+			callback(err, author === uid);
 		});
 	};
 

src/user/categories.js

@@ -34,8 +34,8 @@ module.exports = function (User) {
 	};
 
 	User.ignoreCategory = function (uid, cid, callback) {
-		if (!uid) {
-			return callback();
+		if (uid <= 0) {
+			return setImmediate(callback);
 		}
 
 		async.waterfall([
@@ -55,7 +55,7 @@ module.exports = function (User) {
 	};
 
 	User.watchCategory = function (uid, cid, callback) {
-		if (!uid) {
+		if (uid <= 0) {
 			return callback();
 		}
 

src/user/data.js

@@ -35,7 +35,7 @@ module.exports = function (User) {
 
 	User.getUsersFields = function (uids, fields, callback) {
 		if (!Array.isArray(uids) || !uids.length) {
-			return callback(null, []);
+			return setImmediate(callback, null, []);
 		}
 
 		uids = uids.map(uid => (isNaN(uid) ? 0 : uid));

src/user/profile.js

@@ -310,7 +310,7 @@ module.exports = function (User) {
 	}
 
 	User.changePassword = function (uid, data, callback) {
-		if (!uid || !data || !data.uid) {
+		if (uid <= 0 || !data || !data.uid) {
 			return callback(new Error('[[error:invalid-uid]]'));
 		}