Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-17 19:21:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix vote progress

Browse Source
This commit is contained in:
barisusakli
2015-09-25 15:30:45 -04:00
parent e2896ef6b9
commit f2f9000b70
2 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/favourites.js
View File

@@ -106,7 +106,16 @@ var async = require('async'),
return callback(new Error('[[error:reputation-system-disabled]]'));
}
toggleVote('upvote', pid, uid, callback);
if (voteInProgress(pid, uid)) {
return callback(new Error('[[error:already-voting-for-this-post]]'));
}
putVoteInProgress(pid, uid);
toggleVote('upvote', pid, uid, function(err, data) {
clearVoteProgress(pid, uid);
callback(err, data);
});
};
Favourites.downvote = function(pid, uid, callback) {
@@ -118,6 +127,12 @@ var async = require('async'),
return callback(new Error('[[error:downvoting-disabled]]'));
}
if (voteInProgress(pid, uid)) {
return callback(new Error('[[error:already-voting-for-this-post]]'));
}
putVoteInProgress(pid, uid);
user.getUserField(uid, 'reputation', function(err, reputation) {
if (err) {
return callback(err);
@@ -127,7 +142,23 @@ var async = require('async'),
return callback(new Error('[[error:not-enough-reputation-to-downvote]]'));
}
toggleVote('downvote', pid, uid, callback);
toggleVote('downvote', pid, uid, function(err, data) {
clearVoteProgress(pid, uid);
callback(err, data);
});
});
};
Favourites.unvote = function(pid, uid, callback) {
if (voteInProgress(pid, uid)) {
return callback(new Error('[[error:already-voting-for-this-post]]'));
}
putVoteInProgress(pid, uid);
unvote(pid, uid, 'unvote', function(err, data) {
clearVoteProgress(pid, uid);
callback(err, data);
});
};
@@ -150,29 +181,15 @@ var async = require('async'),
}
function toggleVote(type, pid, uid, callback) {
function done(err, data) {
clearVoteProgress(pid, uid);
callback(err, data);
}
if (voteInProgress(pid, uid)) {
return callback(new Error('[[error:already-voting-for-this-post]]'));
}
putVoteInProgress(pid, uid);
unvote(pid, uid, type, function(err) {
if (err) {
return done(err);
return callback(err);
}
vote(type, false, pid, uid, done);
vote(type, false, pid, uid, callback);
});
}
Favourites.unvote = function(pid, uid, callback) {
unvote(pid, uid, 'unvote', callback);
};
function unvote(pid, uid, command, callback) {
async.parallel({
owner: function(next) {

5
src/socket.io/posts/favourites.js
View File

@@ -142,13 +142,12 @@ module.exports = function(SocketPosts) {
return callback(err);
}
socket.emit('posts.' + command, result);
if (result && eventName) {
socket.emit('posts.' + command, result);
websockets.in(data.room_id).emit('event:' + eventName, result);
}
if (notification) {
if (result && notification) {
SocketPosts.sendNotificationToPostOwner(data.pid, socket.uid, notification);
}
callback();