nodebb-plugin-poll 1.1.7 → 2.0.2

package/lib/sockets.js

@@ -1,21 +1,20 @@
-"use strict";
+'use strict';
 
-var async = require('async'),
+const async = require('async');
 
-	NodeBB = require('./nodebb'),
+const NodeBB = require('./nodebb');
 
-	Config = require('./config'),
-	Poll = require('./poll'),
-	Vote = require('./vote');
+const Config = require('./config');
+const Poll = require('./poll');
+const Vote = require('./vote');
 
-(function(Sockets) {
-
-	Sockets.getConfig = function(socket, data, callback) {
+(function (Sockets) {
+	Sockets.getConfig = function (socket, data, callback) {
 		callback(null, Config.settings.get());
 	};
 
-	Sockets.get = function(socket, data, callback) {
-		var allowAnon = Config.settings.get('toggles.allowAnon');
+	Sockets.get = function (socket, data, callback) {
+		const allowAnon = Config.settings.get('toggles.allowAnon');
 
 		if (!data) {
 			return callback(new Error('Invalid request, request data is not defined'));
@@ -27,8 +26,11 @@ var async = require('async'),
 			return callback(new Error('Invalid request, anonymous access is not allowed'));
 		}
 
-		var pollId = parseInt(data.pollId, 10);
-		Poll.get(pollId, socket.uid, !!socket.uid, function(err, pollData) {
+		const pollId = parseInt(data.pollId, 10);
+		Poll.get(pollId, socket.uid, !!socket.uid, (err, pollData) => {
+			if (err) {
+				console.error(err);
+			}
 			if (!pollData.info.version) {
 				return callback(new Error('Legacy polls are not supported'));
 			}
@@ -39,7 +41,7 @@ var async = require('async'),
 		});
 	};
 
-	Sockets.vote = function(socket, data, callback) {
+	Sockets.vote = function (socket, data, callback) {
 		if (!socket.uid) {
 			return callback(new Error('You need to be logged in to vote'));
 		}
@@ -50,36 +52,38 @@ var async = require('async'),
 		data.uid = socket.uid;
 
 		async.parallel({
-			canVote: function(next) {
+			canVote: function (next) {
 				Vote.canVote(data.uid, data.pollId, next);
 			},
-			optionsFilter: function(next) {
+			optionsFilter: function (next) {
 				Poll.hasOptions(data.pollId, data.options, next);
 			},
-			settings: function(next) {
+			settings: function (next) {
 				Poll.getSettings(data.pollId, next);
-			}
-		}, function(err, result) {
+			},
+		}, (err, result) => {
 			// Filter the options on their existence
-			data.options = data.options.filter(function(el, index) {
-				return result.optionsFilter[index];
-			});
+			data.options = data.options.filter((el, index) => result.optionsFilter[index]);
 
 			// Give an error if there are too many votes
 			if (data.options.length > parseInt(result.settings.maxvotes, 10)) {
-				return callback(new Error('You can only vote for ' + result.settings.maxvotes + ' options on this poll.'));
+				return callback(new Error(`You can only vote for ${result.settings.maxvotes} options on this poll.`));
 			}
 
 			if (err || !result.canVote || !data.options.length) {
 				return callback(new Error('Already voted or invalid option'));
 			}
 
-			Vote.add(data, function(err) {
+			Vote.add(data, (err) => {
 				if (err) {
 					return callback(new Error('Error during voting'));
 				}
 
-				Poll.get(data.pollId, socket.uid, false, function(err, pollData) {
+				Poll.get(data.pollId, socket.uid, false, (err, pollData) => {
+					if (err) {
+						console.error(err);
+					}
+
 					NodeBB.SocketIndex.server.sockets.emit('event:poll.voteChange', pollData);
 
 					callback();
@@ -88,7 +92,7 @@ var async = require('async'),
 		});
 	};
 
-	Sockets.updateVote = function(socket, data, callback) {
+	Sockets.updateVote = function (socket, data, callback) {
 		if (!socket.uid) {
 			return callback(new Error('You need to be logged in to make changes'));
 		}
@@ -98,39 +102,43 @@ var async = require('async'),
 		data.uid = socket.uid;
 
 		async.parallel({
-			canUpdateVote: function(next) {
+			canUpdateVote: function (next) {
 				Vote.canUpdateVote(data.uid, data.pollId, next);
 			},
-			optionsFilter: function(next) {
+			optionsFilter: function (next) {
 				Poll.hasOptions(data.pollId, data.options, next);
 			},
-			settings: function(next) {
+			settings: function (next) {
 				Poll.getSettings(data.pollId, next);
-			}
-		}, function(err, result) {
+			},
+		}, (err, result) => {
 			// Filter the options on their existence
-			data.options = data.options.filter(function(el, index) {
-				return result.optionsFilter[index];
-			});
+			data.options = data.options.filter((el, index) => result.optionsFilter[index]);
 
 			// Give an error if there are too many votes
 			if (data.options.length > parseInt(result.settings.maxvotes, 10)) {
-				return callback(new Error('You can only vote for ' + result.settings.maxvotes + ' options on this poll.'));
+				return callback(new Error(`You can only vote for ${result.settings.maxvotes} options on this poll.`));
 			}
 			if (!result.canUpdateVote) {
 				return callback(new Error('Can\'t update vote'));
 			}
 			if (err || !data.options.length) {
-				err && console.error(err);
+				if (err) {
+					console.error(err);
+				}
 				return callback(new Error('Invalid option'));
 			}
 
-			Vote.update(data, function(err) {
+			Vote.update(data, (err) => {
 				if (err) {
 					return callback(new Error('Error during updating vote'));
 				}
 
-				Poll.get(data.pollId, socket.uid, false, function(err, pollData) {
+				Poll.get(data.pollId, socket.uid, false, (err, pollData) => {
+					if (err) {
+						console.error(err);
+					}
+
 					NodeBB.SocketIndex.server.sockets.emit('event:poll.voteChange', pollData);
 
 					callback();
@@ -139,7 +147,7 @@ var async = require('async'),
 		});
 	};
 
-	Sockets.removeVote = function(socket, data, callback) {
+	Sockets.removeVote = function (socket, data, callback) {
 		if (!socket.uid) {
 			return callback(new Error('You need to be logged in to make changes'));
 		}
@@ -149,10 +157,10 @@ var async = require('async'),
 		data.uid = socket.uid;
 
 		async.parallel({
-			canUpdateVote: function(next) {
+			canUpdateVote: function (next) {
 				Vote.canUpdateVote(data.uid, data.pollId, next);
-			}
-		}, function(err, result) {
+			},
+		}, (err, result) => {
 			if (!result.canUpdateVote) {
 				return callback(new Error('Can\'t remove vote'));
 			}
@@ -160,11 +168,15 @@ var async = require('async'),
 				console.error(err);
 				return callback(new Error('Something went wrong'));
 			}
-			Vote.remove(data, function(err) {
+			Vote.remove(data, (err) => {
 				if (err) {
 					return callback(new Error('Error during removing vote'));
 				}
-				Poll.get(data.pollId, socket.uid, false, function(err, pollData) {
+				Poll.get(data.pollId, socket.uid, false, (err, pollData) => {
+					if (err) {
+						console.error(err);
+					}
+
 					NodeBB.SocketIndex.server.sockets.emit('event:poll.voteChange', pollData);
 					callback();
 				});
@@ -172,12 +184,12 @@ var async = require('async'),
 		});
 	};
 
-	Sockets.getOptionDetails = function(socket, data, callback) {
+	Sockets.getOptionDetails = function (socket, data, callback) {
 		if (!socket.uid || !data || isNaN(parseInt(data.pollId, 10)) || isNaN(parseInt(data.optionId, 10))) {
 			return callback(new Error('Invalid request'));
 		}
 
-		Poll.getOption(data.pollId, data.optionId, true, function(err, result) {
+		Poll.getOption(data.pollId, data.optionId, true, (err, result) => {
 			if (err) {
 				return callback(new Error('Something went wrong!'));
 			}
@@ -186,14 +198,17 @@ var async = require('async'),
 				return callback(null, result);
 			}
 
-			NodeBB.User.getUsersFields(result.votes, ['uid', 'username', 'userslug', 'picture'], function(err, userData) {
+			NodeBB.User.getUsersFields(result.votes, ['uid', 'username', 'userslug', 'picture'], (err, userData) => {
+				if (err) {
+					console.error(err);
+				}
 				result.votes = userData;
 				callback(null, result);
-			})
+			});
 		});
 	};
 
-	Sockets.canCreate = function(socket, data, callback) {
+	Sockets.canCreate = function (socket, data, callback) {
 		if (!socket.uid || !data || (isNaN(parseInt(data.cid, 10)) && isNaN(parseInt(data.pid, 10)))) {
 			return callback(new Error('Invalid request'));
 		}
@@ -204,8 +219,7 @@ var async = require('async'),
 					NodeBB.Posts.getPostField(data.pid, 'tid', next);
 				},
 				function (tid, next) {
-
-					NodeBB.Topics.getTopicField(tid, 'cid', function(err, cid) {
+					NodeBB.Topics.getTopicField(tid, 'cid', (err, cid) => {
 						if (err) {
 							console.error(err);
 							return callback(new Error('Invalid request'));
@@ -213,24 +227,21 @@ var async = require('async'),
 						next(null, cid);
 					});
 				},
-				function (cid, next) {
+				function (cid) {
 					checkPrivs(cid, socket.uid, callback);
-				}
+				},
 			]);
-		}
-		else {
+		} else {
 			checkPrivs(data.cid, socket.uid, callback);
 		}
 	};
 
 	function checkPrivs(cid, socketUid, callback) {
-		NodeBB.Privileges.categories.can('poll:create', cid, socketUid, function (err, can) {
+		NodeBB.Privileges.categories.can('poll:create', cid, socketUid, (err, can) => {
 			if (err || !can) {
 				return callback(new Error('[[poll:error.privilege.create]]'), can);
-			} else {
-				return callback(null, can);
 			}
+			return callback(null, can);
 		});
 	}
-
-})(exports);
+}(exports));

package/lib/vote.js

@@ -1,28 +1,27 @@
-"use strict";
+'use strict';
 
-var async = require('async'),
-	NodeBB = require('./nodebb'),
-	Poll = require('./poll');
+const async = require('async');
+const NodeBB = require('./nodebb');
+const Poll = require('./poll');
 
-(function(Vote) {
-
-	Vote.add = function(voteData, callback) {
-		var pollId = voteData.pollId,
-			options = voteData.options,
-			uid = voteData.uid,
-			timestamp = +new Date;
+(function (Vote) {
+	Vote.add = function (voteData, callback) {
+		const { pollId } = voteData;
+		const { options } = voteData;
+		const { uid } = voteData;
+		const timestamp = +new Date();
 
 		async.parallel([
-			function(next) {
-				async.each(options, function(option, next) {
+			function (next) {
+				async.each(options, (option, next) => {
 					// Add uid to list of votes
-					NodeBB.db.sortedSetAdd('poll:' + pollId + ':options:' + option + ':votes', timestamp, uid, next);
+					NodeBB.db.sortedSetAdd(`poll:${pollId}:options:${option}:votes`, timestamp, uid, next);
 				}, next);
 			},
-			function(next) {
-				NodeBB.db.sortedSetAdd('poll:' + pollId + ':voters', timestamp, uid, next);
-			}
-		], function(err) {
+			function (next) {
+				NodeBB.db.sortedSetAdd(`poll:${pollId}:voters`, timestamp, uid, next);
+			},
+		], (err) => {
 			if (err) {
 				return callback(err, false);
 			}
@@ -31,7 +30,7 @@ var async = require('async'),
 		});
 	};
 
-	Vote.remove = function(voteData, callback) {
+	Vote.remove = function (voteData, callback) {
 		return Vote.removeUidVote(voteData.uid, voteData.pollId, callback);
 	};
 
@@ -39,18 +38,22 @@ var async = require('async'),
 		return Vote.getUidVote(voteData.uid, voteData.pollId, callback);
 	};
 
-	Vote.removeUidVote = function(uid, pollId, callback) {
-		Vote.getUidVote(uid, pollId, function (err, vote) {
+	Vote.removeUidVote = function (uid, pollId, callback) {
+		Vote.getUidVote(uid, pollId, (err, vote) => {
+			if (err) {
+				console.error(err);
+			}
+
 			async.parallel([
-				function(next) {
-					async.each(vote.options || [], function(option, next) {
-						NodeBB.db.sortedSetRemove('poll:' + pollId + ':options:' + option + ':votes', uid, next);
+				function (next) {
+					async.each(vote.options || [], (option, next) => {
+						NodeBB.db.sortedSetRemove(`poll:${pollId}:options:${option}:votes`, uid, next);
 					}, next);
 				},
-				function(next) {
-					NodeBB.db.sortedSetRemove('poll:' + pollId + ':voters', uid, next);
-				}
-			], function(err) {
+				function (next) {
+					NodeBB.db.sortedSetRemove(`poll:${pollId}:voters`, uid, next);
+				},
+			], (err) => {
 				if (err) {
 					return callback(err, false);
 				}
@@ -60,14 +63,14 @@ var async = require('async'),
 		});
 	};
 
-	Vote.getUidVote = function(uid, pollId, callback) {
-		Poll.getOptions(pollId, true, function (err, options) {
+	Vote.getUidVote = function (uid, pollId, callback) {
+		Poll.getOptions(pollId, true, (err, options) => {
 			callback(err, {
 				pollId: pollId,
 				uid: uid,
 				options: options
-					.filter(option => option.votes.some(_uid => _uid == uid))
-					.map(option => option.id)
+					.filter(option => option.votes.some(_uid => parseInt(_uid, 10) === parseInt(uid, 10)))
+					.map(option => option.id),
 			});
 		});
 	};
@@ -79,58 +82,57 @@ var async = require('async'),
 			},
 			function (next) {
 				Vote.add(voteData, next);
-			}
+			},
 		], callback);
 	};
 
-	Vote.canUpdateVote = function(uid, pollId, callback) {
+	Vote.canUpdateVote = function (uid, pollId, callback) {
 		async.parallel([
-			function(next) {
+			function (next) {
 				// Ended?
 				Poll.hasEnded(pollId, next);
 			},
-			function(next) {
+			function (next) {
 				// Deleted?
 				Poll.isDeleted(pollId, next);
 			},
-			function(next) {
+			function (next) {
 				// voteUpdate?
 				Poll.doesDisallowVoteUpdate(pollId, next);
-			}
-		], function(err, result) {
+			},
+		], (err, result) => {
 			callback(err, result.indexOf(true) === -1);
 		});
 	};
 
-	Vote.canVote = function(uid, pollId, callback) {
+	Vote.canVote = function (uid, pollId, callback) {
 		async.parallel([
-			function(next) {
+			function (next) {
 				// Ended?
 				Poll.hasEnded(pollId, next);
 			},
-			function(next) {
+			function (next) {
 				// Deleted?
 				Poll.isDeleted(pollId, next);
 			},
-			function(next) {
+			function (next) {
 				// Already voted?
 				Vote.hasUidVoted(uid, pollId, next);
-			}
-		], function(err, result) {
+			},
+		], (err, result) => {
 			callback(err, result.indexOf(true) === -1);
 		});
 	};
 
-	Vote.hasUidVoted = function(uid, pollId, callback) {
-		NodeBB.db.sortedSetScore('poll:' + pollId + ':voters', uid, function (err, score) {
-			callback(err, !!score)
+	Vote.hasUidVoted = function (uid, pollId, callback) {
+		NodeBB.db.sortedSetScore(`poll:${pollId}:voters`, uid, (err, score) => {
+			callback(err, !!score);
 		});
 	};
 
-	Vote.hasUidVotedOnOption = function(uid, pollId, option, callback) {
-		NodeBB.db.sortedSetScore('poll:' + pollId + ':options:' + option + ':votes', uid, function (err, score) {
-			callback(err, !!score)
+	Vote.hasUidVotedOnOption = function (uid, pollId, option, callback) {
+		NodeBB.db.sortedSetScore(`poll:${pollId}:options:${option}:votes`, uid, (err, score) => {
+			callback(err, !!score);
 		});
 	};
-
-})(exports);
+}(exports));

package/library.js

@@ -1,22 +1,21 @@
-"use strict";
+'use strict';
 
-var	NodeBB = require('./lib/nodebb'),
-	Config = require('./lib/config'),
-	Sockets = require('./lib/sockets'),
-	Hooks = require('./lib/hooks'),
-	Scheduler = require('./lib/scheduler');
-
-(function(Plugin) {
+const	NodeBB = require('./lib/nodebb');
+const Config = require('./lib/config');
+const Sockets = require('./lib/sockets');
+const Hooks = require('./lib/hooks');
+const Scheduler = require('./lib/scheduler');
 
+(function (Plugin) {
 	Plugin.hooks = Hooks;
 
-	Plugin.load = function(params, callback) {
-		function renderAdmin(req, res, next) {
-			res.render('admin/plugins/' + Config.plugin.id, {});
+	Plugin.load = function (params, callback) {
+		function renderAdmin(req, res) {
+			res.render(`admin/plugins/${Config.plugin.id}`, {});
 		}
 
-		params.router.get('/admin/plugins/' + Config.plugin.id, params.middleware.admin.buildHeader, renderAdmin);
-		params.router.get('/api/admin/plugins/' + Config.plugin.id, renderAdmin);
+		params.router.get(`/admin/plugins/${Config.plugin.id}`, params.middleware.admin.buildHeader, renderAdmin);
+		params.router.get(`/api/admin/plugins/${Config.plugin.id}`, renderAdmin);
 
 		NodeBB.PluginSockets[Config.plugin.id] = Sockets;
 		NodeBB.AdminSockets[Config.plugin.id] = Config.adminSockets;
@@ -27,50 +26,49 @@ var	NodeBB = require('./lib/nodebb'),
 		Config.init(callback);
 	};
 
-	Plugin.addAdminNavigation = function(adminHeader, callback) {
+	Plugin.addAdminNavigation = function (adminHeader, callback) {
 		adminHeader.plugins.push({
-			route: '/plugins/' + Config.plugin.id,
+			route: `/plugins/${Config.plugin.id}`,
 			icon: Config.plugin.icon,
-			name: Config.plugin.name
+			name: Config.plugin.name,
 		});
 
 		callback(null, adminHeader);
 	};
 
-	Plugin.registerFormatting = function(payload, callback) {
+	Plugin.registerFormatting = function (payload, callback) {
 		payload.options.push({
 			name: 'poll',
-			className: 'fa ' + Config.plugin.icon,
-			title: '[[poll:creator_title]]'
+			className: `fa ${Config.plugin.icon}`,
+			title: '[[poll:creator_title]]',
 		});
 
 		callback(null, payload);
 	};
 
-	Plugin.addUserPrivilege = function(privileges, callback) {
+	Plugin.addUserPrivilege = function (privileges, callback) {
 		privileges.push('poll:create');
 		callback(null, privileges);
 	};
 
-	Plugin.addPrivilegeLabels = function(labels, callback) {
-		labels.push({name: 'Create Poll'});
+	Plugin.addPrivilegeLabels = function (labels, callback) {
+		labels.push({ name: 'Create Poll' });
 		callback(null, labels);
 	};
 
-	Plugin.addGroupPrivilege = function(privileges, callback) {
+	Plugin.addGroupPrivilege = function (privileges, callback) {
 		privileges.push('groups:poll:create');
 		callback(null, privileges);
 	};
 
 	Plugin.copyPrivilegesFrom = function (data, callback) {
-		if (data.privileges.indexOf('poll:create') == -1) {
+		if (data.privileges.indexOf('poll:create') === -1) {
 			data.privileges.push('poll:create');
 		}
 
-		if (data.privileges.indexOf('groups:poll:create') == -1) {
+		if (data.privileges.indexOf('groups:poll:create') === -1) {
 			data.privileges.push('groups:poll:create');
 		}
 		callback(null, data);
 	};
-
-})(exports);
+}(exports));