Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-06-25 03:10:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

closes #6576

Browse Source
This commit is contained in:
Julian Lam
2018-06-15 11:33:56 -04:00
parent 4684ab3bf6
commit 1f8b4bf820
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/file.js
View File

@@ -167,7 +167,7 @@ file.delete = function (path, callback) {
}
fs.unlink(path, function (err) {
if (err) {
winston.error(err);
winston.warn(err);
}
callback();
});

10
src/user/uploads.js
View File

@@ -3,6 +3,7 @@
var async = require('async');
var path = require('path');
var nconf = require('nconf');
var winston = require('winston');
var db = require('../database');
var file = require('../file');
@@ -26,7 +27,14 @@ module.exports = function (User) {
return next(new Error('[[error:no-privileges]]'));
}
file.delete(path.join(nconf.get('upload_path'), uploadName), next);
winston.verbose('[user/deleteUpload] Deleting ' + uploadName);
async.parallel([
async.apply(file.delete, path.join(nconf.get('upload_path'), uploadName)),
async.apply(file.delete, path.join(nconf.get('upload_path'), path.dirname(uploadName), path.basename(uploadName, path.extname(uploadName)) + '-resized' + path.extname(uploadName))),
], function (err) {
// Only return err, not the parallel'd result set
next(err);
});
},
function (next) {
db.sortedSetRemove('uid:' + uid + ':uploads', uploadName, next);