nodebb-plugin-poll 4.0.10 → 4.0.12

package/lib/config.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const meta = require.main.require('./src/meta');
+const meta = nodebb.require('./src/meta');
 
 const packageInfo = require('../package.json');
 const pluginInfo = require('../plugin.json');

package/lib/hooks.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const db = require.main.require('./src/database');
-const topics = require.main.require('./src/topics');
-const posts = require.main.require('./src/posts');
-const privileges = require.main.require('./src/privileges');
+const db = nodebb.require('./src/database');
+const topics = nodebb.require('./src/topics');
+const posts = nodebb.require('./src/posts');
+const privileges = nodebb.require('./src/privileges');
 
 
 const Config = require('./config');

package/lib/nodebb.js

@@ -1,17 +1,17 @@
 'use strict';
 
 module.exports = {
-	db: require.main.require('./src/database'),
-	Settings: require.main.require('./src/settings'),
-	Meta: require.main.require('./src/meta'),
-	User: require.main.require('./src/user'),
-	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'),
-	SocketIndex: require.main.require('./src/socket.io/index'),
-	Translator: require.main.require('./src/translator'),
-	winston: require.main.require('winston'),
+	db: nodebb.require('./src/database'),
+	Settings: nodebb.require('./src/settings'),
+	Meta: nodebb.require('./src/meta'),
+	User: nodebb.require('./src/user'),
+	Posts: nodebb.require('./src/posts'),
+	Topics: nodebb.require('./src/topics'),
+	Privileges: nodebb.require('./src/privileges'),
+	Plugins: nodebb.require('./src/plugins'),
+	PluginSockets: nodebb.require('./src/socket.io/plugins'),
+	SocketIndex: nodebb.require('./src/socket.io/index'),
+	Translator: nodebb.require('./src/translator'),
+	winston: nodebb.require('winston'),
 	app: null,
 };

package/lib/poll.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const db = require.main.require('./src/database');
-const privileges = require.main.require('./src/privileges');
+const db = nodebb.require('./src/database');
+const privileges = nodebb.require('./src/privileges');
 
 const Vote = require('./vote');
 

package/lib/sockets.js

@@ -1,10 +1,10 @@
 'use strict';
 
-const _ = require.main.require('lodash');
-const db = require.main.require('./src/database');
-const posts = require.main.require('./src/posts');
-const topics = require.main.require('./src/topics');
-const privileges = require.main.require('./src/privileges');
+const _ = nodebb.require('lodash');
+const db = nodebb.require('./src/database');
+const posts = nodebb.require('./src/posts');
+const topics = nodebb.require('./src/topics');
+const privileges = nodebb.require('./src/privileges');
 
 const NodeBB = require('./nodebb');
 const Config = require('./config');
@@ -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/lib/vote.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const db = require.main.require('./src/database');
-const privileges = require.main.require('./src/privileges');
+const db = nodebb.require('./src/database');
+const privileges = nodebb.require('./src/privileges');
 
 const Poll = require('./poll');
 

package/library.js

@@ -5,16 +5,16 @@ const Config = require('./lib/config');
 const Sockets = require('./lib/sockets');
 const Hooks = require('./lib/hooks');
 const Poll = require('./lib/poll');
-const db = require.main.require('./src/database');
-const pagination = require.main.require('./src/pagination');
-const utils = require.main.require('./src/utils');
+const db = nodebb.require('./src/database');
+const pagination = nodebb.require('./src/pagination');
+const utils = nodebb.require('./src/utils');
 
 const Plugin = module.exports;
 
 Plugin.hooks = Hooks;
 
 Plugin.load = async function (params) {
-	const routeHelpers = require.main.require('./src/routes/helpers');
+	const routeHelpers = nodebb.require('./src/routes/helpers');
 	const { router } = params;
 
 	routeHelpers.setupAdminPageRoute(router, `/admin/plugins/${Config.plugin.id}`, async (req, res) => {
@@ -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.10",
+  "version": "4.0.12",
   "description": "NodeBB Poll Plugin",
   "main": "library.js",
   "scripts": {
@@ -26,10 +26,10 @@
     "cron": "^1.8.2"
   },
   "nbbpm": {
-    "compatibility": "^4.12.0"
+    "compatibility": "^4.14.0"
   },
   "devDependencies": {
-    "eslint": "10.0.3",
-    "eslint-config-nodebb": "^2.0.0"
+    "eslint": "10.6.0",
+    "eslint-config-nodebb": "^2.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/upgrades/convert_poll_id_voters_and_options_votes_to_sorted_sets.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const async = require.main.require('async');
+const async = nodebb.require('async');
 const NodeBB = require('../lib/nodebb');
 
 const timestamp = Date.UTC(2019, 3, 1);

package/upgrades/fix_incorrect_poll_privilege.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const db = require.main.require('./src/database');
-const privileges = require.main.require('./src/privileges');
+const db = nodebb.require('./src/database');
+const privileges = nodebb.require('./src/privileges');
 
 module.exports = {
 	name: 'Fix incorrectly given poll privilege',

package/upgrades/give_categories_poll_create_privs_to_reg_users.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const async = require.main.require('async');
+const async = nodebb.require('async');
 const NodeBB = require('../lib/nodebb');
 
 module.exports = {

package/upgrades/poll-4.0-upgrade.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const db = require.main.require('./src/database');
-const batch = require.main.require('./src/batch');
+const db = nodebb.require('./src/database');
+const batch = nodebb.require('./src/batch');
 
 module.exports = {
 	name: 'Convert data structures for v4.0',