more post fixes

This commit is contained in:
Baris Soner Usakli
2014-01-16 22:06:23 -05:00
parent 9e6f7fa960
commit b3816b98a1
8 changed files with 106 additions and 86 deletions

View File

@@ -368,41 +368,41 @@ var db = require('./database'),
Posts.uploadPostImage = function(image, callback) {
if(meta.config.imgurClientID) {
if(!image) {
if(!image || !image.data) {
return callback('invalid image', null);
}
require('./imgur').upload(meta.config.imgurClientID, image.data, 'base64', function(err, data) {
if(err) {
callback(err.message, null);
} else {
callback(null, {
url: data.link,
name: image.name
});
return callback(err);
}
callback(null, {
url: data.link,
name: image.name
});
});
} else if (meta.config.allowFileUploads) {
Posts.uploadPostFile(image, callback);
} else {
callback('Uploads are disabled!');
callback(new Error('Uploads are disabled!'));
}
}
Posts.uploadPostFile = function(file, callback) {
if(!meta.config.allowFileUploads) {
return callback('File uploads are not allowed');
return callback(new Error('File uploads are not allowed'));
}
if(!file) {
return callback('invalid file');
if(!file || !file.data) {
return callback(new Error('invalid file'));
}
var buffer = new Buffer(file.data, 'base64');
if(buffer.length > parseInt(meta.config.maximumFileSize, 10) * 1024) {
return callback('File too big');
return callback(new Error('File too big'));
}
var filename = 'upload-' + utils.generateUUID() + path.extname(file.name);
@@ -410,13 +410,13 @@ var db = require('./database'),
fs.writeFile(uploadPath, buffer, function (err) {
if(err) {
callback(err.message, null);
} else {
callback(null, {
url: nconf.get('upload_url') + filename,
name: file.name
});
return callback(err);
}
callback(null, {
url: nconf.get('upload_url') + filename,
name: file.name
});
});
}
@@ -427,7 +427,7 @@ var db = require('./database'),
}
async.filter(pids, function(pid, next) {
postTools.privileges(pid, 0, function(privileges) {
postTools.privileges(pid, 0, function(err, privileges) {
next(privileges.read);
});
}, function(pids) {