From 924d332c2cee0dfad794c9dd2044f3420434c8cd Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 7 Aug 2019 14:06:04 -0400 Subject: [PATCH] Revert "refactor: rewrote SocketPosts.getRawPost in await style" This reverts commit 08530bb33f7b4c178c91c56a7a2cfba6d2e0ef22. --- src/socket.io/posts.js | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js index 944b7e2508..19833df6b7 100644 --- a/src/socket.io/posts.js +++ b/src/socket.io/posts.js @@ -70,22 +70,24 @@ function postReply(socket, data, callback) { ], callback); } -SocketPosts.getRawPost = async (socket, pid) => { - const canRead = await privileges.posts.can('topics:read', pid, socket.uid); - if (!canRead) { - throw new Error('[[error:no-privileges]]'); - } - - let postData = await posts.getPostFields(pid, ['content', 'deleted']); - if (postData.deleted) { - throw new Error('[[error:no-post]]'); - } - - postData = await plugins.fireHook('filter:post.getRawPost', Object.assign(postData, { - pid: pid, - })); - - return postData.content; +SocketPosts.getRawPost = function (socket, pid, callback) { + async.waterfall([ + function (next) { + privileges.posts.can('topics:read', pid, socket.uid, next); + }, + function (canRead, next) { + if (!canRead) { + return next(new Error('[[error:no-privileges]]')); + } + posts.getPostFields(pid, ['content', 'deleted'], next); + }, + function (postData, next) { + if (postData.deleted) { + return next(new Error('[[error:no-post]]')); + } + next(null, postData.content); + }, + ], callback); }; SocketPosts.getTimestampByIndex = function (socket, data, callback) {