+
diff --git a/src/categories.js b/src/categories.js
index b511ede803..33912387f3 100644
--- a/src/categories.js
+++ b/src/categories.js
@@ -138,9 +138,7 @@ var db = require('./database.js'),
db.getSortedSetRevRange('categories:' + cid + ':tid', start, stop, callback);
};
- Categories.getActiveUsers = function(cid, callback) {
- db.getSetMembers('cid:' + cid + ':active_users', callback);
- };
+
Categories.getAllCategories = function(current_user, callback) {
db.getListRange('categories:cid', 0, -1, function(err, cids) {
@@ -217,6 +215,10 @@ var db = require('./database.js'),
};
Categories.getRecentReplies = function(cid, count, callback) {
+ if(count === 0) {
+ return callback(null, []);
+ }
+
db.getSortedSetRevRange('categories:recent_posts:cid:' + cid, 0, count - 1, function(err, pids) {
if (err) {
@@ -264,25 +266,7 @@ var db = require('./database.js'),
});
};
- Categories.moveActiveUsers = function(tid, oldCid, cid, callback) {
- function updateUser(uid) {
- Categories.addActiveUser(cid, uid);
- Categories.isUserActiveIn(oldCid, uid, function(err, active) {
- if (!err && !active) {
- Categories.removeActiveUser(oldCid, uid);
- }
- });
- }
-
- topics.getUids(tid, function(err, uids) {
- if (!err && uids) {
- for (var i = 0; i < uids.length; ++i) {
- updateUser(uids[i]);
- }
- }
- });
- };
Categories.getCategoryData = function(cid, callback) {
db.exists('category:' + cid, function(err, exists) {
@@ -391,14 +375,38 @@ var db = require('./database.js'),
});
};
- Categories.addActiveUser = function(cid, uid) {
+ Categories.addActiveUser = function(cid, uid, timestamp) {
if(parseInt(uid, 10)) {
- db.setAdd('cid:' + cid + ':active_users', uid);
+ db.sortedSetAdd('cid:' + cid + ':active_users', timestamp, uid);
}
};
Categories.removeActiveUser = function(cid, uid) {
- db.setRemove('cid:' + cid + ':active_users', uid);
+ db.sortedSetRemove('cid:' + cid + ':active_users', uid);
+ };
+
+ Categories.getActiveUsers = function(cid, callback) {
+ db.getSortedSetRevRange('cid:' + cid + ':active_users', 0, 15, callback);
+ };
+
+ Categories.moveActiveUsers = function(tid, oldCid, cid, callback) {
+ function updateUser(uid) {
+ Categories.addActiveUser(cid, uid);
+ Categories.isUserActiveIn(oldCid, uid, function(err, active) {
+
+ if (!err && !active) {
+ Categories.removeActiveUser(oldCid, uid);
+ }
+ });
+ }
+
+ topics.getUids(tid, function(err, uids) {
+ if (!err && uids) {
+ for (var i = 0; i < uids.length; ++i) {
+ updateUser(uids[i]);
+ }
+ }
+ });
};
Categories.onNewPostMade = function(uid, tid, pid, timestamp) {
@@ -412,13 +420,7 @@ var db = require('./database.js'),
db.sortedSetAdd('categories:' + cid + ':tid', timestamp, tid);
}
- db.setCount('cid:' + cid + ':active_users', function(err, amount) {
- if (amount > 15) {
- db.setRemoveRandom('cid:' + cid + ':active_users');
- }
-
- Categories.addActiveUser(cid, uid);
- });
+ Categories.addActiveUser(cid, uid, timestamp);
});
}
diff --git a/src/database/mongo.js b/src/database/mongo.js
index fceb39d00f..28fc911096 100644
--- a/src/database/mongo.js
+++ b/src/database/mongo.js
@@ -738,6 +738,21 @@
});
}
+ module.listRemoveAll = function(key, value, callback) {
+ db.collection('objects').update({_key: key }, { $pull: { array: value } }, function(err, result) {
+ if(err) {
+ if(callback) {
+ return callback(err);
+ }
+ return;
+ }
+
+ if(callback) {
+ callback(null, result);
+ }
+ });
+ }
+
module.getListRange = function(key, start, stop, callback) {
if(stop === -1) {
diff --git a/src/database/redis.js b/src/database/redis.js
index a298980fef..f6291f6fbd 100644
--- a/src/database/redis.js
+++ b/src/database/redis.js
@@ -402,6 +402,10 @@
redisClient.rpop(key, callback);
}
+ module.listRemoveAll = function(key, value, callback) {
+ redisClient.lrem(key, 0, value, callback);
+ }
+
module.getListRange = function(key, start, stop, callback) {
redisClient.lrange(key, start, stop, callback);
}
diff --git a/src/install.js b/src/install.js
index e5c64156a4..ddf74e2f55 100644
--- a/src/install.js
+++ b/src/install.js
@@ -134,6 +134,11 @@ var async = require('async'),
return next(new Error('unknown database : ' + config.database));
}
+ var allQuestions = install.redisQuestions.concat(install.mongoQuestions);
+ for(var x=0;x
2 ? 2 : posts.length;
+ category.post_count = posts.length > 2 ? 2 : posts.length; // this was a hack to make metro work back in the day, post_count should just = length
callback(null);
});
}
diff --git a/src/topics.js b/src/topics.js
index 751086ae68..bf4dd48979 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -23,6 +23,50 @@ var async = require('async'),
(function(Topics) {
+ Topics.create = function(uid, title, cid, callback) {
+ db.incrObjectField('global', 'nextTid', function(err, tid) {
+ if(err) {
+ return callback(err);
+ }
+
+ db.setAdd('topics:tid', tid);
+
+ var slug = tid + '/' + utils.slugify(title),
+ timestamp = Date.now();
+
+ db.setObject('topic:' + tid, {
+ 'tid': tid,
+ 'uid': uid,
+ 'cid': cid,
+ 'title': title,
+ 'slug': slug,
+ 'timestamp': timestamp,
+ 'lastposttime': 0,
+ 'postcount': 0,
+ 'viewcount': 0,
+ 'locked': 0,
+ 'deleted': 0,
+ 'pinned': 0
+ }, function(err) {
+ if(err) {
+ return callback(err);
+ }
+ db.searchIndex('topic', title, tid);
+
+ user.addTopicIdToUser(uid, tid);
+
+ // in future it may be possible to add topics to several categories, so leaving the door open here.
+ db.sortedSetAdd('categories:' + cid + ':tid', timestamp, tid);
+ db.incrObjectField('category:' + cid, 'topic_count');
+ db.incrObjectField('global', 'topicCount');
+
+ feed.updateCategory(cid);
+
+ callback(null, tid);
+ });
+ });
+ };
+
Topics.post = function(uid, title, content, cid, callback) {
categoryTools.privileges(cid, uid, function(err, privileges) {
@@ -61,41 +105,11 @@ var async = require('async'),
return callback(new Error('too-many-posts'), null);
}
- db.incrObjectField('global', 'nextTid', function(err, tid) {
+ Topics.create(uid, title, cid, function(err, tid) {
if(err) {
return callback(err);
}
- db.setAdd('topics:tid', tid);
-
- var slug = tid + '/' + utils.slugify(title);
- var timestamp = Date.now();
- db.setObject('topic:' + tid, {
- 'tid': tid,
- 'uid': uid,
- 'cid': cid,
- 'title': title,
- 'slug': slug,
- 'timestamp': timestamp,
- 'lastposttime': 0,
- 'postcount': 0,
- 'viewcount': 0,
- 'locked': 0,
- 'deleted': 0,
- 'pinned': 0
- });
-
- db.searchIndex('topic', title, tid);
-
- user.addTopicIdToUser(uid, tid);
-
- // in future it may be possible to add topics to several categories, so leaving the door open here.
- db.sortedSetAdd('categories:' + cid + ':tid', timestamp, tid);
- db.incrObjectField('category:' + cid, 'topic_count');
- db.incrObjectField('global', 'topicCount');
-
- feed.updateCategory(cid);
-
Topics.reply(tid, uid, content, function(err, postData) {
if(err) {
return callback(err, null);
@@ -184,6 +198,40 @@ var async = require('async'),
});
}
+ Topics.createTopicFromPost = function(pid, callback) {
+ posts.getPostData(pid, function(err, postData) {
+ if(err) {
+ return callback(err);
+ }
+
+ posts.getCidByPid(pid, function(err, cid) {
+ if(err) {
+ return callback(err);
+ }
+
+ // TODO : title should be given by client
+ var title = postData.content.substr(0, 20);
+
+ Topics.create(postData.uid, title, cid, function(err, tid) {
+ if(err) {
+ return callback(err);
+ }
+
+ Topics.removePostFromTopic(postData.tid, postData.pid);
+ Topics.decreasePostCount(postData.tid);
+
+ posts.setPostField(pid, 'tid', tid);
+
+ Topics.onNewPostMade(tid, postData.pid, postData.timestamp);
+
+ Topics.getTopicData(tid, function(err, topicData) {
+ callback(err, topicData);
+ });
+ });
+ });
+ });
+ }
+
Topics.getTopicData = function(tid, callback) {
db.getObject('topic:' + tid, function(err, data) {
if(err) {
@@ -916,6 +964,10 @@ var async = require('async'),
db.incrObjectField('topic:' + tid, 'postcount', callback);
}
+ Topics.decreasePostCount = function(tid, callback) {
+ db.decrObjectField('topic:' + tid, 'postcount', callback);
+ }
+
Topics.increaseViewCount = function(tid, callback) {
db.incrObjectField('topic:' + tid, 'viewcount', callback);
}
@@ -944,6 +996,10 @@ var async = require('async'),
db.listAppend('tid:' + tid + ':posts', pid);
}
+ Topics.removePostFromTopic = function(tid, pid) {
+ db.listRemoveAll('tid:' + tid + ':posts', pid);
+ }
+
Topics.getPids = function(tid, callback) {
db.getListRange('tid:' + tid + ':posts', 0, -1, callback);
}
diff --git a/src/upgrade.js b/src/upgrade.js
index bf70ec9348..0296344869 100644
--- a/src/upgrade.js
+++ b/src/upgrade.js
@@ -14,7 +14,7 @@ var db = require('./database'),
Upgrade.check = function(callback) {
// IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema
- var latestSchema = new Date(2014, 0, 1).getTime();
+ var latestSchema = new Date(2014, 0, 5).getTime();
db.get('schemaDate', function(err, value) {
if (parseInt(value, 10) >= latestSchema) {
@@ -65,8 +65,16 @@ Upgrade.upgrade = function(callback) {
async.each(uids, function(uid, next) {
User.getUserField(uid, 'username', function(err, username) {
- newUserSlug = Utils.slugify(username);
- User.setUserField(uid, 'userslug', newUserSlug, next);
+ if(err) {
+ return next(err);
+ }
+ if(username) {
+ newUserSlug = Utils.slugify(username);
+ User.setUserField(uid, 'userslug', newUserSlug, next);
+ } else {
+ winston.warn('uid '+ uid + ' doesn\'t have a valid username (' + username + '), skipping');
+ next(null);
+ }
});
}, function(err) {
next(err);
@@ -108,6 +116,97 @@ Upgrade.upgrade = function(callback) {
winston.info('[2013/12/31] maximumTitleLength skipped');
next();
}
+ },
+ function(next) {
+ // Custom classes for each category, adding link field for each category
+ thisSchemaDate = new Date(2014, 0, 3).getTime();
+ if (schemaDate < thisSchemaDate) {
+ updatesMade = true;
+
+ db.getListRange('categories:cid', 0, -1, function(err, cids) {
+ if(err) {
+ return next(err);
+ }
+
+ for (var cid in cids) {
+ db.setObjectField('category:' + cids[cid], 'link', '');
+ db.setObjectField('category:' + cids[cid], 'class', 'col-md-3 col-xs-6');
+ }
+
+ winston.info('[2014/1/3] Added categories.class, categories.link fields');
+ next();
+ });
+ } else {
+ winston.info('[2014/1/3] categories.class, categories.link fields skipped');
+ next();
+ }
+ },
+ function(next) {
+ // Custom classes for each category, adding link field for each category
+ thisSchemaDate = new Date(2014, 0, 4).getTime();
+ if (schemaDate < thisSchemaDate) {
+ updatesMade = true;
+
+ db.getListRange('categories:cid', 0, -1, function(err, cids) {
+ if(err) {
+ return next(err);
+ }
+
+ for (var cid in cids) {
+ db.setObjectField('category:' + cids[cid], 'numRecentReplies', '2');
+ }
+
+ winston.info('[2014/1/4] Added categories.numRecentReplies fields');
+ next();
+ });
+ } else {
+ winston.info('[2014/1/4] categories.numRecentReplies fields skipped');
+ next();
+ }
+ },
+ function(next) {
+ thisSchemaDate = new Date(2014, 0, 5).getTime();
+ if (schemaDate < thisSchemaDate) {
+ updatesMade = true;
+
+ db.getListRange('categories:cid', 0, -1, function(err, cids) {
+ if(err) {
+ return next(err);
+ }
+
+ var timestamp = Date.now();
+
+ function upgradeCategory(cid, next) {
+ db.getSetMembers('cid:' + cid + ':active_users', function(err, uids) {
+ if(err) {
+ return next(err);
+ }
+
+ db.delete('cid:' + cid + ':active_users', function(err) {
+ if(err) {
+ return next(err);
+ }
+
+ for(var i=0; i