nodebb-plugin-composer-default 10.3.22 → 10.3.24

package/library.js

@@ -158,7 +158,7 @@ plugin.filterComposerBuild = async function (hookData) {
 		isMain = true;
 	}
 	globalPrivileges['topics:tag'] = canTagTopics;
-	const cid = parseInt(req.query.cid, 10);
+	const cid = req.query.cid || '';
 	const topicTitle = topicData && topicData.title ?
 		topicData.title :
 		validator.escape(String(req.query.title || ''));
@@ -198,9 +198,9 @@ plugin.filterComposerBuild = async function (hookData) {
 			minimumTagLength: meta.config.minimumTagLength || 3,
 			maximumTagLength: meta.config.maximumTagLength || 15,
 			tagWhitelist: tagWhitelist,
-			selectedCategory: cid ? categoryData : null,
-			minTags: categoryData.minTags,
-			maxTags: categoryData.maxTags,
+			selectedCategory: categoryData || null,
+			minTags: categoryData && categoryData.minTags,
+			maxTags: categoryData && categoryData.maxTags,
 
 			isTopic: !!req.query.cid,
 			isEditing: isEditing,
@@ -282,14 +282,14 @@ async function isModerator(req) {
 }
 
 async function canTag(req) {
-	if (parseInt(req.query.cid, 10)) {
+	if (req.query.cid) {
 		return await privileges.categories.can('topics:tag', req.query.cid, req.uid);
 	}
 	return true;
 }
 
 async function canSchedule(req) {
-	if (parseInt(req.query.cid, 10)) {
+	if (req.query.cid) {
 		return await privileges.categories.can('topics:schedule', req.query.cid, req.uid);
 	}
 	return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-composer-default",
-  "version": "10.3.22",
+  "version": "10.3.24",
   "description": "Default composer for NodeBB",
   "main": "library.js",
   "repository": {

package/static/lib/composer/categoryList.js

@@ -1,8 +1,8 @@
 'use strict';
 
 define('composer/categoryList', [
-	'categorySelector', 'taskbar', 'api',
-], function (categorySelector, taskbar, api) {
+	'categorySelector', 'taskbar', 'api', 'alerts'
+], function (categorySelector, taskbar, api, alerts) {
 	const categoryList = {};
 
 	let selector;
@@ -71,10 +71,10 @@ define('composer/categoryList', [
 	};
 
 	categoryList.updateTaskbar = function (postContainer, postData) {
-		if (parseInt(postData.cid, 10)) {
+		if (postData.cid) {
 			api.get(`/categories/${postData.cid}`, {}).then(function (category) {
 				updateTaskbarByCategory(postContainer, category);
-			});
+			}).catch(alerts.error);
 		}
 	};
 

package/static/lib/composer/drafts.js

@@ -1,6 +1,6 @@
 'use strict';
 
-define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
+define('composer/drafts', ['api', 'hooks', 'alerts'], function (api, hooks, alerts) {
 	const drafts = {};
 	const draftSaveDelay = 1000;
 	drafts.init = function (postContainer, postData) {
@@ -78,7 +78,7 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 		}
 	};
 
-	function saveDraft(postContainer, draftIconEl, postData) {
+	async function saveDraft(postContainer, draftIconEl, postData) {
 		if (canSave(app.user.uid ? 'localStorage' : 'sessionStorage') && postData && postData.save_id && postContainer.length) {
 			const titleEl = postContainer.find('input.title');
 			const title = titleEl && titleEl.length && titleEl.val();
@@ -114,16 +114,17 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 				draftData.handle = postContainer.find('input.handle').val();
 			}
 
+			await hooks.fire('filter:composer.drafts.save', { draft: draftData, postData, postContainer });
+
 			// save all draft data into single item as json
 			storage.setItem(postData.save_id, JSON.stringify(draftData));
 
 			$(window).trigger('action:composer.drafts.save', {
-				storage: storage,
-				postData: postData,
-				postContainer: postContainer,
+				storage,
+				postData,
+				postContainer,
 			});
 			draftIconEl.toggleClass('active', true);
-
 		}
 	}
 

package/websockets.js

@@ -15,7 +15,7 @@ Sockets.push = async function (socket, pid) {
 	}
 
 	const postData = await posts.getPostFields(pid, ['content', 'sourceContent', 'tid', 'uid', 'handle', 'timestamp']);
-	if (!postData && !postData.content) {
+	if (!postData || (!postData.content && !postData.sourceContent)) {
 		throw new Error('[[error:invalid-pid]]');
 	}