nodebb-plugin-poll 3.2.0 → 3.2.2

package/lib/poll.js

@@ -101,7 +101,9 @@ Poll.getOptions = async function (pollId, withVotes = false) {
 Poll.getOption = async function (pollId, option, withVotes = false) {
 	const [optionData, votes, voteCount] = await Promise.all([
 		NodeBB.db.getObject(`poll:${pollId}:options:${option}`),
-		withVotes ? NodeBB.db.getSortedSetRange(`poll:${pollId}:options:${option}:votes`, 0, -1) : null,
+		withVotes ?
+			NodeBB.db.getSortedSetRange(`poll:${pollId}:options:${option}:votes`, 0, -1) :
+			null,
 		Poll.getOptionVoteCount(pollId, option),
 	]);
 

package/lib/sockets.js

@@ -120,7 +120,7 @@ Sockets.removeVote = async function (socket, data) {
 	}
 
 	await Vote.remove(data);
-	const pollData = Poll.get(data.pollId, socket.uid, false);
+	const pollData = await Poll.get(data.pollId, socket.uid, false);
 	NodeBB.SocketIndex.server.sockets.emit('event:poll.voteChange', pollData);
 };
 
@@ -136,7 +136,9 @@ Sockets.getOptionDetails = async function (socket, data) {
 	if (!option.votes || !option.votes.length) {
 		return option;
 	}
-	const userData = await NodeBB.User.getUsersFields(option.votes, ['uid', 'username', 'userslug', 'picture']);
+	const userData = await NodeBB.User.getUsersFields(option.votes, [
+		'uid', 'username', 'userslug', 'picture',
+	]);
 	option.votes = userData;
 
 	const result = await NodeBB.Plugins.hooks.fire('filter:poll.getOptionDetails', {

package/package.json

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

package/plugin.json

@@ -20,16 +20,11 @@
     { "hook": "action:topic.delete", "method": "hooks.action.topicDelete" },
     { "hook": "action:topic.restore", "method": "hooks.action.topicRestore" }
   ],
-  "staticDirs": {
-    "public": "public",
-    "vendor": "vendor"
-  },
   "scss": [
     "public/scss/style.scss"
   ],
   "scripts": [
     "public/js/poll/main.js",
-    "public/js/poll/sockets.js",
     "public/js/poll/creator.js",
     "public/js/poll/view.js"
   ],

package/public/js/poll/creator.js

@@ -70,17 +70,16 @@
 				return alerts.error('[[error:category-not-selected]]');
 			}
 
-			Poll.sockets.canCreate({ cid: post.cid, pid: post.pid }, function (err, canCreate) {
+			socket.emit('plugins.poll.canCreate', { cid: post.cid, pid: post.pid }, function (err, canCreate) {
 				if (err) {
 					return alerts.error(err.message);
 				}
 				if (!canCreate) {
 					return alerts.error('[[error:no-privileges]]');
 				}
-
-				Poll.sockets.getConfig(null, function (err, config) {
+				socket.emit('plugins.poll.getConfig', null, function (err, config) {
 					if (err) {
-						console.error(err);
+						return alerts.error(err);
 					}
 
 					var poll = {};

package/public/js/poll/main.js

@@ -1,5 +1,7 @@
 'use strict';
 
+/* global Poll */
+
 window.Poll = {};
 
 (function () {
@@ -9,7 +11,9 @@ window.Poll = {};
 		});
 	};
 
+	// eslint-disable-next-line import/no-unresolved
 	require('poll/serializer')(window.utils);
+
 	$(window).on('action:topic.loading', function () {
 		if (ajaxify.data.posts.length > 0 && ajaxify.data.posts[0].hasOwnProperty('pollId')) {
 			getPoll(ajaxify.data.posts[0].pollId);
@@ -30,11 +34,15 @@ window.Poll = {};
 		}
 	});
 
+	socket.on('event:poll.voteChange', function (data) {
+		Poll.view.update(data);
+	});
+
 	function getPoll(pollId) {
 		pollId = parseInt(pollId, 10);
 
 		if (!isNaN(pollId)) {
-			Poll.sockets.getPoll({ pollId: pollId }, function (err, pollData) {
+			socket.emit('plugins.poll.get', { pollId }, function (err, pollData) {
 				if (err) {
 					return Poll.alertError(err.message);
 				}

package/public/js/poll/view.js

@@ -22,7 +22,7 @@
 						options: votes,
 					};
 
-					Poll.sockets.vote(voteData, function (err) {
+					socket.emit('plugins.poll.vote', voteData, function (err) {
 						if (!config.loggedIn) {
 							$(window).trigger('action:poll.vote.notloggedin');
 						}
@@ -55,8 +55,7 @@
 						pollId: view.pollData.info.pollId,
 						options: votes,
 					};
-
-					Poll.sockets.updateVote(voteData, function (err) {
+					socket.emit('plugins.poll.updateVote', voteData, function (err) {
 						if (err) {
 							return Poll.alertError(err.message);
 						}
@@ -76,7 +75,7 @@
 			handle: function (view) {
 				var voteData = { pollId: view.pollData.info.pollId };
 
-				Poll.sockets.removeVote(voteData, function (err) {
+				socket.emit('plugins.poll.removeVote', voteData, function (err) {
 					if (err) {
 						return Poll.alertError(err.message);
 					}
@@ -119,7 +118,7 @@
 			handle: function (view, e) {
 				var optionId = $(e.currentTarget).parents('[data-poll-option-id]').data('poll-option-id');
 
-				Poll.sockets.getOptionDetails({
+				socket.emit('plugins.poll.getOptionDetails', {
 					pollId: view.pollData.info.pollId,
 					optionId: optionId,
 				}, function (err, details) {
@@ -140,7 +139,7 @@
 				});
 			},
 			handle: function (view) {
-				Poll.sockets.getConfig(null, function (err, config) {
+				socket.emit('plugins.poll.getConfig', null, function (err, config) {
 					if (err) {
 						console.error(err);
 					}
@@ -250,15 +249,17 @@
 	};
 
 	View.prototype.showOptionDetails = function (details) {
-		app.parseAndTranslate('poll/view/details', details, function (html) {
-			bootbox.dialog({
-				message: html,
-				backdrop: true,
-				buttons: {
-					close: {
-						label: 'Close',
+		require(['bootbox'], function (bootbox) {
+			app.parseAndTranslate('poll/view/details', details, function (html) {
+				bootbox.dialog({
+					message: html,
+					backdrop: true,
+					buttons: {
+						close: {
+							label: 'Close',
+						},
 					},
-				},
+				});
 			});
 		});
 	};

package/public/scss/style.scss

@@ -2,28 +2,3 @@
 .composer.reply .poll, .composer.reply .ql-poll {
   display: none;
 }
-
-.poll-view {
-  h2, h3 {
-    margin-top: 0;
-  }
-
-  .card-title {
-    display: inline-block;
-  }
-
-  .btn-group {
-    display: block;
-    a {
-      color: inherit;
-    }
-  }
-}
-
-.poll-result-details:hover {
-  text-decoration: none;
-}
-
-.poll-creator {
-  z-index: 11000 !important;
-}

package/templates/poll/view/details.tpl

@@ -1,4 +1,4 @@
-<h2>{voteCount} [[poll:vote_count]]</h2>
+<h4>{voteCount} [[poll:vote_count]]</h4>
 <!-- BEGIN votes -->
 <a href="{config.relative_path}/user/{votes.userslug}" class="poll-result-details">
     {buildAvatar(votes, "24px", true)}

package/templates/poll/view.tpl

@@ -1,12 +1,11 @@
 <div class="poll-view mb-3" data-poll-id="{poll.info.pollId}">
     <div class="card">
-        <div class="card-header">
+        <div class="card-header d-flex justify-content-between align-items-center">
             <h5 class="card-title mb-0">{poll.settings.title}</h5>
-            <div class="btn-group float-end hidden">
-                <a href="#" class="poll-button-edit">
-                    <span class="fa fa-pencil"></span>
-                </a>
-            </div>
+
+            <a href="#" class="btn btn-sm btn-light border poll-button-edit hidden">
+                <span class="fa fa-pencil"></span>
+            </a>
         </div>
         <div class="card-body">
             <div class="poll-view-messages hidden"></div>

package/public/js/poll/sockets.js

@@ -1,61 +0,0 @@
-'use strict';
-
-(function (Poll) {
-	var messages = [
-		{
-			method: 'getPoll',
-			message: 'plugins.poll.get',
-		},
-		{
-			method: 'vote',
-			message: 'plugins.poll.vote',
-		},
-		{
-			method: 'updateVote',
-			message: 'plugins.poll.updateVote',
-		},
-		{
-			method: 'removeVote',
-			message: 'plugins.poll.removeVote',
-		},
-		{
-			method: 'getOptionDetails',
-			message: 'plugins.poll.getOptionDetails',
-		},
-		{
-			method: 'getConfig',
-			message: 'plugins.poll.getConfig',
-		},
-		{
-			method: 'canCreate',
-			message: 'plugins.poll.canCreate',
-		},
-	];
-
-	var handlers = [
-		{
-			event: 'event:poll.voteChange',
-			handle: function (data) {
-				Poll.view.update(data);
-			},
-		},
-	];
-
-	function init() {
-		handlers.forEach(function (handler) {
-			if (socket.listeners(handler.event).length === 0) {
-				socket.on(handler.event, handler.handle);
-			}
-		});
-
-		messages.forEach(function (message) {
-			Poll.sockets[message.method] = function (data, callback) {
-				socket.emit(message.message, data, callback);
-			};
-		});
-	}
-
-	Poll.sockets = {};
-
-	init();
-}(window.Poll));