From ed092bf6b583e679e1a5ba37d2feed57ecfec01e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 6 Oct 2020 14:03:59 -0400 Subject: [PATCH] refactor: remove posts.tools.purge moved the check to socketPosts.purge --- src/posts/tools.js | 9 --------- src/socket.io/posts/tools.js | 7 ++++++- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/posts/tools.js b/src/posts/tools.js index d184bb1018..daa5bde189 100644 --- a/src/posts/tools.js +++ b/src/posts/tools.js @@ -41,13 +41,4 @@ module.exports = function (Posts) { } return post; } - - Posts.tools.purge = async function (uid, pid) { - const canPurge = await privileges.posts.canPurge(pid, uid); - if (!canPurge) { - throw new Error('[[error:no-privileges]]'); - } - require('./cache').del(pid); - await Posts.purge(pid, uid); - }; }; diff --git a/src/socket.io/posts/tools.js b/src/socket.io/posts/tools.js index 86eb42087e..3255722efe 100644 --- a/src/socket.io/posts/tools.js +++ b/src/socket.io/posts/tools.js @@ -131,7 +131,12 @@ module.exports = function (SocketPosts) { const postData = await posts.getPostFields(data.pid, ['toPid', 'tid']); postData.pid = data.pid; - await posts.tools.purge(socket.uid, data.pid); + const canPurge = await privileges.posts.canPurge(data.pid, socket.uid); + if (!canPurge) { + throw new Error('[[error:no-privileges]]'); + } + require('../../posts/cache').del(data.pid); + await posts.purge(data.pid, socket.uid); websockets.in('topic_' + postData.tid).emit('event:post_purged', postData); const topicData = await topics.getTopicFields(postData.tid, ['title', 'cid']);