Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-09 17:12:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Julian Lam
2014-01-11 22:09:30 -05:00
parent eb974ec1d8 30ad852492
commit 98e4257939
7 changed files with 70 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/socket.io/index.js
View File

@@ -120,6 +120,7 @@ Sockets.init = function() {
});
socket.on('*', function(payload, callback) {
// Ignore all non-api messages
if (payload.name.substr(0, 4) !== 'api:') {
return;

15
src/socket.io/posts.js
View File

@@ -6,7 +6,7 @@ var posts = require('../posts'),
SocketPosts = {};
SocketPosts.reply = function(data, sessionData) {
SocketPosts.reply = function(data, callback, sessionData) {
if (sessionData.uid < 1 && parseInt(meta.config.allowGuestPosting, 10) === 0) {
sessionData.socket.emit('event:alert', {
title: 'Reply Unsuccessful',
@@ -17,12 +17,6 @@ SocketPosts.reply = function(data, sessionData) {
return;
}
// FIXME: postDelay in sockets? I am disappoint.
// if (Date.now() - lastPostTime < meta.config.postDelay * 1000) {
// module.parent.exports.emitTooManyPostsAlert(sessionData.socket);
// return;
// }
topics.reply(data.topic_id, sessionData.uid, data.content, function(err, postData) {
if(err) {
if (err.message === 'content-too-short') {
@@ -48,7 +42,7 @@ SocketPosts.reply = function(data, sessionData) {
}
if (postData) {
lastPostTime = Date.now();
module.parent.exports.emitTopicPostStats();
sessionData.socket.emit('event:alert', {
@@ -63,7 +57,7 @@ SocketPosts.reply = function(data, sessionData) {
sessionData.server.sockets.in('topic_' + postData.tid).emit('event:new_post', socketData);
sessionData.server.sockets.in('recent_posts').emit('event:new_post', socketData);
sessionData.server.sockets.in('user/' + postData.uid).emit('event:new_post', socketData);
callback();
}
});
@@ -93,7 +87,7 @@ SocketPosts.getRawPost = function(data, callback) {
});
};
SocketPosts.edit = function(data, sessionData) {
SocketPosts.edit = function(data, callback, sessionData) {
if(!sessionData.uid) {
sessionData.socket.emit('event:alert', {
title: 'Can&apos;t edit',
@@ -111,6 +105,7 @@ SocketPosts.edit = function(data, sessionData) {
}
postTools.edit(sessionData.uid, data.pid, data.title, data.content, data.images);
callback();
};
SocketPosts.delete = function(data, callback, sessionData) {

3
src/socket.io/topics.js
View File

@@ -3,7 +3,7 @@ var topics = require('../topics'),
SocketTopics = {};
SocketTopics.post = function(data, sessionData) {
SocketTopics.post = function(data, callback, sessionData) {
if (sessionData.uid < 1 && parseInt(meta.config.allowGuestPosting, 10) === 0) {
socket.emit('event:alert', {
title: 'Post Unsuccessful',
@@ -57,6 +57,7 @@ SocketTopics.post = function(data, sessionData) {
type: 'success',
timeout: 2000
});
callback();
}
});
};

82
src/topics.js
View File

@@ -134,6 +134,10 @@ var async = require('async'),
Topics.reply = function(tid, uid, content, callback) {
threadTools.privileges(tid, uid, function(err, privileges) {
if(err) {
return callback(err);
}
if (content) {
content = content.trim();
}
@@ -144,54 +148,68 @@ var async = require('async'),
return callback(new Error('no-privileges'));
}
posts.create(uid, tid, content, function(err, postData) {
user.getUserField(uid, 'lastposttime', function(err, lastposttime) {
if(err) {
return callback(err, null);
} else if(!postData) {
callback(new Error('reply-error'), null);
return callback(err);
}
posts.getCidByPid(postData.pid, function(err, cid) {
if(!lastposttime) {
lastposttime = 0;
}
if (Date.now() - lastposttime < meta.config.postDelay * 1000) {
return callback(new Error('too-many-posts'), null);
}
posts.create(uid, tid, content, function(err, postData) {
if(err) {
return callback(err, null);
return callback(err);
} else if(!postData) {
callback(new Error('reply-error'), null);
}
db.delete('cid:' + cid + ':read_by_uid', function(err) {
Topics.markAsUnreadForAll(tid, function(err) {
if(err) {
return callback(err, null);
}
posts.getCidByPid(postData.pid, function(err, cid) {
if(err) {
return callback(err, null);
}
Topics.markAsRead(tid, uid);
Topics.pushUnreadCount();
db.delete('cid:' + cid + ':read_by_uid', function(err) {
Topics.markAsUnreadForAll(tid, function(err) {
if(err) {
return callback(err, null);
}
Topics.markAsRead(tid, uid);
Topics.pushUnreadCount();
});
});
});
});
db.getObjectField('tid:lastFeedUpdate', tid, function(err, lastFeedUpdate) {
var now = Date.now();
if(!lastFeedUpdate || parseInt(lastFeedUpdate, 10) < now - 3600000) {
feed.updateTopic(tid);
db.setObjectField('tid:lastFeedUpdate', tid, now);
}
});
db.getObjectField('tid:lastFeedUpdate', tid, function(err, lastFeedUpdate) {
var now = Date.now();
if(!lastFeedUpdate || parseInt(lastFeedUpdate, 10) < now - 3600000) {
feed.updateTopic(tid);
db.setObjectField('tid:lastFeedUpdate', tid, now);
}
});
feed.updateRecent();
feed.updateRecent();
threadTools.notifyFollowers(tid, uid);
threadTools.notifyFollowers(tid, uid);
user.sendPostNotificationToFollowers(uid, tid, postData.pid);
user.sendPostNotificationToFollowers(uid, tid, postData.pid);
posts.addUserInfoToPost(postData, function(err) {
if(err) {
return callback(err, null);
}
posts.addUserInfoToPost(postData, function(err) {
if(err) {
return callback(err, null);
}
postData.favourited = false;
postData.display_moderator_tools = true;
postData.relativeTime = new Date(postData.timestamp).toISOString();
postData.favourited = false;
postData.display_moderator_tools = true;
postData.relativeTime = new Date(postData.timestamp).toISOString();
callback(null, postData);
callback(null, postData);
});
});
});
});