nodebb-plugin-poll 1.1.7 → 2.0.2

package/lib/poll.js

@@ -1,23 +1,22 @@
-"use strict";
+'use strict';
 
-var async = require('async'),
+const async = require('async');
 
-	NodeBB = require('./nodebb'),
+const NodeBB = require('./nodebb');
 
-	Vote = require('./vote'),
-	Scheduler = require('./scheduler');
+const Vote = require('./vote');
+const Scheduler = require('./scheduler');
 
-(function(Poll) {
+(function (Poll) {
+	const POLL_DATA_VERSION = 2;
 
-	var POLL_DATA_VERSION = 2;
-
-	Poll.add = function(pollData, postData, callback) {
-		NodeBB.db.incrObjectField('global', 'nextPollId', function(err, pollId) {
+	Poll.add = function (pollData, postData, callback) {
+		NodeBB.db.incrObjectField('global', 'nextPollId', (err, pollId) => {
 			if (err) {
 				return callback(err);
 			}
 
-			var poll = {
+			const poll = {
 				pollId: pollId,
 				uid: postData.editor || postData.uid,
 				tid: postData.tid,
@@ -25,29 +24,27 @@ var async = require('async'),
 				deleted: 0,
 				ended: 0,
 				timestamp: postData.edited || postData.timestamp,
-				version: POLL_DATA_VERSION
+				version: POLL_DATA_VERSION,
 			};
 
-			pollData.options = pollData.options.map(function(val, i) {
-				return {
-					id: i,
-					title: val
-				};
-			});
+			pollData.options = pollData.options.map((val, i) => ({
+				id: i,
+				title: val,
+			}));
 
 			// async this bitch up
 			async.parallel([
-				async.apply(async.each, pollData.options, function(option, next) {
+				async.apply(async.each, pollData.options, (option, next) => {
 					async.series([
-						async.apply(NodeBB.db.setObject, 'poll:' + pollId + ':options:' + option.id, option),
-						async.apply(NodeBB.db.setAdd, 'poll:' + pollId + ':options', option.id)
+						async.apply(NodeBB.db.setObject, `poll:${pollId}:options:${option.id}`, option),
+						async.apply(NodeBB.db.setAdd, `poll:${pollId}:options`, option.id),
 					], next);
 				}),
-				async.apply(NodeBB.db.setObject, 'poll:' + pollId, poll),
-				async.apply(NodeBB.db.setObject, 'poll:' + pollId + ':settings', pollData.settings),
+				async.apply(NodeBB.db.setObject, `poll:${pollId}`, poll),
+				async.apply(NodeBB.db.setObject, `poll:${pollId}:settings`, pollData.settings),
 				async.apply(NodeBB.db.listAppend, 'polls', pollId),
-				async.apply(NodeBB.db.setObjectField, 'topic:' + poll.tid, 'pollId', pollId)
-			], function(err) {
+				async.apply(NodeBB.db.setObjectField, `topic:${poll.tid}`, 'pollId', pollId),
+			], (err) => {
 				if (err) {
 					return callback(err);
 				}
@@ -62,18 +59,18 @@ var async = require('async'),
 		});
 	};
 
-	Poll.get = function(pollId, uid, withVotes, callback) {
+	Poll.get = function (pollId, uid, withVotes, callback) {
 		async.parallel({
-			info: function(next) {
+			info: function (next) {
 				Poll.getInfo(pollId, next);
 			},
-			options: function(next) {
+			options: function (next) {
 				Poll.getOptions(pollId, withVotes, next);
 			},
-			settings: function(next) {
+			settings: function (next) {
 				Poll.getSettings(pollId, next);
 			},
-			hasVoted: function(next) {
+			hasVoted: function (next) {
 				if (uid) {
 					Vote.hasUidVoted(uid, pollId, next);
 				} else {
@@ -86,13 +83,13 @@ var async = require('async'),
 				} else {
 					next(null, null);
 				}
-			}
-		}, function(err, pollData) {
+			},
+		}, (err, pollData) => {
 			if (err) {
 				return callback(err);
 			}
-			pollData.options.forEach(function(option) {
-				var percentage = ((option.voteCount / pollData.info.voteCount) * 100).toFixed(0);
+			pollData.options.forEach((option) => {
+				const percentage = ((option.voteCount / pollData.info.voteCount) * 100).toFixed(0);
 				option.percentage = isNaN(percentage) ? 0 : percentage;
 			});
 			pollData.settings.disallowVoteUpdate = parseInt(pollData.settings.disallowVoteUpdate, 10);
@@ -100,63 +97,63 @@ var async = require('async'),
 		});
 	};
 
-	Poll.getPollIdByTid = function(tid, callback) {
-		NodeBB.db.getObjectField('topic:' + tid, 'pollId', callback);
+	Poll.getPollIdByTid = function (tid, callback) {
+		NodeBB.db.getObjectField(`topic:${tid}`, 'pollId', callback);
 	};
 
-	Poll.getPollIdByPid = function(pid, callback) {
-		NodeBB.db.getObjectField('post:' + pid, 'pollId', callback);
+	Poll.getPollIdByPid = function (pid, callback) {
+		NodeBB.db.getObjectField(`post:${pid}`, 'pollId', callback);
 	};
 
-	Poll.getInfo = function(pollId, callback) {
+	Poll.getInfo = function (pollId, callback) {
 		async.parallel({
 			poll: function (next) {
-				NodeBB.db.getObject('poll:' + pollId, next);
+				NodeBB.db.getObject(`poll:${pollId}`, next);
 			},
 			voteCount: function (next) {
-				Poll.getVoteCount(pollId, next)
-			}
-		}, function (err, results) {
+				Poll.getVoteCount(pollId, next);
+			},
+		}, (err, results) => {
 			if (err) {
 				return callback(err);
 			}
 			results.poll.voteCount = parseInt(results.voteCount, 10) || 0;
-			callback(null, results.poll)
-		})
+			callback(null, results.poll);
+		});
 	};
 
-	Poll.getOptions = function(pollId, withVotes, callback) {
+	Poll.getOptions = function (pollId, withVotes, callback) {
 		if (typeof withVotes === 'function') {
 			callback = withVotes;
 			withVotes = false;
 		}
 
-		NodeBB.db.getSetMembers('poll:' + pollId + ':options', function(err, options) {
+		NodeBB.db.getSetMembers(`poll:${pollId}:options`, (err, options) => {
 			if (err) {
 				return callback(err);
 			}
-			async.map(options, function(option, next) {
+			async.map(options, (option, next) => {
 				Poll.getOption(pollId, option, withVotes, next);
 			}, callback);
 		});
 	};
 
-	Poll.getOption = function(pollId, option, withVotes, callback) {
+	Poll.getOption = function (pollId, option, withVotes, callback) {
 		async.parallel({
-			option: function(next) {
-				NodeBB.db.getObject('poll:' + pollId + ':options:' + option, next);
+			option: function (next) {
+				NodeBB.db.getObject(`poll:${pollId}:options:${option}`, next);
 			},
-			votes: function(next) {
+			votes: function (next) {
 				if (withVotes) {
-					NodeBB.db.getSortedSetRange('poll:' + pollId + ':options:' + option + ':votes', 0, -1, next);
+					NodeBB.db.getSortedSetRange(`poll:${pollId}:options:${option}:votes`, 0, -1, next);
 				} else {
 					next();
 				}
 			},
-			voteCount: function(next) {
+			voteCount: function (next) {
 				Poll.getOptionVoteCount(pollId, option, next);
-			}
-		}, function(err, results) {
+			},
+		}, (err, results) => {
 			if (err) {
 				return callback(err);
 			}
@@ -170,14 +167,18 @@ var async = require('async'),
 	};
 
 	Poll.getVotersCount = function (pollId, callback) {
-		NodeBB.db.sortedSetCard('poll:' + pollId + ':voters', callback);
+		NodeBB.db.sortedSetCard(`poll:${pollId}:voters`, callback);
 	};
 
 	Poll.getVoteCount = function (pollId, callback) {
-		NodeBB.db.getSetMembers('poll:' + pollId + ':options', function(err, options) {
-			async.map(options, function(option, next) {
+		NodeBB.db.getSetMembers(`poll:${pollId}:options`, (err, options) => {
+			if (err) {
+				console.error(err);
+			}
+
+			async.map(options, (option, next) => {
 				Poll.getOptionVoteCount(pollId, option, next);
-			}, function (err, results) {
+			}, (err, results) => {
 				if (err) {
 					return callback(err);
 				}
@@ -187,112 +188,111 @@ var async = require('async'),
 	};
 
 	Poll.getOptionVoteCount = function (pollId, option, callback) {
-		NodeBB.db.sortedSetCard('poll:' + pollId + ':options:' + option + ':votes', callback);
+		NodeBB.db.sortedSetCard(`poll:${pollId}:options:${option}:votes`, callback);
 	};
 
-	Poll.hasOption = function(pollId, option, callback) {
-		NodeBB.db.isSetMember('poll:' + pollId + ':options', option, callback);
+	Poll.hasOption = function (pollId, option, callback) {
+		NodeBB.db.isSetMember(`poll:${pollId}:options`, option, callback);
 	};
 
-	Poll.hasOptions = function(pollId, options, callback) {
-		NodeBB.db.isSetMembers('poll:' + pollId + ':options', options, callback);
+	Poll.hasOptions = function (pollId, options, callback) {
+		NodeBB.db.isSetMembers(`poll:${pollId}:options`, options, callback);
 	};
 
-	Poll.getSettings = function(pollId, callback) {
-		NodeBB.db.getObject('poll:' + pollId + ':settings', callback);
+	Poll.getSettings = function (pollId, callback) {
+		NodeBB.db.getObject(`poll:${pollId}:settings`, callback);
 	};
 
-	Poll.isDeleted = function(pollId, callback) {
-		Poll.getField(pollId, 'deleted', function(err, result) {
+	Poll.isDeleted = function (pollId, callback) {
+		Poll.getField(pollId, 'deleted', (err, result) => {
 			callback(err, parseInt(result, 10) === 1);
 		});
 	};
 
-	Poll.delete = function(pollId) {
+	Poll.delete = function (pollId) {
 		Poll.setField(pollId, 'deleted', 1);
 	};
 
-	Poll.restore = function(pollId) {
+	Poll.restore = function (pollId) {
 		Poll.setField(pollId, 'edited', 0);
 		Poll.setField(pollId, 'deleted', 0);
 	};
 
-	Poll.schedule = function(pollId) {
+	Poll.schedule = function (pollId) {
 		NodeBB.db.setAdd('polls:scheduled', pollId);
 		Scheduler.add(pollId);
 	};
 
-	Poll.getScheduled = function(callback) {
+	Poll.getScheduled = function (callback) {
 		NodeBB.db.getSetMembers('polls:scheduled', callback);
 	};
 
-	Poll.hasEnded = function(pollId, callback) {
-		Poll.getField(pollId, 'ended', function(err, result) {
+	Poll.hasEnded = function (pollId, callback) {
+		Poll.getField(pollId, 'ended', (err, result) => {
 			callback(err, parseInt(result, 10) === 1);
 		});
 	};
 
-	Poll.doesDisallowVoteUpdate = function(pollId, callback) {
-		Poll.getSettingsField(pollId, 'disallowVoteUpdate', function(err, result) {
+	Poll.doesDisallowVoteUpdate = function (pollId, callback) {
+		Poll.getSettingsField(pollId, 'disallowVoteUpdate', (err, result) => {
 			callback(err, parseInt(result, 10) === 1);
 		});
 	};
 
-	Poll.doesAllowVoteUpdate = function(pollId, callback) {
-		Poll.getSettingsField(pollId, 'disallowVoteUpdate', function(err, result) {
+	Poll.doesAllowVoteUpdate = function (pollId, callback) {
+		Poll.getSettingsField(pollId, 'disallowVoteUpdate', (err, result) => {
 			callback(err, parseInt(result, 10) !== 1);
 		});
 	};
 
-	Poll.end = function(pollId) {
+	Poll.end = function (pollId) {
 		NodeBB.db.setRemove('polls:scheduled', pollId);
 		Poll.setField(pollId, 'ended', 1);
 	};
 
-	Poll.changePid = function(pollId, pid, callback) {
+	Poll.changePid = function (pollId, pid, callback) {
 		async.parallel([
-			function(next) {
+			function (next) {
 				Poll.setField(pollId, 'pid', pid, next);
 			},
-			function(next) {
-				NodeBB.db.setObjectField('post:' + pid, 'pollId', pollId, next);
-			}
+			function (next) {
+				NodeBB.db.setObjectField(`post:${pid}`, 'pollId', pollId, next);
+			},
 		], callback);
 	};
 
-	Poll.changeTid = function(pollId, tid, callback) {
+	Poll.changeTid = function (pollId, tid, callback) {
 		async.parallel([
-			function(next) {
+			function (next) {
 				Poll.setField(pollId, 'tid', tid, next);
 			},
-			function(next) {
-				NodeBB.db.setObjectField('topic:' + tid, 'pollId', pollId, next);
-			}
+			function (next) {
+				NodeBB.db.setObjectField(`topic:${tid}`, 'pollId', pollId, next);
+			},
 		], callback);
 	};
 
-	Poll.setField = function(pollId, field, value, callback) {
-		NodeBB.db.setObjectField('poll:' + pollId, field, value, callback);
+	Poll.setField = function (pollId, field, value, callback) {
+		NodeBB.db.setObjectField(`poll:${pollId}`, field, value, callback);
 	};
 
-	Poll.setFields = function(pollId, fields, values, callback) {
-		NodeBB.db.setObjectFields('poll:' + pollId, fields, values, callback);
+	Poll.setFields = function (pollId, fields, values, callback) {
+		NodeBB.db.setObjectFields(`poll:${pollId}`, fields, values, callback);
 	};
 
-	Poll.getField = function(pollId, field, callback) {
-		NodeBB.db.getObjectField('poll:' + pollId, field, callback);
+	Poll.getField = function (pollId, field, callback) {
+		NodeBB.db.getObjectField(`poll:${pollId}`, field, callback);
 	};
 
-	Poll.getFields = function(pollId, fields, callback) {
-		NodeBB.db.getObjectFields('poll:' + pollId, fields, callback);
+	Poll.getFields = function (pollId, fields, callback) {
+		NodeBB.db.getObjectFields(`poll:${pollId}`, fields, callback);
 	};
 
-	Poll.getSettingsField = function(pollId, field, callback) {
-		NodeBB.db.getObjectField('poll:' + pollId + ':settings', field, callback);
+	Poll.getSettingsField = function (pollId, field, callback) {
+		NodeBB.db.getObjectField(`poll:${pollId}:settings`, field, callback);
 	};
 
-	Poll.setSettingsField = function(pollId, field, value, callback) {
-		NodeBB.db.setObjectField('poll:' + pollId + ':settings', field, callback);
+	Poll.setSettingsField = function (pollId, field, value, callback) {
+		NodeBB.db.setObjectField(`poll:${pollId}:settings`, field, callback);
 	};
-
-})(exports);
+}(exports));

package/lib/scheduler.js

@@ -1,55 +1,57 @@
-"use strict";
+'use strict';
 
-var NodeBB = require('./nodebb'),
+const cron = require('cron').CronJob;
+const NodeBB = require('./nodebb');
 
-	Poll = require('./poll'),
-	cron = require('cron').CronJob;
+const Poll = require('./poll');
 
-(function(Scheduler) {
+(function (Scheduler) {
+	const jobs = {};
 
-	var jobs = {};
-
-	Scheduler.start = function() {
-		Poll.getScheduled(function(err, pollIds) {
-			pollIds.forEach(function(pollId) {
+	Scheduler.start = function () {
+		Poll.getScheduled((err, pollIds) => {
+			if (err) {
+				console.error(err);
+			}
+			pollIds.forEach((pollId) => {
 				Scheduler.add(pollId);
 			});
 		});
 	};
 
-	Scheduler.add = function(pollId) {
+	Scheduler.add = function (pollId) {
 		if (Object.keys(jobs).indexOf(pollId.toString()) !== -1) {
 			return;
 		}
 
-		Poll.getSettings(pollId, function(err, settings) {
+		Poll.getSettings(pollId, (err, settings) => {
 			if (err) {
 				return NodeBB.winston.error(err);
 			}
 
 			if (!settings) {
-				return NodeBB.winston.error('[nodebb-plugin-poll/scheduler] Poll ID ' + pollId + ' has no settings!');
+				return NodeBB.winston.error(`[nodebb-plugin-poll/scheduler] Poll ID ${pollId} has no settings!`);
 			}
 
-			var now = Date.now(),
-				end = parseInt(settings.end, 10);
+			const now = Date.now();
+			const end = parseInt(settings.end, 10);
 
 			if (end < now) {
 				Scheduler.end(pollId);
 			} else {
-				var date = new Date(end);
-				NodeBB.winston.verbose('[nodebb-plugin-poll/scheduler] Starting scheduler for poll with ID ' + pollId + ' to end on ' + date);
-				jobs[pollId] = new cron(date, function() {
+				const date = new Date(end);
+				NodeBB.winston.verbose(`[nodebb-plugin-poll/scheduler] Starting scheduler for poll with ID ${pollId} to end on ${date}`);
+				jobs[pollId] = new cron(date, (() => {
 					Scheduler.end(pollId);
-				}, null, true);
+				}), null, true);
 			}
 		});
 	};
 
-	Scheduler.end = function(pollId) {
-		NodeBB.winston.verbose('[nodebb-plugin-poll/scheduler] Ending poll with ID ' + pollId);
+	Scheduler.end = function (pollId) {
+		NodeBB.winston.verbose(`[nodebb-plugin-poll/scheduler] Ending poll with ID ${pollId}`);
 
-		var index = Object.keys(jobs).indexOf(pollId.toString());
+		const index = Object.keys(jobs).indexOf(pollId.toString());
 
 		if (index !== -1 && jobs[pollId] !== undefined) {
 			jobs[pollId].stop();
@@ -58,5 +60,4 @@ var NodeBB = require('./nodebb'),
 
 		Poll.end(pollId);
 	};
-
-})(exports);
+}(exports));

package/lib/serializer.js

@@ -1,3 +1,3 @@
-"use strict";
+'use strict';
 
-module.exports = require('../public/js/poll/serializer');
+module.exports = require('../public/js/poll/serializer');