Merge branch 'master' of https://github.com/NodeBB/NodeBB

src/socket.io/posts.js

@@ -70,24 +70,22 @@ function postReply(socket, data, callback) {
 	], callback);
 }
 
-SocketPosts.getRawPost = function (socket, pid, callback) {
+SocketPosts.getRawPost = async (socket, pid) => {
-	async.waterfall([
+	const canRead = await privileges.posts.can('topics:read', pid, socket.uid);
-		function (next) {
-			privileges.posts.can('topics:read', pid, socket.uid, next);
-		},
-		function (canRead, next) {
 	if (!canRead) {
-				return next(new Error('[[error:no-privileges]]'));
+		throw new Error('[[error:no-privileges]]');
 	}
-			posts.getPostFields(pid, ['content', 'deleted'], next);
+
-		},
+	let postData = await posts.getPostFields(pid, ['content', 'deleted']);
-		function (postData, next) {
 	if (postData.deleted) {
-				return next(new Error('[[error:no-post]]'));
+		throw new Error('[[error:no-post]]');
 	}
-			next(null, postData.content);
+
-		},
+	postData = await plugins.fireHook('filter:post.getRawPost', Object.assign(postData, {
-	], callback);
+		pid: pid,
+	}));
+
+	return postData.content;
 };
 
 SocketPosts.getTimestampByIndex = function (socket, data, callback) {