nodebb-plugin-composer-default 10.2.46 → 10.2.48

package/package.json

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

package/static/lib/composer/categoryList.js

@@ -94,7 +94,7 @@ define('composer/categoryList', [
 
 	async function changeCategory(postContainer, postData, selectedCategory) {
 		postData.cid = selectedCategory.cid;
-		const categoryData = await window.fetch(`${config.relative_path}/api/category/${selectedCategory.cid}`).then(r => r.json());
+		const categoryData = await window.fetch(`${config.relative_path}/api/category/${encodeURIComponent(selectedCategory.cid)}`).then(r => r.json());
 		postData.category = categoryData;
 		updateTaskbarByCategory(postContainer, categoryData);
 		require(['composer/scheduler', 'composer/tags', 'composer/post-queue'], function (scheduler, tags, postQueue) {

package/static/lib/composer.js

@@ -430,11 +430,14 @@ define('composer', [
 	};
 
 	async function getSelectedCategory(postData) {
-		if (ajaxify.data.template.category && parseInt(postData.cid, 10) === parseInt(ajaxify.data.cid, 10)) {
+		const { template } = ajaxify.data;
+		const cid = parseInt(postData.cid, 10);
+		if ((template.category || template.world) && cid === parseInt(ajaxify.data.cid, 10)) {
 			// no need to load data if we are already on the category page
 			return ajaxify.data;
-		} else if (parseInt(postData.cid, 10)) {
-			return await api.get(`/api/category/${postData.cid}`, {});
+		} else if (cid) {
+			const categoryUrl = cid !== -1 ? `/api/category/${encodeURIComponent(postData.cid)}` : `/api/world`;
+			return await api.get(categoryUrl, {});
 		}
 		return null;
 	}