nodebb-plugin-poll 4.0.13 → 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/package.json

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

package/public/js/poll/creator.js

@@ -195,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;