Node.js based forum software built for the modern web
refactor: add guards against bad data & infi loops
Barış Soner Uşaklı6b3ec63621d2
diff --git a/src/categories/delete.js b/src/categories/delete.jsindex c129cddbd2..243b310106 100644--- a/src/categories/delete.js+++ b/src/categories/delete.js@@ -17,12 +17,14 @@ module.exports = function (Categories) {await async.eachLimit(tids, 10, async (tid) => {await topics.purgePostsAndTopic(tid, uid);});+ await db.sortedSetRemove(`cid:${cid}:tids`, tids);}, { alwaysStartAt: 0 });const pinnedTids = await db.getSortedSetRevRange(`cid:${cid}:tids:pinned`, 0, -1);await async.eachLimit(pinnedTids, 10, async (tid) => {await topics.purgePostsAndTopic(tid, uid);});+ await db.sortedSetRemove(`cid:${cid}:tids:pinned`, pinnedTids);const categoryData = await Categories.getCategoryData(cid);await purgeCategory(cid, categoryData);plugins.hooks.fire('action:category.delete', { cid: cid, uid: uid, category: categoryData });diff --git a/src/events.js b/src/events.jsindex 6a293c1bdd..6bd65c1b21 100644--- a/src/events.js+++ b/src/events.js@@ -261,6 +261,7 @@ events.deleteEvents = async function (eids) {events.deleteAll = async function () {await batch.processSortedSet('events:time', async (eids) => {await events.deleteEvents(eids);+ await db.sortedSetRemove('events:time', eids);}, { alwaysStartAt: 0, batch: 500 });};diff --git a/src/user/delete.js b/src/user/delete.jsindex 8b084b184b..65d8ccea65 100644--- a/src/user/delete.js+++ b/src/user/delete.js@@ -43,15 +43,17 @@ module.exports = function (User) {async function deletePosts(callerUid, uid) {await batch.processSortedSet(`uid:${uid}:posts`, async (pids) => {await posts.purge(pids, callerUid);+ await db.sortedSetRemove(`uid:${uid}:posts`, pids);}, { alwaysStartAt: 0, batch: 500 });}async function deleteTopics(callerUid, uid) {- await batch.processSortedSet(`uid:${uid}:topics`, async (ids) => {- await async.eachSeries(ids, async (tid) => {+ await batch.processSortedSet(`uid:${uid}:topics`, async (tids) => {+ await async.eachSeries(tids, async (tid) => {await topics.purge(tid, callerUid);});- }, { alwaysStartAt: 0 });+ await db.sortedSetRemove(`uid:${uid}:topics`, tids);+ }, { alwaysStartAt: 0, batch: 100 });}async function deleteUploads(callerUid, uid) {