nodebb-plugin-poll 4.0.9 → 4.0.11

package/lib/sockets.js

@@ -15,7 +15,7 @@ const Sockets = exports;
 
 Sockets.get = async function (socket, data) {
 	const settings = await Config.getSettings();
-	const allowAnon = parseInt(settings.allowGuestsToViewResults, 10) === 1;
+	const allowAnon = settings.allowGuestsToViewResults === 'on';
 
 	if (!data) {
 		throw new Error('Invalid request, request data is not defined');

package/library.js

@@ -92,7 +92,7 @@ Plugin.renderPollWidget = async function (widget) {
 	const Poll = require('./lib/poll');
 
 	const settings = await Config.getSettings();
-	const allowAnon = parseInt(settings.allowGuestsToViewResults, 10) === 1;
+	const allowAnon = settings.allowGuestsToViewResults === 'on';
 
 	if (!widget.uid && !allowAnon) {
 		return null;

package/package.json

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

package/public/js/poll/creator.js

@@ -41,21 +41,22 @@
 	}
 
 	async function openManageModal(payload) {
-		const bootbox = await app.require('bootbox');
+		const [modals, Benchpress] = await app.require(['modals', 'benchpressjs']);
 		const { postData, modal, uuid } = payload;
-		const html = await app.parseAndTranslate('poll/manage', { post: postData });
+		const html = await Benchpress.render('poll/manage', { post: postData });
 
 		if (modal) {
-			modal.find('.bootbox-body').html(html[0].outerHTML);
+			// modal.find('.bootbox-body').html(html[0].outerHTML);
+			modal.find('.bootbox-body').html(html);
 			handleSort({ modal, polls: postData.polls });
 		} else {
-			const modal = bootbox.dialog({
+			const modal = await modals.dialog({
 				title: '[[poll:manage-polls]]',
 				message: html,
 				className: 'poll-manage',
 				buttons: {
 					add: {
-						label: '<i class="fa fa-plus"></i> [[poll:add-poll]]',
+						label: '[[poll:add-poll]]',
 						className: 'btn-success',
 						callback: () => {
 							Creator.show('[[poll:creator_title]]', {
@@ -88,11 +89,11 @@
 	}
 
 	async function handleDelete(payload) {
-		const bootbox = await app.require('bootbox');
+		const modals = await app.require('modals');
 		const { uuid, modal, postData } = payload;
 		modal.on('click', 'button[data-action="remove"]', function () {
 			const clickedPollId = $(this).attr('data-poll-id');
-			bootbox.confirm('[[poll:confirm-remove]]', (ok) => {
+			modals.confirm('[[poll:confirm-remove]]', (ok) => {
 				if (!ok) {
 					return;
 				}
@@ -155,9 +156,9 @@
 
 	Creator.show = function (modalTitle, poll, config) {
 		return new Promise((resolve) => {
-			require(['bootbox'], function (bootbox) {
-				app.parseAndTranslate('poll/creator', { poll, config }, function (html) {
-					const modal = bootbox.dialog({
+			app.require(['benchpressjs', 'modals']).then(([Benchpress, modals]) => {
+				Benchpress.render('poll/creator', { poll, config }).then(async function (html) {
+					const modal = await modals.dialog({
 						title: modalTitle,
 						message: html,
 						className: 'poll-creator',

package/templates/poll/creator.tpl

@@ -5,7 +5,7 @@
 
     <div class="mb-3">
         <label class="form-label" for="pollInputTitle">[[poll:poll_title]]</label>
-        <input type="text" name="title" id="pollInputTitle" value="{escape(poll.title)}" placeholder="[[poll:poll_title_placeholder]]" class="form-control">
+        <input type="text" name="title" id="pollInputTitle" value="{poll.title}" placeholder="[[poll:poll_title_placeholder]]" class="form-control">
     </div>
 
     <div class="mb-3 d-flex flex-column gap-1">

package/templates/poll/manage.tpl

@@ -6,7 +6,7 @@
 	<div component="post/poll/item" data-poll-id="{./pollId}" class="bg-body d-flex align-items-center justify-content-between mb-3 p-1 border rounded-1">
 		<div class="d-flex align-items-center gap-1">
 			<a href="#" component="sort/handle" class="btn btn-ghost btn-sm align-self-start" style="cursor:grab;"><i class="fa fa-arrows-up-down text-muted"></i></a>
-			<div class="text-nowrap flex-grow-1">{escape(./title)}</div>
+			<div class="text-nowrap flex-grow-1">{./title}</div>
 		</div>
 
 		<div class="d-flex align-items-center gap-1">

package/templates/poll/option-input.tpl

@@ -1,6 +1,6 @@
 <div component="post/poll/option/item" data-option-id="{./id}" class="bg-body d-flex align-items-center justify-content-between gap-2 p-1 rounded-1">
 	<a href="#" component="sort/handle" class="btn btn-ghost btn-sm" style="cursor:grab;"><i class="fa fa-arrows-up-down text-muted"></i></a>
-	<input type="text" name="options" id="pollInputOptions" value="{escape(./title)}" class="form-control"/>
+	<input type="text" name="options" id="pollInputOptions" value="{./title}" class="form-control"/>
 	<input type="hidden" name="id" value="{./id}"/>
 	<button class="btn btn-ghost btn-sm" data-action="remove-option" data-option-id="{./id}"><i class="fa fa-trash text-danger"></i></button>
 </div>

package/templates/poll/view/results.tpl

@@ -1,7 +1,7 @@
 <!-- BEGIN poll.options -->
 <div class="poll-result" data-poll-option-id="{poll.options.id}">
     <div class="d-flex justify-content-between mb-1">
-        <strong>{escape(poll.options.title)}</strong>
+        <strong>{poll.options.title}</strong>
         <a class="poll-result-votecount small" href="#">
             <span>[[poll:x-votes, {poll.options.voteCount}]]</span>
         </a>

package/templates/poll/view/voting.tpl

@@ -1,16 +1,16 @@
-<form role="form" class="poll-voting-form mb-3 d-flex flex-column gap-3">
-    <!-- BEGIN poll.options -->
-    <div class="poll-view-option {poll.optionType}" data-poll-option-id="{poll.options.id}">
-        <div class="form-check">
-            <input class="form-check-input" type="{poll.optionType}" name="pollVoteSelection" value="{poll.options.id}" id="poll-{poll.info.pollId}-option-id-{poll.options.id}">
-            <label class="form-check-label" for="poll-{poll.info.pollId}-option-id-{poll.options.id}">{escape(poll.options.title)}</label>
-        </div>
-    </div>
-    <!-- END poll.options -->
-</form>
-
-<!-- IF poll.settings.disallowVoteUpdate -->
-<div class="alert alert-warning" role="alert">
-    [[poll:vote_is_final]]
-</div>
-<!-- ENDIF poll.settings.disallowVoteUpdate -->
+<form role="form" class="poll-voting-form mb-3 d-flex flex-column gap-3">
+    <!-- BEGIN poll.options -->
+    <div class="poll-view-option {poll.optionType}" data-poll-option-id="{poll.options.id}">
+        <div class="form-check">
+            <input class="form-check-input" type="{poll.optionType}" name="pollVoteSelection" value="{poll.options.id}" id="poll-{poll.info.pollId}-option-id-{poll.options.id}">
+            <label class="form-check-label" for="poll-{poll.info.pollId}-option-id-{poll.options.id}">{poll.options.title}</label>
+        </div>
+    </div>
+    <!-- END poll.options -->
+</form>
+
+<!-- IF poll.settings.disallowVoteUpdate -->
+<div class="alert alert-warning" role="alert">
+    [[poll:vote_is_final]]
+</div>
+<!-- ENDIF poll.settings.disallowVoteUpdate -->

package/templates/poll/view.tpl

@@ -3,9 +3,9 @@
         <div class="card-header border-0 d-flex justify-content-between align-items-center flex-wrap">
             <h5 class="card-title mb-0 {{{ if poll.isWidget }}}fs-6{{{ end }}}">
                 {{{ if poll.isWidget }}}
-                <a class="text-reset text-break" href="{config.relative_path}/post/{poll.info.pid}">{escape(poll.info.title)}</a>
+                <a class="text-reset text-break" href="{config.relative_path}/post/{poll.info.pid}">{poll.info.title}</a>
                 {{{ else }}}
-                {escape(poll.info.title)}
+                {poll.info.title}
                 {{{ end }}}
             </h5>
             {{{ if (isAdmin && !poll.isWidget) }}}