nodebb-plugin-poll 4.0.11 → 4.0.13

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');
@@ -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/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) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-poll",
-  "version": "4.0.11",
+  "version": "4.0.13",
   "description": "NodeBB Poll Plugin",
   "main": "library.js",
   "scripts": {
@@ -29,7 +29,7 @@
     "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

@@ -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) {

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>

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',