nodebb-plugin-poll 3.2.0 → 3.2.1

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.1",
   "description": "NodeBB Poll Plugin",
   "main": "library.js",
   "scripts": {

package/plugin.json

@@ -20,10 +20,6 @@
     { "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"
   ],

package/public/js/poll/creator.js

@@ -80,7 +80,7 @@
 
 				Poll.sockets.getConfig(null, function (err, config) {
 					if (err) {
-						console.error(err);
+						return alerts.error(err);
 					}
 
 					var poll = {};

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.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>