From 24ebb1536b39e6b22132bb9c80acf818a88b2958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 23 May 2023 16:41:26 -0400 Subject: [PATCH 1/2] test: remove socket.io test --- test/socket.io.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/test/socket.io.js b/test/socket.io.js index 4e2292d4e5..b7fcaff935 100644 --- a/test/socket.io.js +++ b/test/socket.io.js @@ -107,14 +107,6 @@ describe('socket.io', () => { }); }); - it('should return error for invalid eventName type', (done) => { - const eventName = ['topics.loadMoreTags']; - io.emit(eventName, (err) => { - assert.strictEqual(err.message, `[[error:invalid-event, object]]`); - done(); - }); - }); - it('should get installed themes', (done) => { const themes = ['nodebb-theme-persona']; io.emit('admin.themes.getInstalled', (err, data) => { From 3256fb30e711685183aa4b589982a347b51b0824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 25 May 2023 09:12:02 -0400 Subject: [PATCH 2/2] fix: rimraf usage in user image delete https://github.com/isaacs/rimraf/issues/275#issuecomment-1562402287 --- src/user/delete.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/user/delete.js b/src/user/delete.js index 7bf076e7e7..938e109acf 100644 --- a/src/user/delete.js +++ b/src/user/delete.js @@ -208,9 +208,6 @@ module.exports = function (User) { async function deleteImages(uid) { const folder = path.join(nconf.get('upload_path'), 'profile'); - await Promise.all([ - rimraf(path.join(folder, `${uid}-profilecover*`), { glob: true }), - rimraf(path.join(folder, `${uid}-profileavatar*`), { glob: true }), - ]); + await rimraf(`${uid}-profile{avatar,cover}*`, { glob: { cwd: folder } }); } };