topics data refactor

src/database/mongo/hash.js

@@ -108,7 +108,11 @@ module.exports = function (db, module) {
 			return getFromCache();
 		}
 
-		db.collection('objects').find({ _key: { $in: nonCachedKeys } }, { projection: { _id: 0 } }).toArray(function (err, data) {
+		var query = { _key: { $in: nonCachedKeys } };
+		if (nonCachedKeys.length === 1) {
+			query._key = nonCachedKeys[0];
+		}
+		db.collection('objects').find(query, { projection: { _id: 0 } }).toArray(function (err, data) {
 			if (err) {
 				return callback(err);
 			}

src/notifications.js

@@ -133,8 +133,8 @@ Notifications.findRelated = function (mergeIds, set, callback) {
 			db.getObjectsFields(keys, ['mergeId'], next);
 		},
 		function (sets, next) {
-			sets = sets.map(set => set.mergeId);
+			sets = sets.map(set => String(set.mergeId));
-			var mergeSet = new Set(mergeIds);
+			var mergeSet = new Set(mergeIds.map(id => String(id)));
 			next(null, nids.filter((nid, idx) => mergeSet.has(sets[idx])));
 		},
 	], callback);

src/topics/data.js

@@ -8,52 +8,14 @@ var categories = require('../categories');
 var utils = require('../utils');
 var translator = require('../translator');
 
-function escapeTitle(topicData) {
+const intFields = ['tid', 'cid', 'uid', 'mainPid', 'deleted', 'locked', 'pinned'];
-	if (!topicData) {
-		return;
-	}
-	if (topicData.title) {
-		topicData.title = translator.escape(validator.escape(topicData.title.toString()));
-	}
-	if (topicData.titleRaw) {
-		topicData.titleRaw = translator.escape(topicData.titleRaw);
-	}
-}
 
 module.exports = function (Topics) {
-	Topics.getTopicField = function (tid, field, callback) {
-		async.waterfall([
-			function (next) {
-				db.getObjectField('topic:' + tid, field, next);
-			},
-			function (value, next) {
-				if (field === 'title') {
-					value = translator.escape(validator.escape(String(value)));
-				}
-				next(null, value);
-			},
-		], callback);
-	};
-
-	Topics.getTopicFields = function (tid, fields, callback) {
-		async.waterfall([
-			function (next) {
-				db.getObjectFields('topic:' + tid, fields, next);
-			},
-			function (topic, next) {
-				escapeTitle(topic);
-				next(null, topic);
-			},
-		], callback);
-	};
-
 	Topics.getTopicsFields = function (tids, fields, callback) {
 		if (!Array.isArray(tids) || !tids.length) {
 			return callback(null, []);
 		}
-		var keys = tids.map(function (tid) {
+		var keys = tids.map(tid => 'topic:' + tid);
-			return 'topic:' + tid;
-		});
 		async.waterfall([
 			function (next) {
 				if (fields.length) {
@@ -69,35 +31,82 @@ module.exports = function (Topics) {
 		], callback);
 	};
 
+	Topics.getTopicField = function (tid, field, callback) {
+		Topics.getTopicFields(tid, [field], function (err, topic) {
+			callback(err, topic ? topic[field] : null);
+		});
+	};
+
+	Topics.getTopicFields = function (tid, fields, callback) {
+		Topics.getTopicsFields([tid], fields, function (err, topics) {
+			callback(err, topics ? topics[0] : null);
+		});
+	};
+
 	Topics.getTopicData = function (tid, callback) {
+		Topics.getTopicsFields([tid], [], function (err, topics) {
+			callback(err, topics && topics.length ? topics[0] : null);
+		});
+	};
+
+	Topics.getTopicsData = function (tids, callback) {
+		Topics.getTopicsFields(tids, [], callback);
+	};
+
+	Topics.getCategoryData = function (tid, callback) {
 		async.waterfall([
 			function (next) {
-				db.getObject('topic:' + tid, next);
+				Topics.getTopicField(tid, 'cid', next);
 			},
-			function (topic, next) {
+			function (cid, next) {
-				if (!topic) {
+				categories.getCategoryData(cid, next);
-					return next(null, null);
-				}
-				modifyTopic(topic);
-				next(null, topic);
 			},
 		], callback);
 	};
 
-	Topics.getTopicsData = function (tids, callback) {
+	Topics.setTopicField = function (tid, field, value, callback) {
-		Topics.getTopicsFields(tids, [], callback);
+		db.setObjectField('topic:' + tid, field, value, callback);
 	};
 
-	function modifyTopic(topic) {
+	Topics.setTopicFields = function (tid, data, callback) {
+		callback = callback || function () {};
+		db.setObject('topic:' + tid, data, callback);
+	};
+
+	Topics.deleteTopicField = function (tid, field, callback) {
+		db.deleteObjectField('topic:' + tid, field, callback);
+	};
+
+	Topics.deleteTopicFields = function (tid, fields, callback) {
+		db.deleteObjectFields('topic:' + tid, fields, callback);
+	};
+};
+
+function escapeTitle(topicData) {
+	if (topicData) {
+		if (topicData.title) {
+			topicData.title = translator.escape(validator.escape(topicData.title.toString()));
+		}
+		if (topicData.titleRaw) {
+			topicData.titleRaw = translator.escape(topicData.titleRaw);
+		}
+	}
+}
+
+function modifyTopic(topic) {
 	if (!topic) {
 		return;
 	}
+
+	intFields.forEach(field => parseIntField(topic, field));
+
 	if (topic.hasOwnProperty('title')) {
 		topic.titleRaw = topic.title;
 		topic.title = String(topic.title);
 	}
 
 	escapeTitle(topic);
+
 	if (topic.hasOwnProperty('timestamp')) {
 		topic.timestampISO = utils.toISOString(topic.timestamp);
 	}
@@ -114,33 +123,10 @@ module.exports = function (Topics) {
 	if (topic.hasOwnProperty('upvotes') && topic.hasOwnProperty('downvotes')) {
 		topic.votes = topic.upvotes - topic.downvotes;
 	}
-	}
+}
-
-	Topics.getCategoryData = function (tid, callback) {
-		async.waterfall([
-			function (next) {
-				Topics.getTopicField(tid, 'cid', next);
-			},
-			function (cid, next) {
-				categories.getCategoryData(cid, next);
-			},
-		], callback);
-	};
-
-	Topics.setTopicField = function (tid, field, value, callback) {
-		db.setObjectField('topic:' + tid, field, value, callback);
-	};
-
-	Topics.setTopicFields = function (tid, data, callback) {
-		callback = callback || function () {};
-		db.setObject('topic:' + tid, data, callback);
-	};
-
-	Topics.deleteTopicField = function (tid, field, callback) {
-		db.deleteObjectField('topic:' + tid, field, callback);
-	};
 
-	Topics.deleteTopicFields = function (tid, fields, callback) {
+function parseIntField(topic, field) {
-		db.deleteObjectFields('topic:' + tid, fields, callback);
+	if (topic.hasOwnProperty(field)) {
-	};
+		topic[field] = parseInt(topic[field], 10);
-};
+	}
+}

src/user/categories.js

@@ -26,7 +26,7 @@ module.exports = function (User) {
 				const ignored = new Set(results.ignored);
 
 				var watched = results.all.filter(function (cid) {
-					return cid && !ignored.has(cid);
+					return cid && !ignored.has(String(cid));
 				});
 				next(null, watched);
 			},

src/user/data.js

@@ -113,25 +113,23 @@ module.exports = function (User) {
 	};
 
 	function uidsToUsers(uids, uniqueUids, usersData) {
-		var ref = uniqueUids.reduce(function (memo, cur, idx) {
+		var uidToUser = uniqueUids.reduce(function (memo, cur, idx) {
-			memo[cur] = idx;
+			memo[cur] = usersData[idx];
 			return memo;
 		}, {});
 		var users = uids.map(function (uid) {
-			const returnPayload = usersData[ref[uid]];
+			const returnPayload = uidToUser[uid];
 			if (uid > 0 && !returnPayload.uid) {
 				returnPayload.oldUid = parseInt(uid, 10);
 			}
 
-			return usersData[ref[uid]];
+			return returnPayload;
 		});
 		return users;
 	}
 
 	function uidsToUserKeys(uids) {
-		return uids.map(function (uid) {
+		return uids.map(uid => 'user:' + uid);
-			return 'user:' + uid;
-		});
 	}
 
 	function modifyUserData(users, fieldsToRemove, callback) {