nodebb-plugin-poll 4.0.12 → 4.0.14

package/lib/hooks.js

@@ -44,6 +44,7 @@ Hooks.filter.postCreate = async function (hookData) {
 	// post is going to be saved to db, data is what is submitted by user
 	const { post, data } = hookData;
 	if (Array.isArray(data?.polls) && data.polls.length) {
+		await checkMaxOptions(data.polls);
 		const savedPolls = await Poll.add(post, data.polls);
 		if (savedPolls.length) {
 			post.pollIds = JSON.stringify(savedPolls.map(p => String(p.pollId)));
@@ -73,6 +74,7 @@ Hooks.filter.postEdit = async function (hookData) {
 		return hookData;
 	}
 	const pollData = hookData.data.polls || [];
+	await checkMaxOptions(pollData);
 	const toAdd = pollData.filter(p => !currentPollIds.includes(String(p.pollId)));
 
 	if (toAdd.length) {
@@ -134,3 +136,15 @@ async function canCreate(cid, uid) {
 	}
 }
 
+async function checkMaxOptions(polls) {
+	if (!Array.isArray(polls) || !polls.length) {
+		return;
+	}
+	const { maxOptions } = await Config.getSettings();
+	polls.forEach((poll) => {
+		if (poll && poll.options.length > maxOptions) {
+			throw new Error(`[[poll:error.max_options, ${maxOptions}]]`);
+		}
+	});
+}
+

package/lib/sockets.js

@@ -27,7 +27,8 @@ Sockets.get = async function (socket, data) {
 		return [];
 	}
 	return await Promise.all(data.pollIds.map(async (pollId) => {
-		const pollData = await Poll.get(pollId, socket.uid, !!socket.uid);
+		const withVotes = allowAnon || socket.uid > 0;
+		const pollData = await Poll.get(pollId, socket.uid, withVotes);
 		if (!pollData) {
 			return null;
 		}
@@ -144,18 +145,20 @@ Sockets.removeVote = async function (socket, data) {
 };
 
 Sockets.getOptionDetails = async function (socket, data) {
-	if (!socket.uid || !data || isNaN(parseInt(data.pollId, 10)) || isNaN(parseInt(data.optionId, 10))) {
+	if (!data || isNaN(parseInt(data.pollId, 10)) || isNaN(parseInt(data.optionId, 10))) {
 		throw new Error('Invalid request');
 	}
-	const [poll, option] = await Promise.all([
+	const [poll, option, settings] = await Promise.all([
 		Poll.getInfo(data.pollId),
 		Poll.getOption(data.pollId, data.optionId, true),
+		Config.getSettings(),
 	]);
 	if (!poll) {
 		throw new Error('[[error:invalid-data]]');
 	}
+	const allowAnon = settings.allowGuestsToViewResults === 'on';
 	const canRead = await privileges.posts.can('topics:read', poll.pid, socket.uid);
-	if (!canRead) {
+	if (!canRead || (!allowAnon && socket.uid <= 0)) {
 		throw new Error('[[error:no-privileges]]');
 	}
 	if (!option || !option.votes || !option.votes.length) {

package/package.json

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

package/public/js/poll/creator.js

@@ -64,6 +64,7 @@
 								// used to identify the poll in the manage modal after creation
 								// so we can edit/delete
 								pollId: Date.now(),
+								title: config.poll.defaultTitle,
 								maximumVotesPerUser: config.poll.maximumVotesPerUser,
 							}, config.poll).then((newPoll) => {
 								if (newPoll) {
@@ -194,9 +195,9 @@
 					// Add option adder
 					modal.find('#pollAddOption')
 						.off('click')
-						.on('click', async function (e) {
-							const el = $(e.currentTarget);
-							if (config.maxOptions <= el.prevAll('input').length) {
+						.on('click', async function () {
+							const optionEls = modal.find('[component="post/poll/option/item"]');
+							if (config.maxOptions <= optionEls.length) {
 								clearErrors();
 								error(`[[poll:error.max_options, ${config.maxOptions}]]`);
 								return false;

package/public/js/poll/view.js

@@ -258,9 +258,9 @@
 	};
 
 	View.prototype.showOptionDetails = function (details) {
-		require(['bootbox'], function (bootbox) {
-			app.parseAndTranslate('poll/view/details', details, function (html) {
-				bootbox.dialog({
+		require(['benchpress', 'modals'], function (benchpress, modals) {
+			benchpress.render('poll/view/details', details).then(function (html) {
+				modals.dialog({
 					title: `[[poll:x-users-voted-for-this-option, ${details.voteCount}]]`,
 					message: html,
 					backdrop: true,
@@ -301,7 +301,7 @@
 			}
 		} else {
 			this.showVoteButton();
-			if (this.pollData.allowAnonVoting) {
+			if (this.pollData?.info?.allowAnonVoting) {
 				this.showVoteAnonButton();
 			}
 		}

package/templates/poll/view/details.tpl

@@ -1,7 +1,7 @@
 <div class="d-flex flex-wrap gap-2">
     {{{ each votes }}}
     <a href="{config.relative_path}/user/{votes.userslug}" class="poll-result-details">
-        {buildAvatar(votes, "24px", true)}
+        {{buildAvatar(votes, "24px", true)}}
     </a>
     {{{ end }}}
 </div>