more refactors

src/topics/data.js

@@ -0,0 +1,78 @@
+'use strict';
+
+var async = require('async');
+var validator = require('validator');
+
+var db = require('../database');
+var categories = require('../categories');
+var utils = require('../../public/src/utils');
+
+module.exports = function(Topics) {
+
+	Topics.getTopicField = function(tid, field, callback) {
+		db.getObjectField('topic:' + tid, field, callback);
+	};
+
+	Topics.getTopicFields = function(tid, fields, callback) {
+		db.getObjectFields('topic:' + tid, fields, callback);
+	};
+
+	Topics.getTopicsFields = function(tids, fields, callback) {
+		if (!Array.isArray(tids) || !tids.length) {
+			return callback(null, []);
+		}
+		var keys = tids.map(function(tid) {
+			return 'topic:' + tid;
+		});
+		db.getObjectsFields(keys, fields, callback);
+	};
+
+	Topics.getTopicData = function(tid, callback) {
+		db.getObject('topic:' + tid, function(err, topic) {
+			if (err || !topic) {
+				return callback(err);
+			}
+			modifyTopic(topic, callback);
+		});
+	};
+
+	Topics.getTopicsData = function(tids, callback) {
+		var keys = [];
+
+		for (var i=0; i<tids.length; ++i) {
+			keys.push('topic:' + tids[i]);
+		}
+
+		db.getObjects(keys, function(err, topics) {
+			if (err) {
+				return callback(err);
+			}
+			async.map(topics, modifyTopic, callback);
+		});
+	};
+
+	function modifyTopic(topic, callback) {
+		if (!topic) {
+			return callback(null, topic);
+		}
+		topic.title = validator.escape(topic.title);
+		topic.relativeTime = utils.toISOString(topic.timestamp);
+		topic.lastposttimeISO = utils.toISOString(topic.lastposttime);
+		callback(null, topic);
+	}
+
+	Topics.getCategoryData = function(tid, callback) {
+		Topics.getTopicField(tid, 'cid', function(err, cid) {
+			if (err) {
+				return callback(err);
+			}
+
+			categories.getCategoryData(cid, callback);
+		});
+	};
+
+	Topics.setTopicField = function(tid, field, value, callback) {
+		db.setObjectField('topic:' + tid, field, value, callback);
+	};
+
+};

src/topics/posts.js

@@ -99,7 +99,7 @@ module.exports = function(Topics) {
 					}
 				}
 
-				user.getMultipleUserFields(editors, ['uid', 'username', 'userslug'], function(err, editors) {
+				user.getUsersFields(editors, ['uid', 'username', 'userslug'], function(err, editors) {
 					if (err) {
 						return next(err);
 					}

src/topics/teaser.js

@@ -44,7 +44,7 @@ module.exports = function(Topics) {
 					return array.indexOf(uid) === index;
 				});
 
-				user.getMultipleUserFields(uids, ['uid', 'username', 'userslug', 'picture'], next);
+				user.getUsersFields(uids, ['uid', 'username', 'userslug', 'picture'], next);
 			},
 			function(usersData, next) {
 				var users = {};