Merge remote-tracking branch 'origin/master' into socket.io1.x

src/socket.io/modules.js

@@ -1,6 +1,12 @@
 "use strict";
 
-var	posts = require('../posts'),
+var	nconf = require('nconf'),
+	async = require('async'),
+	S = require('string'),
+	winston = require('winston'),
+	_ = require('underscore'),
+
+	posts = require('../posts'),
 	postTools = require('../postTools'),
 	topics = require('../topics'),
 	meta = require('../meta'),
@@ -9,13 +15,10 @@ var	posts = require('../posts'),
 	notifications = require('../notifications'),
 	plugins = require('../plugins'),
 	utils = require('../../public/src/utils'),
+	privileges = require('../privileges'),
 
-	async = require('async'),
-	S = require('string'),
-	winston = require('winston'),
-	_ = require('underscore'),
 	server = require('./'),
-	nconf = require('nconf'),
+
 
 	SocketModules = {
 		composer: {},
@@ -28,37 +31,42 @@ var	posts = require('../posts'),
 /* Posts Composer */
 
 SocketModules.composer.push = function(socket, pid, callback) {
-	posts.getPostFields(pid, ['content', 'tid'], function(err, postData) {
+	privileges.posts.can('read', pid, socket.uid, function(err, canRead) {
-		if(err || (!postData && !postData.content)) {
+		if (err || !canRead) {
-			return callback(err || new Error('[[error:invalid-pid]]'));
+			return callback(err || new Error('[[error:no-privileges]]'));
 		}
-
+		posts.getPostFields(pid, ['content', 'tid'], function(err, postData) {
-		async.parallel({
+			if(err || (!postData && !postData.content)) {
-			topic: function(next) {
+				return callback(err || new Error('[[error:invalid-pid]]'));
-				topics.getTopicDataByPid(pid, next);
-			},
-			tags: function(next) {
-				topics.getTopicTags(postData.tid, next);
-			},
-			isMain: function(next) {
-				posts.isMain(pid, next);
-			}
-		}, function(err, results) {
-			if(err) {
-				return callback(err);
 			}
 
-			if (!results.topic) {
+			async.parallel({
-				return callback(new Error('[[error:no-topic]]'));
+				topic: function(next) {
-			}
+					topics.getTopicDataByPid(pid, next);
+				},
+				tags: function(next) {
+					topics.getTopicTags(postData.tid, next);
+				},
+				isMain: function(next) {
+					posts.isMain(pid, next);
+				}
+			}, function(err, results) {
+				if(err) {
+					return callback(err);
+				}
+
+				if (!results.topic) {
+					return callback(new Error('[[error:no-topic]]'));
+				}
 
-			callback(null, {
+				callback(null, {
-				pid: pid,
+					pid: pid,
-				body: postData.content,
+					body: postData.content,
-				title: results.topic.title,
+					title: results.topic.title,
-				topic_thumb: results.topic.thumb,
+					topic_thumb: results.topic.thumb,
-				tags: results.tags,
+					tags: results.tags,
-				isMain: results.isMain
+					isMain: results.isMain
+				});
 			});
 		});
 	});