nodebb-plugin-poll 3.1.4 → 3.1.6

package/languages/en_GB/poll.json

@@ -44,5 +44,7 @@
 
   "vote_count": "users voted for this option",
   "votes": "votes",
+  "x-votes": "%1 votes",
+  "total-votes-x": "Total Votes: %1",
   "admin.create-poll": "Create Poll"
 }

package/languages/en_US/poll.json

@@ -43,5 +43,8 @@
   "vote_is_final": "Changing your vote is not allowed for this poll so your vote is final",
 
   "vote_count": "users voted for this option",
-  "votes": "votes"
+  "votes": "votes",
+  "x-votes": "%1 votes",
+  "total-votes-x": "Total Votes: %1",
+  "admin.create-poll": "Create Poll"
 }

package/lib/nodebb.js

@@ -8,6 +8,7 @@ module.exports = {
 	Posts: require.main.require('./src/posts'),
 	Topics: require.main.require('./src/topics'),
 	Privileges: require.main.require('./src/privileges'),
+	Plugins: require.main.require('./src/plugins'),
 	PluginSockets: require.main.require('./src/socket.io/plugins'),
 	AdminSockets: require.main.require('./src/socket.io/admin').plugins,
 	SocketIndex: require.main.require('./src/socket.io/index'),

package/lib/poll.js

@@ -37,17 +37,17 @@ const Scheduler = require('./scheduler');
 				async.apply(async.series, [
 					// Save poll options in parallel
 					async.apply(
-						async.parallel, 
+						async.parallel,
 						pollData.options.map(
-							(option) => async.apply(NodeBB.db.setObject, `poll:${pollId}:options:${option.id}`, option)
+							option => async.apply(NodeBB.db.setObject, `poll:${pollId}:options:${option.id}`, option)
 						),
 					),
-					// Add poll option id to option list synchronously 
+					// Add poll option id to option list synchronously
 					// To avoid race condition causing duplicate error
 					async.apply(
 						async.series,
 						pollData.options.map(
-							(option) => async.apply(NodeBB.db.setAdd, `poll:${pollId}:options`, option.id)
+							option => async.apply(NodeBB.db.setAdd, `poll:${pollId}:options`, option.id)
 						),
 					),
 				]),
@@ -56,7 +56,6 @@ const Scheduler = require('./scheduler');
 				async.apply(NodeBB.db.listAppend, 'polls', pollId),
 				async.apply(NodeBB.db.setObjectField, `topic:${poll.tid}`, 'pollId', pollId),
 			], (err) => {
-
 				if (err) {
 					return callback(err);
 				}

package/lib/sockets.js

@@ -36,8 +36,7 @@ const Vote = require('./vote');
 			}
 
 			pollData.optionType = parseInt(pollData.settings.maxvotes, 10) > 1 ? 'checkbox' : 'radio';
-
-			return callback(null, pollData);
+			callback(null, pollData);
 		});
 	};
 
@@ -188,22 +187,34 @@ const Vote = require('./vote');
 		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, (err, result) => {
+		async.parallel({
+			poll: function (next) {
+				Poll.getInfo(data.pollId, next);
+			},
+			option: function (next) {
+				Poll.getOption(data.pollId, data.optionId, true, next);
+			},
+		}, (err, result) => {
 			if (err) {
 				return callback(new Error('Something went wrong!'));
 			}
-
-			if (!result.votes || !result.votes.length) {
-				return callback(null, result);
+			const { poll, option } = result;
+			if (!option.votes || !option.votes.length) {
+				return callback(null, option);
 			}
 
-			NodeBB.User.getUsersFields(result.votes, ['uid', 'username', 'userslug', 'picture'], (err, userData) => {
+			NodeBB.User.getUsersFields(option.votes, ['uid', 'username', 'userslug', 'picture'], (err, userData) => {
 				if (err) {
 					console.error(err);
+					return callback(err);
 				}
-				result.votes = userData;
-				callback(null, result);
+				option.votes = userData;
+				NodeBB.Plugins.hooks.fire('filter:poll.getOptionDetails', {
+					poll,
+					option,
+				}, (err, result) => {
+					callback(err, result.option);
+				});
 			});
 		});
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-poll",
-  "version": "3.1.4",
+  "version": "3.1.6",
   "description": "NodeBB Poll Plugin",
   "main": "library.js",
   "scripts": {

package/public/js/poll/main.js

@@ -16,6 +16,14 @@ window.Poll = {};
 		}
 	});
 
+	$(window).on('action:posts.loaded', function (ev, data) {
+		data.posts.forEach((post) => {
+			if (post.hasOwnProperty('pollId')) {
+				getPoll(post.pollId);
+			}
+		});
+	});
+
 	$(window).on('action:posts.edited', function (ev, data) {
 		if (data.post.hasOwnProperty('pollId')) {
 			getPoll(data.post.pollId);

package/public/js/poll/view.js

@@ -227,10 +227,14 @@
 
 		this.pollData.options.forEach(function (option) {
 			var el = this.dom.resultsPanel.find('[data-poll-option-id=' + option.id + ']');
-			el.find('.poll-result-votecount span').text(option.voteCount);
+			el.find('.poll-result-votecount span').translateText(`[[poll:x-votes, ${option.voteCount}]]`);
 			el.find('.poll-result-progressbar').css('width', option.percentage + '%')
 				.find('span.percent').text(option.percentage);
 		}, this);
+
+		this.dom.resultsPanel
+			.find('.poll-result-total-votecount')
+			.translateText(`[[poll:total-votes-x, ${pollData.info.voteCount}]]`);
 	};
 
 	View.prototype.showMessage = function (title, content) {

package/templates/poll/view/results.tpl

@@ -3,7 +3,7 @@
     <div class="d-flex justify-content-between mb-1">
         <strong>{poll.options.title}</strong>
         <a class="poll-result-votecount small" href="#">
-            <span>{poll.options.voteCount}</span> [[poll:votes]]
+            <span>[[poll:x-votes, {poll.options.voteCount}]]</span>
         </a>
     </div>
     <div class="progress">

package/templates/poll/view.tpl

@@ -15,6 +15,7 @@
             </div>
             <div class="poll-view-results d-flex flex-column gap-3 mb-3 <!-- IF !poll.hasVoted -->hidden<!-- ENDIF !poll.hasVoted -->">
                 <!-- IMPORT poll/view/results.tpl -->
+                <div class="text-end text-sm text-secondary poll-result-total-votecount">[[poll:total-votes-x, {poll.info.voteCount}]]</div>
             </div>
 
             <div class="poll-view-buttons">