Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-28 17:46:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

modules.js error keys

Browse Source
This commit is contained in:
barisusakli
2014-04-09 21:36:57 -04:00
parent 7b992e7a20
commit b07efb0085
2 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/socket.io/modules.js
View File

@@ -49,35 +49,36 @@ var stopTracking = function(replyObj) {
};
SocketModules.composer.push = function(socket, pid, callback) {
if (socket.uid || parseInt(meta.config.allowGuestPosting, 10)) {
if (parseInt(pid, 10) > 0) {
async.parallel([
function(next) {
posts.getPostFields(pid, ['content'], next);
},
function(next) {
topics.getTopicDataByPid(pid, next);
},
function(next) {
posts.getPidIndex(pid, next);
}
], function(err, results) {
if(err) {
return callback(err);
}
callback(null, {
pid: pid,
body: results[0].content,
title: results[1].title,
topic_thumb: results[1].thumb,
index: results[2]
});
});
}
} else {
callback(new Error('no-uid'));
if(!socket.uid && parseInt(meta.config.allowGuestPosting, 10) !== 1) {
return callback(new Error('[[error:not-logged-in]]'));
}
posts.getPostFields(pid, ['content'], function(err, postData) {
if(err || (!postData && !postData.content)) {
return callback(err || new Error('[[error:invalid-pid]]'));
}
async.parallel({
topic: function(next) {
topics.getTopicDataByPid(pid, next);
},
index: function(next) {
posts.getPidIndex(pid, next);
}
}, function(err, results) {
if(err) {
return callback(err);
}
callback(null, {
pid: pid,
body: postData.content,
title: results.topic.title,
topic_thumb: results.topic.thumb,
index: results.index
});
});
});
};
SocketModules.composer.editCheck = function(socket, pid, callback) {
@@ -150,7 +151,7 @@ SocketModules.composer.getUsersByTid = function(socket, tid, callback) {
SocketModules.chats.get = function(socket, data, callback) {
if(!data) {
return callback(new Error('invalid data'));
return callback(new Error('[[error:invalid-data]]'));
}
Messaging.getMessages(socket.uid, data.touid, false, callback);
@@ -158,7 +159,7 @@ SocketModules.chats.get = function(socket, data, callback) {
SocketModules.chats.send = function(socket, data, callback) {
if(!data) {
return callback(new Error('invalid data'));
return callback(new Error('[[error:invalid-data]]'));
}
var touid = data.touid;