fix: missing await

v1.18.x
Barış Soner Uşaklı 5 years ago
parent 0391856d7d
commit 4d6b2ec3ce

@ -1,14 +1,14 @@
'use strict'; 'use strict';
var meta = require('../meta'); const meta = require('../meta');
var db = require('../database'); const db = require('../database');
var user = require('../user'); const user = require('../user');
var topics = require('../topics'); const topics = require('../topics');
var plugins = require('../plugins'); const plugins = require('../plugins');
var privileges = require('../privileges'); const privileges = require('../privileges');
module.exports = function (Posts) { module.exports = function (Posts) {
var votesInProgress = {}; const votesInProgress = {};
Posts.upvote = async function (pid, uid) { Posts.upvote = async function (pid, uid) {
if (meta.config['reputation:disabled']) { if (meta.config['reputation:disabled']) {
@ -25,8 +25,7 @@ module.exports = function (Posts) {
putVoteInProgress(pid, uid); putVoteInProgress(pid, uid);
try { try {
const data = await toggleVote('upvote', pid, uid); return await toggleVote('upvote', pid, uid);
return data;
} finally { } finally {
clearVoteProgress(pid, uid); clearVoteProgress(pid, uid);
} }
@ -51,8 +50,7 @@ module.exports = function (Posts) {
putVoteInProgress(pid, uid); putVoteInProgress(pid, uid);
try { try {
const data = toggleVote('downvote', pid, uid); return await toggleVote('downvote', pid, uid);
return data;
} finally { } finally {
clearVoteProgress(pid, uid); clearVoteProgress(pid, uid);
} }
@ -65,8 +63,7 @@ module.exports = function (Posts) {
putVoteInProgress(pid, uid); putVoteInProgress(pid, uid);
try { try {
const data = await unvote(pid, uid, 'unvote'); return await unvote(pid, uid, 'unvote');
return data;
} finally { } finally {
clearVoteProgress(pid, uid); clearVoteProgress(pid, uid);
} }
@ -85,13 +82,8 @@ module.exports = function (Posts) {
const data = pids.map(() => false); const data = pids.map(() => false);
return { upvotes: data, downvotes: data }; return { upvotes: data, downvotes: data };
} }
var upvoteSets = []; const upvoteSets = pids.map(pid => 'pid:' + pid + ':upvote');
var downvoteSets = []; const downvoteSets = pids.map(pid => 'pid:' + pid + ':downvote');
for (var i = 0; i < pids.length; i += 1) {
upvoteSets.push('pid:' + pids[i] + ':upvote');
downvoteSets.push('pid:' + pids[i] + ':downvote');
}
const data = await db.isMemberOfSets(upvoteSets.concat(downvoteSets), uid); const data = await db.isMemberOfSets(upvoteSets.concat(downvoteSets), uid);
return { return {
upvotes: data.slice(0, pids.length), upvotes: data.slice(0, pids.length),
@ -114,7 +106,7 @@ module.exports = function (Posts) {
function clearVoteProgress(pid, uid) { function clearVoteProgress(pid, uid) {
if (Array.isArray(votesInProgress[uid])) { if (Array.isArray(votesInProgress[uid])) {
var index = votesInProgress[uid].indexOf(parseInt(pid, 10)); const index = votesInProgress[uid].indexOf(parseInt(pid, 10));
if (index !== -1) { if (index !== -1) {
votesInProgress[uid].splice(index, 1); votesInProgress[uid].splice(index, 1);
} }
@ -141,8 +133,8 @@ module.exports = function (Posts) {
throw new Error('[[error:not-enough-reputation-to-downvote]]'); throw new Error('[[error:not-enough-reputation-to-downvote]]');
} }
var hook; let hook;
var current = voteStatus.upvoted ? 'upvote' : 'downvote'; let current = voteStatus.upvoted ? 'upvote' : 'downvote';
if ((voteStatus.upvoted && command === 'downvote') || (voteStatus.downvoted && command === 'upvote')) { // e.g. User *has* upvoted, and clicks downvote if ((voteStatus.upvoted && command === 'downvote') || (voteStatus.downvoted && command === 'upvote')) { // e.g. User *has* upvoted, and clicks downvote
hook = command; hook = command;
@ -172,25 +164,24 @@ module.exports = function (Posts) {
if (uid <= 0) { if (uid <= 0) {
throw new Error('[[error:not-logged-in]]'); throw new Error('[[error:not-logged-in]]');
} }
const postData = await Posts.getPostFields(pid, ['pid', 'uid', 'tid']); const now = Date.now();
var now = Date.now();
if (type === 'upvote' && !unvote) { if (type === 'upvote' && !unvote) {
db.sortedSetAdd('uid:' + uid + ':upvote', now, pid); await db.sortedSetAdd('uid:' + uid + ':upvote', now, pid);
} else { } else {
db.sortedSetRemove('uid:' + uid + ':upvote', pid); await db.sortedSetRemove('uid:' + uid + ':upvote', pid);
} }
if (type === 'upvote' || unvote) { if (type === 'upvote' || unvote) {
db.sortedSetRemove('uid:' + uid + ':downvote', pid); await db.sortedSetRemove('uid:' + uid + ':downvote', pid);
} else { } else {
db.sortedSetAdd('uid:' + uid + ':downvote', now, pid); await db.sortedSetAdd('uid:' + uid + ':downvote', now, pid);
} }
const postData = await Posts.getPostFields(pid, ['pid', 'uid', 'tid']);
const newReputation = await user[type === 'upvote' ? 'incrementUserFieldBy' : 'decrementUserFieldBy'](postData.uid, 'reputation', 1); const newReputation = await user[type === 'upvote' ? 'incrementUserFieldBy' : 'decrementUserFieldBy'](postData.uid, 'reputation', 1);
if (parseInt(postData.uid, 10)) { if (parseInt(postData.uid, 10)) {
db.sortedSetAdd('users:reputation', newReputation, postData.uid); await db.sortedSetAdd('users:reputation', newReputation, postData.uid);
} }
await adjustPostVotes(postData, uid, type, unvote); await adjustPostVotes(postData, uid, type, unvote);
@ -207,7 +198,7 @@ module.exports = function (Posts) {
} }
async function adjustPostVotes(postData, uid, type, unvote) { async function adjustPostVotes(postData, uid, type, unvote) {
var notType = (type === 'upvote' ? 'downvote' : 'upvote'); const notType = (type === 'upvote' ? 'downvote' : 'upvote');
if (unvote) { if (unvote) {
await db.setRemove('pid:' + postData.pid + ':' + type, uid); await db.setRemove('pid:' + postData.pid + ':' + type, uid);
} else { } else {

Loading…
Cancel
Save