developed during a merge... I am going to hell for this.

- also new topics tab in admin panel
This commit is contained in:
Julian Lam
2013-06-20 16:19:17 -04:00
parent cef77c2fd8
commit 32eba62ef6
9 changed files with 178 additions and 133 deletions

View File

@@ -56,9 +56,14 @@ var user = require('./../user.js'),
});
}
break;
case 'topics' :
categories.getCategoryById(0, 0, function(data) {
res.json(data);
case 'topics':
topics.getAllTopics(function(topics) {
topics.sort(function(a, b) {
return b.timestamp - a.timestamp;
});
res.json({
topics: topics
});
});
break;
case 'redis':

View File

@@ -46,6 +46,11 @@ var RDB = require('./redis.js'),
tid: tid,
status: 'ok'
});
socket.emit('api:topic.lock', {
status: 'ok',
tid: tid
});
}
}
});
@@ -62,6 +67,11 @@ var RDB = require('./redis.js'),
tid: tid,
status: 'ok'
});
socket.emit('api:topic.unlock', {
status: 'ok',
tid: tid
});
}
}
});
@@ -79,6 +89,11 @@ var RDB = require('./redis.js'),
tid: tid,
status: 'ok'
});
socket.emit('api:topic.delete', {
status: 'ok',
tid: tid
});
}
}
});
@@ -96,6 +111,11 @@ var RDB = require('./redis.js'),
tid: tid,
status: 'ok'
});
socket.emit('api:topic.restore', {
status: 'ok',
tid: tid
});
}
}
});
@@ -112,6 +132,11 @@ var RDB = require('./redis.js'),
tid: tid,
status: 'ok'
});
socket.emit('api:topic.pin', {
status: 'ok',
tid: tid
});
}
}
});
@@ -128,6 +153,11 @@ var RDB = require('./redis.js'),
tid: tid,
status: 'ok'
});
socket.emit('api:topic.unpin', {
status: 'ok',
tid: tid
});
}
}
});

View File

@@ -179,10 +179,26 @@ marked.setOptions({
throw new Error(err);
}
topicData.tid = tid;
callback(topicData);
});
}
Topics.getAllTopics = function(callback) {
RDB.smembers('topics:tid', function(err, tids) {
var topics = [];
async.each(tids, function(tid, next) {
Topics.get_topic(tid, 0, function(topicData) {
topics.push(topicData);
next();
});
}, function(err) {
console.log(topics);
callback(topics);
});
});
}
Topics.get_cid_by_tid = function(tid, callback) {
RDB.get(schema.topics(tid).cid, function(err, cid) {
if (cid && parseInt(cid) > 0) {
@@ -195,7 +211,6 @@ marked.setOptions({
Topics.getTitle = function(tid, callback) {
RDB.get('tid:' + tid + ':title', function(err, title) {
console.log(tid, title);
callback(title);
});
}