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

feat: add folder to filter:uploadImage and filter:uploadFile

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-05-22 10:00:24 -04:00
parent 478c8dd72b
commit 7f24200c73
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/admin/uploads.js
View File

@@ -243,7 +243,7 @@ async function uploadImage(filename, folder, uploadedFile, req, res, next) {
let imageData;
try {
if (plugins.hasListeners('filter:uploadImage')) {
imageData = await plugins.fireHook('filter:uploadImage', { image: uploadedFile, uid: req.uid });
imageData = await plugins.fireHook('filter:uploadImage', { image: uploadedFile, uid: req.uid, folder: folder });
} else {
imageData = await file.saveFileToLocal(filename, folder, uploadedFile.path);
}

9
src/controllers/uploads.js
View File

@@ -64,6 +64,7 @@ async function uploadAsImage(req, uploadedFile) {
return await plugins.fireHook('filter:uploadImage', {
image: uploadedFile,
uid: req.uid,
folder: 'files',
});
}
await image.isFileTypeAllowed(uploadedFile.path);
@@ -129,6 +130,7 @@ uploadsController.uploadThumb = async function (req, res, next) {
return await plugins.fireHook('filter:uploadImage', {
image: uploadedFile,
uid: req.uid,
folder: 'files',
});
}
@@ -141,6 +143,7 @@ uploadsController.uploadFile = async function (uid, uploadedFile) {
return await plugins.fireHook('filter:uploadFile', {
file: uploadedFile,
uid: uid,
folder: 'files',
});
}
@@ -159,16 +162,16 @@ uploadsController.uploadFile = async function (uid, uploadedFile) {
throw new Error('[[error:invalid-file-type, ' + allowed.join(', ') + ']]');
}
return await saveFileToLocal(uid, uploadedFile);
return await saveFileToLocal(uid, 'files', uploadedFile);
};
async function saveFileToLocal(uid, uploadedFile) {
async function saveFileToLocal(uid, folder, uploadedFile) {
const name = uploadedFile.name || 'upload';
const extension = path.extname(name) || '';
const filename = Date.now() + '-' + validator.escape(name.substr(0, name.length - extension.length)).substr(0, 255) + extension;
const upload = await file.saveFileToLocal(filename, 'files', uploadedFile.path);
const upload = await file.saveFileToLocal(filename, folder, uploadedFile.path);
const storedFile = {
url: nconf.get('relative_path') + upload.url,
path: upload.path,

1
src/image.js
View File

@@ -149,6 +149,7 @@ image.uploadImage = async function (filename, folder, imageData) {
return await plugins.fireHook('filter:uploadImage', {
image: imageData,
uid: imageData.uid,
folder: folder,
});
}
await image.isFileTypeAllowed(imageData.path);

11
src/topics/thumb.js
View File

@@ -40,7 +40,8 @@ module.exports = function (Topics) {
extension = '.' + mime.getExtension(type);
}
const filename = Date.now() + '-topic-thumb' + extension;
pathToUpload = path.join(nconf.get('upload_path'), 'files', filename);
const folder = 'files';
pathToUpload = path.join(nconf.get('upload_path'), folder, filename);
await pipeToFileAsync(data.thumb, pathToUpload);
@@ -53,11 +54,15 @@ module.exports = function (Topics) {
});
if (!plugins.hasListeners('filter:uploadImage')) {
data.thumb = '/assets/uploads/files/' + filename;
data.thumb = '/assets/uploads/' + folder + '/' + filename;
return;
}
const uploadedFile = await plugins.fireHook('filter:uploadImage', { image: { path: pathToUpload, name: '' }, uid: data.uid });
const uploadedFile = await plugins.fireHook('filter:uploadImage', {
image: { path: pathToUpload, name: '' },
uid: data.uid,
folder: folder,
});
file.delete(pathToUpload);
data.thumb = uploadedFile.url;
} catch (err) {