nodebb-plugin-poll 3.1.8 → 3.2.1

package/lib/config.js

@@ -7,42 +7,45 @@ const pluginInfo = require('../plugin.json');
 
 const pluginId = pluginInfo.id.replace('nodebb-plugin-', '');
 
-(function (Config) {
-	Config.plugin = {
-		name: pluginInfo.name,
-		id: pluginId,
-		version: packageInfo.version,
-		description: packageInfo.description,
-		icon: 'fa-bar-chart-o',
-	};
-
-	Config.defaults = {
-		toggles: {
-			allowAnon: false,
-		},
-		limits: {
-			maxOptions: 10,
-		},
-		defaults: {
-			title: 'Poll',
-			maxvotes: 1,
-			disallowVoteUpdate: 0,
-			end: 0,
-		},
-	};
-
-	Config.settings = {};
-
-	Config.init = function (callback) {
-		Config.settings = new NodeBB.Settings(Config.plugin.id, Config.plugin.version, Config.defaults, callback);
-	};
-
-	Config.adminSockets = {
-		sync: function () {
-			Config.settings.sync();
-		},
-		getDefaults: function (socket, data, callback) {
-			callback(null, Config.settings.createDefaultWrapper());
-		},
-	};
-}(exports));
+const Config = exports;
+
+Config.plugin = {
+	name: pluginInfo.name,
+	id: pluginId,
+	version: packageInfo.version,
+	description: packageInfo.description,
+	icon: 'fa-bar-chart-o',
+};
+
+Config.defaults = {
+	toggles: {
+		allowAnon: false,
+	},
+	limits: {
+		maxOptions: 10,
+	},
+	defaults: {
+		title: 'Poll',
+		maxvotes: 1,
+		disallowVoteUpdate: 0,
+		end: 0,
+	},
+};
+
+Config.settings = {};
+
+Config.init = function () {
+	return new Promise((resolve) => {
+		Config.settings = new NodeBB.Settings(Config.plugin.id, Config.plugin.version, Config.defaults, resolve);
+	});
+};
+
+Config.adminSockets = {
+	sync: function () {
+		Config.settings.sync();
+	},
+	getDefaults: function (socket, data, callback) {
+		callback(null, Config.settings.createDefaultWrapper());
+	},
+};
+

package/lib/hooks.js

@@ -1,134 +1,116 @@
 'use strict';
 
-const util = require('util');
 const NodeBB = require('./nodebb');
 
 const Config = require('./config');
 const Poll = require('./poll');
 const Serializer = require('./serializer');
 
+const Hooks = exports;
 
-(function (Hooks) {
-	Hooks.filter = {};
-	Hooks.action = {};
+Hooks.filter = {};
+Hooks.action = {};
 
-	Hooks.filter.parseRaw = function (raw, callback) {
-		callback(null, Serializer.removeMarkup(raw, '[Poll]'));
-	};
+Hooks.filter.parseRaw = function (raw) {
+	return Serializer.removeMarkup(raw, '[Poll]');
+};
 
-	Hooks.filter.postCreate = async function (obj) {
-		if (Serializer.hasMarkup(obj.post.content) && obj.data.isMain) {
-			return await savePoll(obj);
-		}
+Hooks.filter.postCreate = async function (obj) {
+	if (Serializer.hasMarkup(obj.post.content) && obj.data.isMain) {
+		return await savePoll(obj);
+	}
+	return obj;
+};
+
+Hooks.filter.postEdit = async function (obj) {
+	const { tid, pollId } = await NodeBB.Posts.getPostFields(obj.data.pid, ['tid', 'pollId']);
+	if (pollId || !Serializer.hasMarkup(obj.post.content)) {
 		return obj;
-	};
-
-	Hooks.filter.postEdit = async function (obj) {
-		const { tid, pollId } = await NodeBB.Posts.getPostFields(obj.data.pid, ['tid', 'pollId']);
-		if (pollId || !Serializer.hasMarkup(obj.post.content)) {
-			return obj;
-		}
-
-		const result = await NodeBB.Topics.getTopicFields(tid, ['mainPid', 'cid']);
-		if (parseInt(result.mainPid, 10) !== parseInt(obj.data.pid, 10)) {
-			return obj;
-		}
-
-		await canCreate(result.cid, obj.post.editor);
-
-		const postData = await savePoll({
-			...obj.post,
-			uid: obj.data.uid,
-			pid: obj.data.pid,
-			tid: tid,
-		});
-		delete postData.uid;
-		delete postData.pid;
-		delete postData.tid;
-		obj.post = postData;
-
-		if (!postData.pollId) {
-			return obj;
-		}
-
-		// NodeBB only updates the edited, editor and content fields, so we add the pollId field manually.
-		await NodeBB.Posts.setPostField(obj.data.pid, 'pollId', postData.pollId);
+	}
+
+	const result = await NodeBB.Topics.getTopicFields(tid, ['mainPid', 'cid']);
+	if (parseInt(result.mainPid, 10) !== parseInt(obj.data.pid, 10)) {
 		return obj;
-	};
+	}
+
+	await canCreate(result.cid, obj.post.editor);
+
+	const postData = await savePoll({
+		...obj.post,
+		uid: obj.data.uid,
+		pid: obj.data.pid,
+		tid: tid,
+	});
+	delete postData.uid;
+	delete postData.pid;
+	delete postData.tid;
+	obj.post = postData;
+
+	if (!postData.pollId) {
+		return obj;
+	}
+
+	// NodeBB only updates the edited, editor and content fields, so we add the pollId field manually.
+	await NodeBB.Posts.setPostField(obj.data.pid, 'pollId', postData.pollId);
+	return obj;
+};
 
-	Hooks.filter.topicPost = async function (data) {
-		if (Serializer.hasMarkup(data.content)) {
-			await canCreate(data.cid, data.uid);
-			return data;
-		}
+Hooks.filter.topicPost = async function (data) {
+	if (Serializer.hasMarkup(data.content)) {
+		await canCreate(data.cid, data.uid);
 		return data;
-	};
-
-	Hooks.action.postDelete = function (data) {
-		Poll.getPollIdByPid(data.post.pid, (err, pollId) => {
-			if (err) {
-				console.error(err);
-			}
-			if (pollId) {
-				Poll.delete(pollId);
-			}
-		});
-	};
-
-	Hooks.action.postRestore = function (data) {
-		Poll.getPollIdByPid(data.post.pid, (err, pollId) => {
-			if (err) {
-				console.error(err);
-			}
-			if (pollId) {
-				Poll.restore(pollId);
-			}
-		});
-	};
-
-	Hooks.action.topicDelete = function (data) {
-		Poll.getPollIdByTid(data.topic.tid, (err, pollId) => {
-			if (err) {
-				console.error(err);
-			}
-			if (pollId) {
-				Poll.delete(pollId);
-			}
-		});
-	};
-
-	Hooks.action.topicRestore = function (data) {
-		Poll.getPollIdByTid(data.topic.tid, (err, pollId) => {
-			if (err) {
-				console.error(err);
-			}
-			if (pollId) {
-				Poll.restore(pollId);
-			}
-		});
-	};
-
-	async function canCreate(cid, uid) {
-		const can = await NodeBB.Privileges.categories.can('poll:create', cid, uid);
-		if (!can) {
-			throw new Error('[[poll:error.privilege.create]]');
-		}
 	}
+	return data;
+};
 
-	async function savePoll(obj) {
-		const postobj = obj.post ? obj.post : obj;
-		const pollData = Serializer.serialize(postobj.content, Config.settings.get());
+Hooks.action.postDelete = async function (data) {
+	const pollId = await Poll.getPollIdByPid(data.post.pid);
+	if (pollId) {
+		await Poll.delete(pollId);
+	}
+};
+
+Hooks.action.postRestore = async function (data) {
+	const pollId = await Poll.getPollIdByPid(data.post.pid);
+	if (pollId) {
+		await Poll.restore(pollId);
+	}
+};
 
-		if (!pollData || !pollData.options.length) {
-			return obj;
-		}
+Hooks.action.topicDelete = async function (data) {
+	const pollId = await Poll.getPollIdByTid(data.topic.tid);
+	if (pollId) {
+		Poll.delete(pollId);
+	}
+};
 
-		const addPoll = util.promisify(Poll.add);
-		const pollId = await addPoll(pollData, postobj);
+Hooks.action.topicRestore = async function (data) {
+	const pollId = await Poll.getPollIdByTid(data.topic.tid);
+	if (pollId) {
+		Poll.restore(pollId);
+	}
+};
 
-		postobj.pollId = pollId;
-		postobj.content = Serializer.removeMarkup(postobj.content);
+async function canCreate(cid, uid) {
+	const can = await NodeBB.Privileges.categories.can('poll:create', cid, uid);
+	if (!can) {
+		throw new Error('[[poll:error.privilege.create]]');
+	}
+}
 
+async function savePoll(obj) {
+	const postobj = obj.post ? obj.post : obj;
+	const pollData = Serializer.serialize(postobj.content, Config.settings.get());
+
+	if (!pollData || !pollData.options.length) {
 		return obj;
 	}
-}(exports));
+
+	const pollId = await Poll.add(pollData, postobj);
+
+	postobj.pollId = pollId;
+	postobj.content = Serializer.removeMarkup(postobj.content);
+
+	return obj;
+}
+