Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 03:26:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor abit adding error checking to missing parts

Browse Source
This commit is contained in:
Baris Usakli
2013-11-15 13:39:09 -05:00
parent 411ba3542c
commit 84fa704b25
5 changed files with 102 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/posts.js
View File

@@ -131,17 +131,18 @@ var RDB = require('./redis.js'),
});
};
// TODO: this function is never called except from some debug route. clean up?
Posts.getPostData = function(pid, callback) {
RDB.hgetall('post:' + pid, function(err, data) {
if (err === null) {
plugins.fireHook('filter:post.get', data, function(err, newData) {
if (!err) callback(newData);
else callback(data);
});
} else {
winston.error(err);
if(err) {
return callback(err, null);
}
plugins.fireHook('filter:post.get', data, function(err, newData) {
if(err) {
return callback(err, null);
}
callback(null, newData);
});
});
}

32
src/routes/debug.js
View File

@@ -1,5 +1,31 @@
var user = require('./../user'),
categories = require('./../categories'),
topics = require('./../topics'),
posts = require('./../posts');
var DebugRoute = function(app) {
app.namespace('/debug', function() {
app.get('/uid/:uid', function (req, res) {
if (!req.params.uid)
return res.redirect('/404');
user.getUserData(req.params.uid, function (err, data) {
if (data) {
res.send(data);
} else {
res.json(404, {
error: "User doesn't exist!"
});
}
});
});
app.get('/cid/:cid', function (req, res) {
categories.getCategoryData(req.params.cid, function (err, data) {
if (data) {
@@ -11,7 +37,7 @@ var DebugRoute = function(app) {
});
app.get('/tid/:tid', function (req, res) {
topics.getTopicData(req.params.tid, function (data) {
topics.getTopicData(req.params.tid, function (err, data) {
if (data) {
res.send(data);
} else {
@@ -21,7 +47,7 @@ var DebugRoute = function(app) {
});
app.get('/pid/:pid', function (req, res) {
posts.getPostData(req.params.pid, function (data) {
posts.getPostData(req.params.pid, function (err, data) {
if (data) {
res.send(data);
} else {
@@ -45,6 +71,6 @@ var DebugRoute = function(app) {
res.send(Utils.generateUUID());
});
});
};
};
module.exports = DebugRoute;

16
src/routes/user.js
View File

@@ -14,22 +14,6 @@ var user = require('./../user.js'),
(function (User) {
User.createRoutes = function (app) {
app.get('/uid/:uid', function (req, res) {
if (!req.params.uid)
return res.redirect('/404');
user.getUserData(req.params.uid, function (err, data) {
if (data) {
res.send(data);
} else {
res.json(404, {
error: "User doesn't exist!"
});
}
});
});
app.namespace('/users', function () {
app.get('', function (req, res) {
app.build_header({

34
src/topics.js
View File

@@ -20,7 +20,10 @@ var RDB = require('./redis.js'),
Topics.getTopicData = function(tid, callback) {
RDB.hgetall('topic:' + tid, function(err, data) {
if (err === null) {
if(err) {
return callback(err, null);
}
if(data) {
data.title = validator.sanitize(data.title).escape();
if(data.timestamp) {
@@ -28,20 +31,25 @@ var RDB = require('./redis.js'),
}
}
callback(data);
} else {
console.log(err);
}
callback(null, data);
});
}
Topics.getTopicDataWithUser = function(tid, callback) {
Topics.getTopicData(tid, function(topic) {
Topics.getTopicData(tid, function(err, topic) {
if(err) {
return callback(err, null);
}
user.getUserFields(topic.uid, ['username', 'userslug', 'picture'] , function(err, userData) {
if(err) {
return callback(err, null);
}
topic.username = userData.username;
topic.userslug = userData.userslug
topic.picture = userData.picture;
callback(topic);
callback(null, topic);
});
});
}
@@ -331,7 +339,7 @@ var RDB = require('./redis.js'),
}
function loadTopic(tid, callback) {
Topics.getTopicData(tid, function(topicData) {
Topics.getTopicData(tid, function(err, topicData) {
if (!topicData) {
return callback(null);
}
@@ -381,9 +389,7 @@ var RDB = require('./redis.js'),
Topics.increaseViewCount(tid);
function getTopicData(next) {
Topics.getTopicData(tid, function(topicData) {
next(null, topicData);
});
Topics.getTopicData(tid, next);
}
function getTopicPosts(next) {
@@ -442,9 +448,7 @@ var RDB = require('./redis.js'),
Topics.getTopicForCategoryView = function(tid, uid, callback) {
function getTopicData(next) {
Topics.getTopicDataWithUser(tid, function(topic) {
next(null, topic);
});
Topics.getTopicDataWithUser(tid, next);
}
function getReadStatus(next) {
@@ -517,7 +521,7 @@ var RDB = require('./redis.js'),
});
async.each(tids, function(tid, next) {
Topics.getTopicDataWithUser(tid, function(topicData) {
Topics.getTopicDataWithUser(tid, function(err, topicData) {
topics.push(topicData);
next();
});

2
src/websockets.js
View File

@@ -688,7 +688,7 @@ module.exports.init = function(io) {
socket.on('api:composer.push', function(data) {
if (uid > 0 || meta.config.allowGuestPosting === '1') {
if (parseInt(data.tid) > 0) {
topics.getTopicData(data.tid, function(topicData) {
topics.getTopicData(data.tid, function(err, topicData) {
if (data.body)
topicData.body = data.body;