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

added more error first to some functions

Browse Source
This commit is contained in:
Baris Soner Usakli
2013-12-14 16:29:33 -05:00
parent 30c11a8b42
commit 770cea9329
3 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/routes/user.js
View File

@@ -181,7 +181,7 @@ var fs = require('fs'),
user.setUserField(uid, 'picture', imageUrl);
if (convertToPNG) {
im.convert([uploadPath, 'png:-'],
im.convert([uploadPath, 'png:-'],
function(err, stdout){
if (err) {
winston.err(err);
@@ -191,10 +191,10 @@ var fs = require('fs'),
return;
}
fs.writeFileSync(uploadPath, stdout, 'binary');
fs.writeFileSync(uploadPath, stdout, 'binary');
});
}
res.json({
path: imageUrl
@@ -393,18 +393,24 @@ var fs = require('fs'),
});
});
app.get('/api/user/:userslug', function (req, res) {
app.get('/api/user/:userslug', function (req, res, next) {
var callerUID = req.user ? req.user.uid : '0';
getUserDataByUserSlug(req.params.userslug, callerUID, function (userData) {
if (userData) {
user.isFollowing(callerUID, userData.theirid, function (isFollowing) {
posts.getPostsByUid(userData.theirid, 0, 9, function (posts) {
posts.getPostsByUid(userData.theirid, 0, 9, function (err, posts) {
if(err) {
return next(err);
}
userData.posts = posts.filter(function (p) {
return p && parseInt(p.deleted, 10) !== 1;
});
userData.isFollowing = isFollowing;
if (!userData.profileviews) {
userData.profileviews = 1;
}