nodebb-plugin-poll 4.0.6 → 4.0.8

package/lib/hooks.js

@@ -68,7 +68,12 @@ Hooks.filter.postGetFields = async function (hookData) {
 
 Hooks.filter.postEdit = async function (hookData) {
 	const currentPollIds = await Poll.getPollIdsByPid(hookData.data.pid);
-	const toAdd = hookData.data.polls.filter(p => !currentPollIds.includes(String(p.pollId)));
+	if (!currentPollIds.length && (!Array.isArray(hookData.data.polls) || !hookData.data.polls.length)) {
+		// no polls before or after, nothing to do
+		return hookData;
+	}
+	const pollData = hookData.data.polls || [];
+	const toAdd = pollData.filter(p => !currentPollIds.includes(String(p.pollId)));
 
 	if (toAdd.length) {
 		const cid = await posts.getCidByPid(hookData.data.pid, 'cid');
@@ -79,8 +84,8 @@ Hooks.filter.postEdit = async function (hookData) {
 		...hookData.post,
 		uid: hookData.data.uid,
 		pid: hookData.data.pid,
-	}, hookData.data.polls);
-	hookData.post.pollIds = JSON.stringify(hookData.data.polls.map(p => String(p.pollId)));
+	}, pollData);
+	hookData.post.pollIds = JSON.stringify(pollData.map(p => String(p.pollId)));
 	return hookData;
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-poll",
-  "version": "4.0.6",
+  "version": "4.0.8",
   "description": "NodeBB Poll Plugin",
   "main": "library.js",
   "scripts": {
@@ -26,7 +26,7 @@
     "cron": "^1.8.2"
   },
   "nbbpm": {
-    "compatibility": "^4.9.2"
+    "compatibility": "^4.12.0"
   },
   "devDependencies": {
     "eslint": "10.0.3",

package/public/js/poll/creator.js

@@ -13,8 +13,8 @@
 				formatting.addButtonDispatch('poll', function (/* textarea */) {
 					onPollButtonClicked(composer);
 				});
-
-				updateComposerBadgeCount(postContainer, postData.polls ? postData.polls.length : 0);
+				const uuid = postContainer.attr('data-uuid');
+				updateComposerBadgeCount(uuid, postData.polls ? postData.polls.length : 0);
 			}
 		});
 	}
@@ -69,8 +69,8 @@
 									postData.polls.push(newPoll);
 								}
 								openManageModal({ ...payload, modal });
-								const postContainer = $(`[component="composer"][data-uuid="${uuid}"]`);
-								updateComposerBadgeCount(postContainer, postData.polls.length);
+
+								updateComposerBadgeCount(uuid, postData.polls.length);
 							});
 							return false;
 						},
@@ -100,8 +100,7 @@
 				if (poll) {
 					postData.polls = postData.polls.filter(poll => String(poll.pollId) !== clickedPollId);
 					openManageModal(payload);
-					const postContainer = $(`[component="composer"][data-uuid="${uuid}"]`);
-					updateComposerBadgeCount(postContainer, postData.polls.length);
+					updateComposerBadgeCount(uuid, postData.polls.length);
 				}
 			});
 		});
@@ -270,13 +269,11 @@
 		});
 	}
 
-	function updateComposerBadgeCount(postContainer, count) {
-		require(['composer'], (composer) => {
-			composer.updateFormattingBtnBadgeCount(
-				postContainer,
-				'poll',
-				count
-			);
+	function updateComposerBadgeCount(uuid, count) {
+		$(window).trigger('action:composer.updateFormattingBtnBadgeCount', {
+			uuid: uuid,
+			formatName: 'poll',
+			count,
 		});
 	}