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

feat: deleting a user upload dissociates from posts, and vice versa

Browse Source
This commit is contained in:
Julian Lam
2022-02-11 16:16:28 -05:00
parent 8c2752bab1
commit d5ed8736aa
4 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/posts/uploads.js
View File

@@ -9,6 +9,7 @@ const validator = require('validator');
const db = require('../database');
const image = require('../image');
const user = require('../user');
const topics = require('../topics');
const file = require('../file');
const meta = require('../meta');
@@ -123,14 +124,19 @@ module.exports = function (Posts) {
db.sortedSetRemoveBulk(bulkRemove),
];
await Promise.all(promises);
if (!meta.config.preserveOrphanedUploads) {
const deletePaths = (await Promise.all(
filePaths.map(async filePath => (await Posts.uploads.isOrphan(filePath) ? filePath : false))
)).filter(Boolean);
promises.push(Posts.uploads.deleteFromDisk(deletePaths));
}
await Promise.all(promises);
const uploaderUids = (await db.getObjectsFields(deletePaths.map(path => `upload:${md5(path)}`, ['uid']))).map(o => (o ? o.uid || null : null));
await Promise.all(uploaderUids.map((uid, idx) => (
uid && isFinite(uid) ? user.deleteUpload(uid, uid, deletePaths[idx]) : null
)).filter(Boolean));
await Posts.uploads.deleteFromDisk(deletePaths);
}
};
Posts.uploads.dissociateAll = async (pid) => {