From 7c5ba9b7b11a80156c6593837cb38cc447196b46 Mon Sep 17 00:00:00 2001 From: Andrea Cardinale Date: Tue, 12 May 2015 23:52:48 +0200 Subject: [PATCH 1/5] Revert "Add hooks: action:post.favourite and action:post.unfavourite" This reverts commit 1d22a2d46b73c39770c6e9927aa31ab5a1d91937. --- src/favourites.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/favourites.js b/src/favourites.js index 58a945e211..e38e11298e 100644 --- a/src/favourites.js +++ b/src/favourites.js @@ -307,12 +307,6 @@ var async = require('async'), results.postData.reputation = count; posts.setPostField(pid, 'reputation', count, next); }, - function(next) { - plugins.fireHook('action:post.' + type, { - pid: pid, - uid: uid, - }, next); - }, function(next) { next(null, { post: results.postData, From 3b1582915e79fe8c49c41dd4c42802d97b48c3ce Mon Sep 17 00:00:00 2001 From: Andrea Cardinale Date: Fri, 3 Jul 2015 14:00:22 +0200 Subject: [PATCH 2/5] Restore favourites.js --- src/favourites.js | 2401 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2401 insertions(+) create mode 100644 src/favourites.js diff --git a/src/favourites.js b/src/favourites.js new file mode 100644 index 0000000000..c8185aaf3b --- /dev/null +++ b/src/favourites.js @@ -0,0 +1,2401 @@ + + + + + + + + + + + + + NodeBB/favourites.js at master · acardinale/NodeBB · GitHub + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Skip to content +
+ + + + + + + + + + + +
+
+
+ +
+
+
+ + + + +

+ + /NodeBB + + + + + + + forked from NodeBB/NodeBB + +

+
+
+ +
+
+
+ + + +
+ +
+

HTTPS clone URL

+
+ + + + +
+
+ + +
+

Subversion checkout URL

+
+ + + + +
+
+ + + +
You can clone with +
or
. + + + +
+ + + + + + + Download ZIP + +
+
+ +
+ + + + + + + +
+ +
+ + + branch: + master + + + +
+ +
+ + + + +
+ +
+ NodeBB/src/favourites.js +
+
+ + +
+ Fetching contributors… +
+ +
+

+

Cannot retrieve contributors at this time

+
+ +
+
+
+ +
+ Raw + Blame + History +
+ + + + + +
+ +
+ 349 lines (290 sloc) + + 9.056 kB +
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
"use strict";
+
var async = require('async'),
winston = require('winston'),
db = require('./database'),
posts = require('./posts'),
user = require('./user'),
plugins = require('./plugins'),
meta = require('./meta');
+
(function (Favourites) {
+
var votesInProgress = {};
+
function vote(type, unvote, pid, uid, callback) {
uid = parseInt(uid, 10);
+
if (uid === 0) {
return callback(new Error('[[error:not-logged-in]]'));
}
+
posts.getPostFields(pid, ['pid', 'uid'], function (err, postData) {
if (err) {
return callback(err);
}
+
var now = Date.now();
+
if(type === 'upvote' && !unvote) {
db.sortedSetAdd('uid:' + uid + ':upvote', now, pid);
} else {
db.sortedSetRemove('uid:' + uid + ':upvote', pid);
}
+
if(type === 'upvote' || unvote) {
db.sortedSetRemove('uid:' + uid + ':downvote', pid);
} else {
db.sortedSetAdd('uid:' + uid + ':downvote', now, pid);
}
+
user[type === 'upvote' ? 'incrementUserFieldBy' : 'decrementUserFieldBy'](postData.uid, 'reputation', 1, function (err, newreputation) {
if (err) {
return callback(err);
}
+
if (parseInt(postData.uid, 10)) {
db.sortedSetAdd('users:reputation', newreputation, postData.uid);
}
+
adjustPostVotes(pid, uid, type, unvote, function(err, votes) {
postData.votes = votes;
callback(err, {
user: {
reputation: newreputation
},
post: postData,
upvote: type === 'upvote' && !unvote,
downvote: type === 'downvote' && !unvote
});
});
});
});
}
+
function adjustPostVotes(pid, uid, type, unvote, callback) {
var notType = (type === 'upvote' ? 'downvote' : 'upvote');
+
async.series([
function(next) {
if (unvote) {
db.setRemove('pid:' + pid + ':' + type, uid, next);
} else {
db.setAdd('pid:' + pid + ':' + type, uid, next);
}
},
function(next) {
db.setRemove('pid:' + pid + ':' + notType, uid, next);
}
], function(err) {
if (err) {
return callback(err);
}
+
async.parallel({
upvotes: function(next) {
db.setCount('pid:' + pid + ':upvote', next);
},
downvotes: function(next) {
db.setCount('pid:' + pid + ':downvote', next);
}
}, function(err, results) {
if (err) {
return callback(err);
}
var voteCount = parseInt(results.upvotes, 10) - parseInt(results.downvotes, 10);
+
posts.updatePostVoteCount(pid, voteCount, function(err) {
callback(err, voteCount);
});
});
});
}
+
Favourites.upvote = function(pid, uid, callback) {
if (parseInt(meta.config['reputation:disabled'], 10) === 1) {
return callback(new Error('[[error:reputation-system-disabled]]'));
}
+
toggleVote('upvote', pid, uid, callback);
};
+
Favourites.downvote = function(pid, uid, callback) {
if (parseInt(meta.config['reputation:disabled'], 10) === 1) {
return callback(new Error('[[error:reputation-system-disabled]]'));
}
+
if (parseInt(meta.config['downvote:disabled'], 10) === 1) {
return callback(new Error('[[error:downvoting-disabled]]'));
}
+
user.getUserField(uid, 'reputation', function(err, reputation) {
if (err) {
return callback(err);
}
+
if (reputation < parseInt(meta.config['privileges:downvote'], 10)) {
return callback(new Error('[[error:not-enough-reputation-to-downvote]]'));
}
+
toggleVote('downvote', pid, uid, callback);
});
};
+
function voteInProgress(pid, uid) {
return Array.isArray(votesInProgress[uid]) && votesInProgress[uid].indexOf(parseInt(pid, 10)) !== -1;
}
+
function putVoteInProgress(pid, uid) {
votesInProgress[uid] = votesInProgress[uid] || [];
votesInProgress[uid].push(parseInt(pid, 10));
}
+
function clearVoteProgress(pid, uid) {
if (Array.isArray(votesInProgress[uid])) {
var index = votesInProgress[uid].indexOf(parseInt(pid, 10));
if (index !== -1) {
votesInProgress[uid].splice(index, 1);
}
}
}
+
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);
}
+
vote(type, false, pid, uid, done);
});
}
+
Favourites.unvote = function(pid, uid, callback) {
unvote(pid, uid, 'unvote', callback);
};
+
function unvote(pid, uid, command, callback) {
async.parallel({
owner: function(next) {
posts.getPostField(pid, 'uid', next);
},
voteStatus: function(next) {
Favourites.hasVoted(pid, uid, next);
}
}, function(err, results) {
if (err) {
return callback(err);
}
+
if (parseInt(uid, 10) === parseInt(results.owner, 10)) {
return callback(new Error('[[error:cant-vote-self-post]]'));
}
+
var voteStatus = results.voteStatus,
hook,
current = voteStatus.upvoted ? 'upvote' : 'downvote';
+
if (voteStatus.upvoted && command === 'downvote' || voteStatus.downvoted && command === 'upvote') { // e.g. User *has* upvoted, and clicks downvote
hook = command;
} else if (voteStatus.upvoted || voteStatus.downvoted) { // e.g. User *has* upvotes, clicks upvote (so we "unvote")
hook = 'unvote';
} else { // e.g. User *has not* voted, clicks upvote
hook = command;
current = 'unvote';
}
+
plugins.fireHook('action:post.' + hook, {
pid: pid,
uid: uid,
owner: results.owner,
current: current
});
+
if (!voteStatus || (!voteStatus.upvoted && !voteStatus.downvoted)) {
return callback();
}
+
vote(voteStatus.upvoted ? 'downvote' : 'upvote', true, pid, uid, callback);
});
}
+
Favourites.hasVoted = function(pid, uid, callback) {
if (!parseInt(uid, 10)) {
return callback(null, {upvoted: false, downvoted: false});
}
+
db.isMemberOfSets(['pid:' + pid + ':upvote', 'pid:' + pid + ':downvote'], uid, function(err, hasVoted) {
if (err) {
return callback(err);
}
+
callback (null, {upvoted: hasVoted[0], downvoted: hasVoted[1]});
});
};
+
Favourites.getVoteStatusByPostIDs = function(pids, uid, callback) {
if (!parseInt(uid, 10)) {
var data = pids.map(function() {return false;});
return callback(null, {upvotes: data, downvotes: data});
}
var upvoteSets = [],
downvoteSets = [];
+
for (var i=0; i<pids.length; ++i) {
upvoteSets.push('pid:' + pids[i] + ':upvote');
downvoteSets.push('pid:' + pids[i] + ':downvote');
}
+
async.parallel({
upvotes: function(next) {
db.isMemberOfSets(upvoteSets, uid, next);
},
downvotes: function(next) {
db.isMemberOfSets(downvoteSets, uid, next);
}
}, callback);
};
+
Favourites.favourite = function (pid, uid, callback) {
toggleFavourite('favourite', pid, uid, callback);
};
+
Favourites.unfavourite = function(pid, uid, callback) {
toggleFavourite('unfavourite', pid, uid, callback);
};
+
function toggleFavourite(type, pid, uid, callback) {
if (!parseInt(uid, 10)) {
return callback(new Error('[[error:not-logged-in]]'));
}
var isFavouriting = type === 'favourite';
+
async.parallel({
postData: function(next) {
posts.getPostFields(pid, ['pid', 'uid'], next);
},
hasFavourited: function(next) {
Favourites.hasFavourited(pid, uid, next);
}
}, function(err, results) {
if (err) {
return callback(err);
}
+
if (isFavouriting && results.hasFavourited) {
return callback(new Error('[[error:already-favourited]]'));
}
+
if (!isFavouriting && !results.hasFavourited) {
return callback(new Error('[[error:already-unfavourited]]'));
}
+
async.waterfall([
function(next) {
if (isFavouriting) {
db.sortedSetAdd('uid:' + uid + ':favourites', Date.now(), pid, next);
} else {
db.sortedSetRemove('uid:' + uid + ':favourites', pid, next);
}
},
function(next) {
db[isFavouriting ? 'setAdd' : 'setRemove']('pid:' + pid + ':users_favourited', uid, next);
},
function(next) {
db.setCount('pid:' + pid + ':users_favourited', next);
},
function(count, next) {
results.postData.reputation = count;
posts.setPostField(pid, 'reputation', count, next);
},
function(next) {
next(null, {
post: results.postData,
isFavourited: isFavouriting
});
}
], callback);
});
}
+
Favourites.hasFavourited = function(pid, uid, callback) {
if (!parseInt(uid, 10)) {
return callback(null, false);
}
db.isSetMember('pid:' + pid + ':users_favourited', uid, callback);
};
+
Favourites.getFavouritesByPostIDs = function(pids, uid, callback) {
if (!parseInt(uid, 10)) {
return callback(null, pids.map(function() {return false;}));
}
+
var sets = [];
for (var i=0; i<pids.length; ++i) {
sets.push('pid:' + pids[i] + ':users_favourited');
}
+
db.isMemberOfSets(sets, uid, callback);
};
+
Favourites.getUpvotedUidsByPids = function(pids, callback) {
var sets = pids.map(function(pid) {
return 'pid:' + pid + ':upvote';
});
db.getSetsMembers(sets, callback);
};
+
+
}(exports));
+ +
+ +
+ +Jump to Line + + +
+ +
+
+
+
+ + +
+ +
+ +
+ + +
+
+
+ +
+
+
+
+
+
+ + + + + + +
+
+ + + + + + +
+ + + Something went wrong with that request. Please try again. +
+ + + + + + + + + From 3e21f26d0d553b661d7e0d1782644e0d71ad37a2 Mon Sep 17 00:00:00 2001 From: Andrea Cardinale Date: Fri, 3 Jul 2015 14:10:40 +0200 Subject: [PATCH 3/5] Restore favourites.js --- src/favourites.js | 5597 ++++++++++++++++++++++++++------------------- 1 file changed, 3196 insertions(+), 2401 deletions(-) diff --git a/src/favourites.js b/src/favourites.js index c8185aaf3b..5838a24f49 100644 --- a/src/favourites.js +++ b/src/favourites.js @@ -1,2401 +1,3196 @@ - - - - - - - - - - - - - NodeBB/favourites.js at master · acardinale/NodeBB · GitHub - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Skip to content -
- - - - - - - - - - - -
-
-
- -
-
-
- - - - -

- - /NodeBB - - - - - - - forked from NodeBB/NodeBB - -

-
-
- -
-
-
- - - -
- -
-

HTTPS clone URL

-
- - - - -
-
- - -
-

Subversion checkout URL

-
- - - - -
-
- - - -
You can clone with -
or
. - - - -
- - - - - - - Download ZIP - -
-
- -
- - - - - - - -
- -
- - - branch: - master - - - -
- -
- - - - -
- -
- NodeBB/src/favourites.js -
-
- - -
- Fetching contributors… -
- -
-

-

Cannot retrieve contributors at this time

-
- -
-
-
- -
- Raw - Blame - History -
- - - - - -
- -
- 349 lines (290 sloc) - - 9.056 kB -
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
"use strict";
-
var async = require('async'),
winston = require('winston'),
db = require('./database'),
posts = require('./posts'),
user = require('./user'),
plugins = require('./plugins'),
meta = require('./meta');
-
(function (Favourites) {
-
var votesInProgress = {};
-
function vote(type, unvote, pid, uid, callback) {
uid = parseInt(uid, 10);
-
if (uid === 0) {
return callback(new Error('[[error:not-logged-in]]'));
}
-
posts.getPostFields(pid, ['pid', 'uid'], function (err, postData) {
if (err) {
return callback(err);
}
-
var now = Date.now();
-
if(type === 'upvote' && !unvote) {
db.sortedSetAdd('uid:' + uid + ':upvote', now, pid);
} else {
db.sortedSetRemove('uid:' + uid + ':upvote', pid);
}
-
if(type === 'upvote' || unvote) {
db.sortedSetRemove('uid:' + uid + ':downvote', pid);
} else {
db.sortedSetAdd('uid:' + uid + ':downvote', now, pid);
}
-
user[type === 'upvote' ? 'incrementUserFieldBy' : 'decrementUserFieldBy'](postData.uid, 'reputation', 1, function (err, newreputation) {
if (err) {
return callback(err);
}
-
if (parseInt(postData.uid, 10)) {
db.sortedSetAdd('users:reputation', newreputation, postData.uid);
}
-
adjustPostVotes(pid, uid, type, unvote, function(err, votes) {
postData.votes = votes;
callback(err, {
user: {
reputation: newreputation
},
post: postData,
upvote: type === 'upvote' && !unvote,
downvote: type === 'downvote' && !unvote
});
});
});
});
}
-
function adjustPostVotes(pid, uid, type, unvote, callback) {
var notType = (type === 'upvote' ? 'downvote' : 'upvote');
-
async.series([
function(next) {
if (unvote) {
db.setRemove('pid:' + pid + ':' + type, uid, next);
} else {
db.setAdd('pid:' + pid + ':' + type, uid, next);
}
},
function(next) {
db.setRemove('pid:' + pid + ':' + notType, uid, next);
}
], function(err) {
if (err) {
return callback(err);
}
-
async.parallel({
upvotes: function(next) {
db.setCount('pid:' + pid + ':upvote', next);
},
downvotes: function(next) {
db.setCount('pid:' + pid + ':downvote', next);
}
}, function(err, results) {
if (err) {
return callback(err);
}
var voteCount = parseInt(results.upvotes, 10) - parseInt(results.downvotes, 10);
-
posts.updatePostVoteCount(pid, voteCount, function(err) {
callback(err, voteCount);
});
});
});
}
-
Favourites.upvote = function(pid, uid, callback) {
if (parseInt(meta.config['reputation:disabled'], 10) === 1) {
return callback(new Error('[[error:reputation-system-disabled]]'));
}
-
toggleVote('upvote', pid, uid, callback);
};
-
Favourites.downvote = function(pid, uid, callback) {
if (parseInt(meta.config['reputation:disabled'], 10) === 1) {
return callback(new Error('[[error:reputation-system-disabled]]'));
}
-
if (parseInt(meta.config['downvote:disabled'], 10) === 1) {
return callback(new Error('[[error:downvoting-disabled]]'));
}
-
user.getUserField(uid, 'reputation', function(err, reputation) {
if (err) {
return callback(err);
}
-
if (reputation < parseInt(meta.config['privileges:downvote'], 10)) {
return callback(new Error('[[error:not-enough-reputation-to-downvote]]'));
}
-
toggleVote('downvote', pid, uid, callback);
});
};
-
function voteInProgress(pid, uid) {
return Array.isArray(votesInProgress[uid]) && votesInProgress[uid].indexOf(parseInt(pid, 10)) !== -1;
}
-
function putVoteInProgress(pid, uid) {
votesInProgress[uid] = votesInProgress[uid] || [];
votesInProgress[uid].push(parseInt(pid, 10));
}
-
function clearVoteProgress(pid, uid) {
if (Array.isArray(votesInProgress[uid])) {
var index = votesInProgress[uid].indexOf(parseInt(pid, 10));
if (index !== -1) {
votesInProgress[uid].splice(index, 1);
}
}
}
-
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);
}
-
vote(type, false, pid, uid, done);
});
}
-
Favourites.unvote = function(pid, uid, callback) {
unvote(pid, uid, 'unvote', callback);
};
-
function unvote(pid, uid, command, callback) {
async.parallel({
owner: function(next) {
posts.getPostField(pid, 'uid', next);
},
voteStatus: function(next) {
Favourites.hasVoted(pid, uid, next);
}
}, function(err, results) {
if (err) {
return callback(err);
}
-
if (parseInt(uid, 10) === parseInt(results.owner, 10)) {
return callback(new Error('[[error:cant-vote-self-post]]'));
}
-
var voteStatus = results.voteStatus,
hook,
current = voteStatus.upvoted ? 'upvote' : 'downvote';
-
if (voteStatus.upvoted && command === 'downvote' || voteStatus.downvoted && command === 'upvote') { // e.g. User *has* upvoted, and clicks downvote
hook = command;
} else if (voteStatus.upvoted || voteStatus.downvoted) { // e.g. User *has* upvotes, clicks upvote (so we "unvote")
hook = 'unvote';
} else { // e.g. User *has not* voted, clicks upvote
hook = command;
current = 'unvote';
}
-
plugins.fireHook('action:post.' + hook, {
pid: pid,
uid: uid,
owner: results.owner,
current: current
});
-
if (!voteStatus || (!voteStatus.upvoted && !voteStatus.downvoted)) {
return callback();
}
-
vote(voteStatus.upvoted ? 'downvote' : 'upvote', true, pid, uid, callback);
});
}
-
Favourites.hasVoted = function(pid, uid, callback) {
if (!parseInt(uid, 10)) {
return callback(null, {upvoted: false, downvoted: false});
}
-
db.isMemberOfSets(['pid:' + pid + ':upvote', 'pid:' + pid + ':downvote'], uid, function(err, hasVoted) {
if (err) {
return callback(err);
}
-
callback (null, {upvoted: hasVoted[0], downvoted: hasVoted[1]});
});
};
-
Favourites.getVoteStatusByPostIDs = function(pids, uid, callback) {
if (!parseInt(uid, 10)) {
var data = pids.map(function() {return false;});
return callback(null, {upvotes: data, downvotes: data});
}
var upvoteSets = [],
downvoteSets = [];
-
for (var i=0; i<pids.length; ++i) {
upvoteSets.push('pid:' + pids[i] + ':upvote');
downvoteSets.push('pid:' + pids[i] + ':downvote');
}
-
async.parallel({
upvotes: function(next) {
db.isMemberOfSets(upvoteSets, uid, next);
},
downvotes: function(next) {
db.isMemberOfSets(downvoteSets, uid, next);
}
}, callback);
};
-
Favourites.favourite = function (pid, uid, callback) {
toggleFavourite('favourite', pid, uid, callback);
};
-
Favourites.unfavourite = function(pid, uid, callback) {
toggleFavourite('unfavourite', pid, uid, callback);
};
-
function toggleFavourite(type, pid, uid, callback) {
if (!parseInt(uid, 10)) {
return callback(new Error('[[error:not-logged-in]]'));
}
var isFavouriting = type === 'favourite';
-
async.parallel({
postData: function(next) {
posts.getPostFields(pid, ['pid', 'uid'], next);
},
hasFavourited: function(next) {
Favourites.hasFavourited(pid, uid, next);
}
}, function(err, results) {
if (err) {
return callback(err);
}
-
if (isFavouriting && results.hasFavourited) {
return callback(new Error('[[error:already-favourited]]'));
}
-
if (!isFavouriting && !results.hasFavourited) {
return callback(new Error('[[error:already-unfavourited]]'));
}
-
async.waterfall([
function(next) {
if (isFavouriting) {
db.sortedSetAdd('uid:' + uid + ':favourites', Date.now(), pid, next);
} else {
db.sortedSetRemove('uid:' + uid + ':favourites', pid, next);
}
},
function(next) {
db[isFavouriting ? 'setAdd' : 'setRemove']('pid:' + pid + ':users_favourited', uid, next);
},
function(next) {
db.setCount('pid:' + pid + ':users_favourited', next);
},
function(count, next) {
results.postData.reputation = count;
posts.setPostField(pid, 'reputation', count, next);
},
function(next) {
next(null, {
post: results.postData,
isFavourited: isFavouriting
});
}
], callback);
});
}
-
Favourites.hasFavourited = function(pid, uid, callback) {
if (!parseInt(uid, 10)) {
return callback(null, false);
}
db.isSetMember('pid:' + pid + ':users_favourited', uid, callback);
};
-
Favourites.getFavouritesByPostIDs = function(pids, uid, callback) {
if (!parseInt(uid, 10)) {
return callback(null, pids.map(function() {return false;}));
}
-
var sets = [];
for (var i=0; i<pids.length; ++i) {
sets.push('pid:' + pids[i] + ':users_favourited');
}
-
db.isMemberOfSets(sets, uid, callback);
};
-
Favourites.getUpvotedUidsByPids = function(pids, callback) {
var sets = pids.map(function(pid) {
return 'pid:' + pid + ':upvote';
});
db.getSetsMembers(sets, callback);
};
-
-
}(exports));
- -
- -
- -Jump to Line - - -
- -
-
-
-
- - -
- -
- -
- - -
-
-
- -
-
-
-
-
-
- - - - - - -
-
- - - - - - -
- - - Something went wrong with that request. Please try again. -
- - - - - - - - - +"use strict"; + +var async = require('async'), + winston = require('winston'), + db = require('./database'), + posts = require('./posts'), + user = require('./user'), + plugins = require('./plugins'), + meta = require('./meta'); + +(function (Favourites) { + + var votesInProgress = {}; + + function vote(type, unvote, pid, uid, callback) { + uid = parseInt(uid, 10); + + if (uid === 0) { + return callback(new Error('[[error:not-logged-in]]')); + } + + posts.getPostFields(pid, ['pid', 'uid'], function (err, postData) { + if (err) { + return callback(err); + } + + var now = Date.now(); + + if(type === 'upvote' && !unvote) { + db.sortedSetAdd('uid:' + uid + ':upvote', now, pid); + } else { + db.sortedSetRemove('uid:' + uid + ':upvote', pid); + } + + if(type === 'upvote' || unvote) { + db.sortedSetRemove('uid:' + uid + ':downvote', pid); + } else { + db.sortedSetAdd('uid:' + uid + ':downvote', now, pid); + } + + user[type === 'upvote' ? 'incrementUserFieldBy' : 'decrementUserFieldBy'](postData.uid, 'reputation', 1, function (err, newreputation) { + if (err) { + return callback(err); + } + + if (parseInt(postData.uid, 10)) { + db.sortedSetAdd('users:reputation', newreputation, postData.uid); + } + + adjustPostVotes(pid, uid, type, unvote, function(err, votes) { + postData.votes = votes; + callback(err, { + user: { + reputation: newreputation + }, + post: postData, + upvote: type === 'upvote' && !unvote, + downvote: type === 'downvote' && !unvote + }); + }); + }); + }); + } + + function adjustPostVotes(pid, uid, type, unvote, callback) { + var notType = (type === 'upvote' ? 'downvote' : 'upvote'); + + async.series([ + function(next) { + if (unvote) { + db.setRemove('pid:' + pid + ':' + type, uid, next); + } else { + db.setAdd('pid:' + pid + ':' + type, uid, next); + } + }, + function(next) { + db.setRemove('pid:' + pid + ':' + notType, uid, next); + } + ], function(err) { + if (err) { + return callback(err); + } + + async.parallel({ + upvotes: function(next) { + db.setCount('pid:' + pid + ':upvote', next); + }, + downvotes: function(next) { + db.setCount('pid:' + pid + ':downvote', next); + } + }, function(err, results) { + if (err) { + return callback(err); + } + var voteCount = parseInt(results.upvotes, 10) - parseInt(results.downvotes, 10); + + posts.updatePostVoteCount(pid, voteCount, function(err) { + callback(err, voteCount); + }); + }); + }); + } + + Favourites.upvote = function(pid, uid, callback) { + if (parseInt(meta.config['reputation:disabled'], 10) === 1) { + return callback(new Error('[[error:reputation-system-disabled]]')); + } + + toggleVote('upvote', pid, uid, callback); + }; + + Favourites.downvote = function(pid, uid, callback) { + if (parseInt(meta.config['reputation:disabled'], 10) === 1) { + return callback(new Error('[[error:reputation-system-disabled]]')); + } + + if (parseInt(meta.config['downvote:disabled'], 10) === 1) { + return callback(new Error('[[error:downvoting-disabled]]')); + } + + user.getUserField(uid, 'reputation', function(err, reputation) { + if (err) { + return callback(err); + } + + if (reputation < parseInt(meta.config['privileges:downvote'], 10)) { + return callback(new Error('[[error:not-enough-reputation-to-downvote]]')); + } + + toggleVote('downvote', pid, uid, callback); + }); + }; + + function voteInProgress(pid, uid) { + return Array.isArray(votesInProgress[uid]) && votesInProgress[uid].indexOf(parseInt(pid, 10)) !== -1; + } + + function putVoteInProgress(pid, uid) { + votesInProgress[uid] = votesInProgress[uid] || []; + votesInProgress[uid].push(parseInt(pid, 10)); + } + + function clearVoteProgress(pid, uid) { + if (Array.isArray(votesInProgress[uid])) { + var index = votesInProgress[uid].indexOf(parseInt(pid, 10)); + if (index !== -1) { + votesInProgress[uid].splice(index, 1); + } + } + } + + 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); + } + + vote(type, false, pid, uid, done); + }); + } + + Favourites.unvote = function(pid, uid, callback) { + unvote(pid, uid, 'unvote', callback); + }; + + function unvote(pid, uid, command, callback) { + async.parallel({ + owner: function(next) { + posts.getPostField(pid, 'uid', next); + }, + voteStatus: function(next) { + Favourites.hasVoted(pid, uid, next); + } + }, function(err, results) { + if (err) { + return callback(err); + } + + if (parseInt(uid, 10) === parseInt(results.owner, 10)) { + return callback(new Error('[[error:cant-vote-self-post]]')); + } + + var voteStatus = results.voteStatus, + hook, + current = voteStatus.upvoted ? 'upvote' : 'downvote'; + + if (voteStatus.upvoted && command === 'downvote' || voteStatus.downvoted && command === 'upvote') { // e.g. User *has* upvoted, and clicks downvote + hook = command; + } else if (voteStatus.upvoted || voteStatus.downvoted) { // e.g. User *has* upvotes, clicks upvote (so we "unvote") + hook = 'unvote'; + } else { // e.g. User *has not* voted, clicks upvote + hook = command; + current = 'unvote'; + } + + plugins.fireHook('action:post.' + hook, { + pid: pid, + uid: uid, + owner: results.owner, + current: current + }); + + if (!voteStatus || (!voteStatus.upvoted && !voteStatus.downvoted)) { + return callback(); + } + + vote(voteStatus.upvoted ? 'downvote' : 'upvote', true, pid, uid, callback); + }); + } + + Favourites.hasVoted = function(pid, uid, callback) { + if (!parseInt(uid, 10)) { + return callback(null, {upvoted: false, downvoted: false}); + } + + db.isMemberOfSets(['pid:' + pid + ':upvote', 'pid:' + pid + ':downvote'], uid, function(err, hasVoted) { + if (err) { + return callback(err); + } + + callback (null, {upvoted: hasVoted[0], downvoted: hasVoted[1]}); + }); + }; + + Favourites.getVoteStatusByPostIDs = function(pids, uid, callback) { + if (!parseInt(uid, 10)) { + var data = pids.map(function() {return false;}); + return callback(null, {upvotes: data, downvotes: data}); + } + var upvoteSets = [], + downvoteSets = []; + + for (var i=0; i Date: Fri, 3 Jul 2015 14:14:21 +0200 Subject: [PATCH 4/5] Restore favourites.js --- src/favourites.js | 2840 --------------------------------------------- 1 file changed, 2840 deletions(-) diff --git a/src/favourites.js b/src/favourites.js index 5838a24f49..549b308de3 100644 --- a/src/favourites.js +++ b/src/favourites.js @@ -353,2844 +353,4 @@ var async = require('async'), }; -}(exports));"use strict"; - -var async = require('async'), - winston = require('winston'), - db = require('./database'), - posts = require('./posts'), - user = require('./user'), - plugins = require('./plugins'), - meta = require('./meta'); - -(function (Favourites) { - - var votesInProgress = {}; - - function vote(type, unvote, pid, uid, callback) { - uid = parseInt(uid, 10); - - if (uid === 0) { - return callback(new Error('[[error:not-logged-in]]')); - } - - posts.getPostFields(pid, ['pid', 'uid'], function (err, postData) { - if (err) { - return callback(err); - } - - var now = Date.now(); - - if(type === 'upvote' && !unvote) { - db.sortedSetAdd('uid:' + uid + ':upvote', now, pid); - } else { - db.sortedSetRemove('uid:' + uid + ':upvote', pid); - } - - if(type === 'upvote' || unvote) { - db.sortedSetRemove('uid:' + uid + ':downvote', pid); - } else { - db.sortedSetAdd('uid:' + uid + ':downvote', now, pid); - } - - user[type === 'upvote' ? 'incrementUserFieldBy' : 'decrementUserFieldBy'](postData.uid, 'reputation', 1, function (err, newreputation) { - if (err) { - return callback(err); - } - - if (parseInt(postData.uid, 10)) { - db.sortedSetAdd('users:reputation', newreputation, postData.uid); - } - - adjustPostVotes(pid, uid, type, unvote, function(err, votes) { - postData.votes = votes; - callback(err, { - user: { - reputation: newreputation - }, - post: postData, - upvote: type === 'upvote' && !unvote, - downvote: type === 'downvote' && !unvote - }); - }); - }); - }); - } - - function adjustPostVotes(pid, uid, type, unvote, callback) { - var notType = (type === 'upvote' ? 'downvote' : 'upvote'); - - async.series([ - function(next) { - if (unvote) { - db.setRemove('pid:' + pid + ':' + type, uid, next); - } else { - db.setAdd('pid:' + pid + ':' + type, uid, next); - } - }, - function(next) { - db.setRemove('pid:' + pid + ':' + notType, uid, next); - } - ], function(err) { - if (err) { - return callback(err); - } - - async.parallel({ - upvotes: function(next) { - db.setCount('pid:' + pid + ':upvote', next); - }, - downvotes: function(next) { - db.setCount('pid:' + pid + ':downvote', next); - } - }, function(err, results) { - if (err) { - return callback(err); - } - var voteCount = parseInt(results.upvotes, 10) - parseInt(results.downvotes, 10); - - posts.updatePostVoteCount(pid, voteCount, function(err) { - callback(err, voteCount); - }); - }); - }); - } - - Favourites.upvote = function(pid, uid, callback) { - if (parseInt(meta.config['reputation:disabled'], 10) === 1) { - return callback(new Error('[[error:reputation-system-disabled]]')); - } - - toggleVote('upvote', pid, uid, callback); - }; - - Favourites.downvote = function(pid, uid, callback) { - if (parseInt(meta.config['reputation:disabled'], 10) === 1) { - return callback(new Error('[[error:reputation-system-disabled]]')); - } - - if (parseInt(meta.config['downvote:disabled'], 10) === 1) { - return callback(new Error('[[error:downvoting-disabled]]')); - } - - user.getUserField(uid, 'reputation', function(err, reputation) { - if (err) { - return callback(err); - } - - if (reputation < parseInt(meta.config['privileges:downvote'], 10)) { - return callback(new Error('[[error:not-enough-reputation-to-downvote]]')); - } - - toggleVote('downvote', pid, uid, callback); - }); - }; - - function voteInProgress(pid, uid) { - return Array.isArray(votesInProgress[uid]) && votesInProgress[uid].indexOf(parseInt(pid, 10)) !== -1; - } - - function putVoteInProgress(pid, uid) { - votesInProgress[uid] = votesInProgress[uid] || []; - votesInProgress[uid].push(parseInt(pid, 10)); - } - - function clearVoteProgress(pid, uid) { - if (Array.isArray(votesInProgress[uid])) { - var index = votesInProgress[uid].indexOf(parseInt(pid, 10)); - if (index !== -1) { - votesInProgress[uid].splice(index, 1); - } - } - } - - 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); - } - - vote(type, false, pid, uid, done); - }); - } - - Favourites.unvote = function(pid, uid, callback) { - unvote(pid, uid, 'unvote', callback); - }; - - function unvote(pid, uid, command, callback) { - async.parallel({ - owner: function(next) { - posts.getPostField(pid, 'uid', next); - }, - voteStatus: function(next) { - Favourites.hasVoted(pid, uid, next); - } - }, function(err, results) { - if (err) { - return callback(err); - } - - if (parseInt(uid, 10) === parseInt(results.owner, 10)) { - return callback(new Error('[[error:cant-vote-self-post]]')); - } - - var voteStatus = results.voteStatus, - hook, - current = voteStatus.upvoted ? 'upvote' : 'downvote'; - - if (voteStatus.upvoted && command === 'downvote' || voteStatus.downvoted && command === 'upvote') { // e.g. User *has* upvoted, and clicks downvote - hook = command; - } else if (voteStatus.upvoted || voteStatus.downvoted) { // e.g. User *has* upvotes, clicks upvote (so we "unvote") - hook = 'unvote'; - } else { // e.g. User *has not* voted, clicks upvote - hook = command; - current = 'unvote'; - } - - plugins.fireHook('action:post.' + hook, { - pid: pid, - uid: uid, - owner: results.owner, - current: current - }); - - if (!voteStatus || (!voteStatus.upvoted && !voteStatus.downvoted)) { - return callback(); - } - - vote(voteStatus.upvoted ? 'downvote' : 'upvote', true, pid, uid, callback); - }); - } - - Favourites.hasVoted = function(pid, uid, callback) { - if (!parseInt(uid, 10)) { - return callback(null, {upvoted: false, downvoted: false}); - } - - db.isMemberOfSets(['pid:' + pid + ':upvote', 'pid:' + pid + ':downvote'], uid, function(err, hasVoted) { - if (err) { - return callback(err); - } - - callback (null, {upvoted: hasVoted[0], downvoted: hasVoted[1]}); - }); - }; - - Favourites.getVoteStatusByPostIDs = function(pids, uid, callback) { - if (!parseInt(uid, 10)) { - var data = pids.map(function() {return false;}); - return callback(null, {upvotes: data, downvotes: data}); - } - var upvoteSets = [], - downvoteSets = []; - - for (var i=0; i Date: Thu, 9 Jul 2015 13:17:49 +0200 Subject: [PATCH 5/5] Uniform action:post.* hook --- src/favourites.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/favourites.js b/src/favourites.js index 549b308de3..5a8aaf7b85 100644 --- a/src/favourites.js +++ b/src/favourites.js @@ -270,6 +270,9 @@ var async = require('async'), var isFavouriting = type === 'favourite'; async.parallel({ + owner: function(next) { + posts.getPostField(pid, 'uid', next); + }, postData: function(next) { posts.getPostFields(pid, ['pid', 'uid'], next); }, @@ -312,9 +315,13 @@ var async = require('async'), return callback(err); } + var current = results.hasFavourited ? 'favourited' : 'unfavourited'; + plugins.fireHook('action:post.' + type, { pid: pid, uid: uid, + owner: results.owner, + current: current }); callback(null, {