Node.js based forum software built for the modern web
feat: add filter:privileges.posts.delete, fired ahead of the lock gate (#14722)
palmoni58d9d0645ac34
diff --git a/src/privileges/posts.js b/src/privileges/posts.jsindex 50b8640efa..0396526474 100644--- a/src/privileges/posts.js+++ b/src/privileges/posts.js@@ -219,16 +219,24 @@ privsPosts.canDelete = async function (pid, uid) {return { flag: true };}- if (!results.isMod && results.isLocked) {+ results.pid = utils.isNumber(pid) ? parseInt(pid, 10) : pid;+ results.uid = uid;+ results.postData = postData;++ // Fired ahead of the lock and delete-duration gates, so that plugins can+ // grant delete access inside a locked topic by unsetting `isLocked`.+ const result = await plugins.hooks.fire('filter:privileges.posts.delete', results);++ if (!result.isMod && result.isLocked) {return { flag: false, message: '[[error:topic-locked]]' };}const { postDeleteDuration } = meta.config;- if (!results.isMod && postDeleteDuration && (Date.now() - postData.timestamp > postDeleteDuration * 1000)) {+ if (!result.isMod && postDeleteDuration && (Date.now() - postData.timestamp > postDeleteDuration * 1000)) {return { flag: false, message: `[[error:post-delete-duration-expired, ${meta.config.postDeleteDuration}]]` };}const { deleterUid } = postData;- const flag = results['posts:delete'] && ((results.isOwner && (deleterUid === 0 || deleterUid === postData.uid)) || results.isMod);+ const flag = result['posts:delete'] && ((result.isOwner && (deleterUid === 0 || deleterUid === postData.uid)) || result.isMod);return { flag: flag, message: '[[error:no-privileges]]' };};diff --git a/test/posts.js b/test/posts.jsindex 2582d1b53d..5dff620633 100644--- a/test/posts.js+++ b/test/posts.js@@ -1433,6 +1433,30 @@ describe('Post\'s', () => {plugins.hooks.unregister('test-edit-locked', 'filter:privileges.posts.edit', method);}});++ it('should not allow the owner to delete a post in a locked topic', async () => {+ const { flag, message } = await privileges.posts.canDelete(pid, ownerUid);+ assert.strictEqual(flag, false);+ assert.strictEqual(message, '[[error:topic-locked]]');+ });++ it('should let a plugin grant delete access by unsetting isLocked', async () => {+ const method = (data) => {+ assert.strictEqual(data.isLocked, true);+ data.isLocked = false;+ return data;+ };+ plugins.hooks.register('test-delete-locked', {+ hook: 'filter:privileges.posts.delete',+ method: method,+ });+ try {+ const { flag } = await privileges.posts.canDelete(pid, ownerUid);+ assert.strictEqual(flag, true);+ } finally {+ plugins.hooks.unregister('test-delete-locked', 'filter:privileges.posts.delete', method);+ }+ });});describe('Topic Backlinks', () => {