refactor: remove posts.tools.purge

moved the check to socketPosts.purge
NodeBB · Oct 6, 2020 · ed092bf · ed092bf
1 parent dde5b6b
commit ed092bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git 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
@@ -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']);