|
|
|
|
@ -43,7 +43,10 @@ module.exports = function (User) {
|
|
|
|
|
async.waterfall([
|
|
|
|
|
function (next) {
|
|
|
|
|
if (plugins.hasListeners('filter:uploadImage')) {
|
|
|
|
|
return plugins.fireHook('filter:uploadImage', {image: picture, uid: updateUid}, next);
|
|
|
|
|
return plugins.fireHook('filter:uploadImage', {
|
|
|
|
|
image: picture,
|
|
|
|
|
uid: updateUid
|
|
|
|
|
}, next);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var filename = updateUid + '-profileimg' + (keepAllVersions ? '-' + Date.now() : '') + (convertToPNG ? '.png' : extension);
|
|
|
|
|
@ -79,7 +82,10 @@ module.exports = function (User) {
|
|
|
|
|
},
|
|
|
|
|
function (_image, next) {
|
|
|
|
|
uploadedImage = _image;
|
|
|
|
|
User.setUserFields(updateUid, {uploadedpicture: uploadedImage.url, picture: uploadedImage.url}, next);
|
|
|
|
|
User.setUserFields(updateUid, {
|
|
|
|
|
uploadedpicture: uploadedImage.url,
|
|
|
|
|
picture: uploadedImage.url
|
|
|
|
|
}, next);
|
|
|
|
|
},
|
|
|
|
|
function (next) {
|
|
|
|
|
next(null, uploadedImage);
|
|
|
|
|
@ -92,32 +98,41 @@ module.exports = function (User) {
|
|
|
|
|
return callback(new Error('[[error:no-plugin]]'));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
request.head(url, function (err, res) {
|
|
|
|
|
if (err) {
|
|
|
|
|
return callback(err);
|
|
|
|
|
}
|
|
|
|
|
var uploadSize = parseInt(meta.config.maximumProfileImageSize, 10) || 256;
|
|
|
|
|
var size = res.headers['content-length'];
|
|
|
|
|
var type = res.headers['content-type'];
|
|
|
|
|
var extension = mime.extension(type);
|
|
|
|
|
|
|
|
|
|
if (['png', 'jpeg', 'jpg', 'gif'].indexOf(extension) === -1) {
|
|
|
|
|
return callback(new Error('[[error:invalid-image-extension]]'));
|
|
|
|
|
}
|
|
|
|
|
async.waterfall([
|
|
|
|
|
function (next) {
|
|
|
|
|
request.head(url, next);
|
|
|
|
|
},
|
|
|
|
|
function (res, body, next) {
|
|
|
|
|
var uploadSize = parseInt(meta.config.maximumProfileImageSize, 10) || 256;
|
|
|
|
|
var size = res.headers['content-length'];
|
|
|
|
|
var type = res.headers['content-type'];
|
|
|
|
|
var extension = mime.extension(type);
|
|
|
|
|
|
|
|
|
|
if (size > uploadSize * 1024) {
|
|
|
|
|
return callback(new Error('[[error:file-too-big, ' + uploadSize + ']]'));
|
|
|
|
|
}
|
|
|
|
|
if (['png', 'jpeg', 'jpg', 'gif'].indexOf(extension) === -1) {
|
|
|
|
|
return callback(new Error('[[error:invalid-image-extension]]'));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var picture = {url: url, name: ''};
|
|
|
|
|
plugins.fireHook('filter:uploadImage', {image: picture, uid: uid}, function (err, image) {
|
|
|
|
|
if (err) {
|
|
|
|
|
return callback(err);
|
|
|
|
|
if (size > uploadSize * 1024) {
|
|
|
|
|
return callback(new Error('[[error:file-too-big, ' + uploadSize + ']]'));
|
|
|
|
|
}
|
|
|
|
|
User.setUserFields(uid, {uploadedpicture: image.url, picture: image.url});
|
|
|
|
|
callback(null, image);
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
plugins.fireHook('filter:uploadImage', {
|
|
|
|
|
uid: uid,
|
|
|
|
|
image: {
|
|
|
|
|
url: url,
|
|
|
|
|
name: ''
|
|
|
|
|
}
|
|
|
|
|
}, next);
|
|
|
|
|
},
|
|
|
|
|
function (image, next) {
|
|
|
|
|
User.setUserFields(uid, {
|
|
|
|
|
uploadedpicture: image.url,
|
|
|
|
|
picture: image.url
|
|
|
|
|
}, function (err) {
|
|
|
|
|
next(err, image);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
], callback);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
User.updateCoverPosition = function (uid, position, callback) {
|
|
|
|
|
@ -125,8 +140,12 @@ module.exports = function (User) {
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
User.updateCoverPicture = function (data, callback) {
|
|
|
|
|
var keepAllVersions = parseInt(meta.config['profile:keepAllUserImages'], 10) === 1;
|
|
|
|
|
var url, md5sum;
|
|
|
|
|
|
|
|
|
|
var url;
|
|
|
|
|
var image = {
|
|
|
|
|
name: 'profileCover',
|
|
|
|
|
uid: data.uid
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
if (!data.imageData && data.position) {
|
|
|
|
|
return User.updateCoverPosition(data.uid, data.position, callback);
|
|
|
|
|
@ -145,160 +164,134 @@ module.exports = function (User) {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (data.file) {
|
|
|
|
|
return next();
|
|
|
|
|
return setImmediate(next, null, data.file.path);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
md5sum = crypto.createHash('md5');
|
|
|
|
|
md5sum.update(data.imageData);
|
|
|
|
|
md5sum = md5sum.digest('hex');
|
|
|
|
|
|
|
|
|
|
data.file = {
|
|
|
|
|
path: path.join(os.tmpdir(), md5sum)
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
var buffer = new Buffer(data.imageData.slice(data.imageData.indexOf('base64') + 7), 'base64');
|
|
|
|
|
|
|
|
|
|
fs.writeFile(data.file.path, buffer, {
|
|
|
|
|
encoding: 'base64'
|
|
|
|
|
}, next);
|
|
|
|
|
saveImageDataToTempFile(data.imageData, next);
|
|
|
|
|
},
|
|
|
|
|
function (next) {
|
|
|
|
|
var image = {
|
|
|
|
|
name: 'profileCover',
|
|
|
|
|
path: data.file.path,
|
|
|
|
|
uid: data.uid
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
if (plugins.hasListeners('filter:uploadImage')) {
|
|
|
|
|
return plugins.fireHook('filter:uploadImage', {image: image, uid: data.uid}, next);
|
|
|
|
|
}
|
|
|
|
|
function (path, next) {
|
|
|
|
|
image.path = path;
|
|
|
|
|
|
|
|
|
|
var filename = data.uid + '-profilecover' + (keepAllVersions ? '-' + Date.now() : '');
|
|
|
|
|
async.waterfall([
|
|
|
|
|
function (next) {
|
|
|
|
|
file.isFileTypeAllowed(data.file.path, next);
|
|
|
|
|
},
|
|
|
|
|
function (next) {
|
|
|
|
|
file.saveFileToLocal(filename, 'profile', image.path, next);
|
|
|
|
|
},
|
|
|
|
|
function (upload, next) {
|
|
|
|
|
next(null, {
|
|
|
|
|
url: nconf.get('relative_path') + upload.url,
|
|
|
|
|
name: image.name
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
], next);
|
|
|
|
|
uploadProfileOrCover('profilecover', image, data.imageData, next);
|
|
|
|
|
},
|
|
|
|
|
function (uploadData, next) {
|
|
|
|
|
url = uploadData.url;
|
|
|
|
|
User.setUserField(data.uid, 'cover:url', uploadData.url, next);
|
|
|
|
|
},
|
|
|
|
|
function (next) {
|
|
|
|
|
fs.unlink(data.file.path, function (err) {
|
|
|
|
|
if (err) {
|
|
|
|
|
winston.error(err);
|
|
|
|
|
}
|
|
|
|
|
next();
|
|
|
|
|
});
|
|
|
|
|
if (data.position) {
|
|
|
|
|
User.updateCoverPosition(data.uid, data.position, next);
|
|
|
|
|
} else {
|
|
|
|
|
setImmediate(next);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
], function (err) {
|
|
|
|
|
if (err) {
|
|
|
|
|
return fs.unlink(data.file.path, function (unlinkErr) {
|
|
|
|
|
if (unlinkErr) {
|
|
|
|
|
winston.error(unlinkErr);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
callback(err); // send back the original error
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (data.position) {
|
|
|
|
|
User.updateCoverPosition(data.uid, data.position, function (err) {
|
|
|
|
|
callback(err, {url: url});
|
|
|
|
|
});
|
|
|
|
|
} else {
|
|
|
|
|
callback(err, {url: url});
|
|
|
|
|
}
|
|
|
|
|
deleteFile(image.path);
|
|
|
|
|
callback(err, {
|
|
|
|
|
url: url
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
User.uploadCroppedPicture = function (data, callback) {
|
|
|
|
|
var keepAllVersions = parseInt(meta.config['profile:keepAllUserImages'], 10) === 1;
|
|
|
|
|
var url, md5sum;
|
|
|
|
|
|
|
|
|
|
var url;
|
|
|
|
|
var image = {
|
|
|
|
|
name: 'profileAvatar',
|
|
|
|
|
uid: data.uid
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
if (!data.imageData) {
|
|
|
|
|
return callback(new Error('[[error:invalid-data]]'));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
async.waterfall([
|
|
|
|
|
function (next) {
|
|
|
|
|
var size = data.file ? data.file.size : data.imageData.length;
|
|
|
|
|
var size = data.imageData.length;
|
|
|
|
|
var uploadSize = parseInt(meta.config.maximumProfileImageSize, 10) || 256;
|
|
|
|
|
if (size > uploadSize * 1024) {
|
|
|
|
|
return next(new Error('[[error:file-too-big, ' + meta.config.maximumProfileImageSize + ']]'));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
md5sum = crypto.createHash('md5');
|
|
|
|
|
md5sum.update(data.imageData);
|
|
|
|
|
md5sum = md5sum.digest('hex');
|
|
|
|
|
|
|
|
|
|
data.file = {
|
|
|
|
|
path: path.join(os.tmpdir(), md5sum)
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
var buffer = new Buffer(data.imageData.slice(data.imageData.indexOf('base64') + 7), 'base64');
|
|
|
|
|
|
|
|
|
|
fs.writeFile(data.file.path, buffer, {
|
|
|
|
|
encoding: 'base64'
|
|
|
|
|
}, next);
|
|
|
|
|
saveImageDataToTempFile(data.imageData, next);
|
|
|
|
|
},
|
|
|
|
|
function (next) {
|
|
|
|
|
var image = {
|
|
|
|
|
name: 'profileAvatar',
|
|
|
|
|
path: data.file.path,
|
|
|
|
|
uid: data.uid
|
|
|
|
|
};
|
|
|
|
|
function (path, next) {
|
|
|
|
|
image.path = path;
|
|
|
|
|
|
|
|
|
|
if (plugins.hasListeners('filter:uploadImage')) {
|
|
|
|
|
return plugins.fireHook('filter:uploadImage', {image: image, uid: data.uid}, next);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var filename = data.uid + '-profileavatar' + (keepAllVersions ? '-' + Date.now() : '');
|
|
|
|
|
async.waterfall([
|
|
|
|
|
function (next) {
|
|
|
|
|
file.isFileTypeAllowed(data.file.path, next);
|
|
|
|
|
},
|
|
|
|
|
function (next) {
|
|
|
|
|
file.saveFileToLocal(filename, 'profile', image.path, next);
|
|
|
|
|
},
|
|
|
|
|
function (upload, next) {
|
|
|
|
|
next(null, {
|
|
|
|
|
url: nconf.get('relative_path') + upload.url,
|
|
|
|
|
name: image.name
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
], next);
|
|
|
|
|
uploadProfileOrCover('profileavatar', image, data.imageData, next);
|
|
|
|
|
},
|
|
|
|
|
function (uploadData, next) {
|
|
|
|
|
url = uploadData.url;
|
|
|
|
|
User.setUserFields(data.uid, {uploadedpicture: url, picture: url}, next);
|
|
|
|
|
User.setUserFields(data.uid, {
|
|
|
|
|
uploadedpicture: url,
|
|
|
|
|
picture: url
|
|
|
|
|
}, next);
|
|
|
|
|
}
|
|
|
|
|
], function (err) {
|
|
|
|
|
deleteFile(image.path);
|
|
|
|
|
callback(err, {
|
|
|
|
|
url: url
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
function saveImageDataToTempFile(imageData, callback) {
|
|
|
|
|
var filename = crypto.createHash('md5').update(imageData).digest('hex');
|
|
|
|
|
var filepath = path.join(os.tmpdir(), filename);
|
|
|
|
|
|
|
|
|
|
var buffer = new Buffer(imageData.slice(imageData.indexOf('base64') + 7), 'base64');
|
|
|
|
|
|
|
|
|
|
fs.writeFile(filepath, buffer, {
|
|
|
|
|
encoding: 'base64'
|
|
|
|
|
}, function (err) {
|
|
|
|
|
callback(err, filepath);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function uploadProfileOrCover(type, image, imageData, callback) {
|
|
|
|
|
if (plugins.hasListeners('filter:uploadImage')) {
|
|
|
|
|
return plugins.fireHook('filter:uploadImage', {
|
|
|
|
|
image: image,
|
|
|
|
|
uid: image.uid
|
|
|
|
|
}, callback);
|
|
|
|
|
}
|
|
|
|
|
var filename = generateProfileImageFilename(image.uid, type, imageData);
|
|
|
|
|
saveFileToLocal(filename, image, callback);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function generateProfileImageFilename(uid, type, imageData) {
|
|
|
|
|
var extension = file.typeToExtension(imageData.slice(5, imageData.indexOf('base64') - 1));
|
|
|
|
|
var keepAllVersions = parseInt(meta.config['profile:keepAllUserImages'], 10) === 1;
|
|
|
|
|
var filename = uid + '-' + type + (keepAllVersions ? '-' + Date.now() : '') + (extension || '');
|
|
|
|
|
return filename;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function saveFileToLocal(filename, image, callback) {
|
|
|
|
|
async.waterfall([
|
|
|
|
|
function (next) {
|
|
|
|
|
file.isFileTypeAllowed(image.path, next);
|
|
|
|
|
},
|
|
|
|
|
function (next) {
|
|
|
|
|
fs.unlink(data.file.path, function (err) {
|
|
|
|
|
if (err) {
|
|
|
|
|
winston.error(err);
|
|
|
|
|
}
|
|
|
|
|
next();
|
|
|
|
|
file.saveFileToLocal(filename, 'profile', image.path, next);
|
|
|
|
|
},
|
|
|
|
|
function (upload, next) {
|
|
|
|
|
next(null, {
|
|
|
|
|
url: nconf.get('relative_path') + upload.url,
|
|
|
|
|
name: image.name
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
], function (err) {
|
|
|
|
|
if (err) {
|
|
|
|
|
callback(err); // send back the original error
|
|
|
|
|
}
|
|
|
|
|
], callback);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
callback(err, {url: url});
|
|
|
|
|
});
|
|
|
|
|
};
|
|
|
|
|
function deleteFile(path) {
|
|
|
|
|
if (path) {
|
|
|
|
|
fs.unlink(path, function (err) {
|
|
|
|
|
if (err) {
|
|
|
|
|
winston.error(err);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
User.removeCoverPicture = function (data, callback) {
|
|
|
|
|
db.deleteObjectFields('user:' + data.uid, ['cover:url', 'cover:position'], callback);
|
|
|
|
|
|
psychobunny
8 years ago