nodebb-plugin-composer-default 10.2.45 → 10.2.47

package/package.json

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

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/${postData.cid}` : `/api/world`;
+			return await api.get(categoryUrl, {});
 		}
 		return null;
 	}

package/websockets.js

@@ -14,7 +14,7 @@ Sockets.push = async function (socket, pid) {
 		throw new Error('[[error:no-privileges]]');
 	}
 
-	const postData = await posts.getPostFields(pid, ['content', 'tid', 'uid', 'handle', 'timestamp']);
+	const postData = await posts.getPostFields(pid, ['content', 'sourceContent', 'tid', 'uid', 'handle', 'timestamp']);
 	if (!postData && !postData.content) {
 		throw new Error('[[error:invalid-pid]]');
 	}
@@ -33,7 +33,7 @@ Sockets.push = async function (socket, pid) {
 		pid: pid,
 		uid: postData.uid,
 		handle: parseInt(meta.config.allowGuestHandles, 10) ? postData.handle : undefined,
-		body: postData.content,
+		body: postData.sourceContent || postData.content,
 		title: topic.title,
 		thumb: topic.thumb,
 		tags: tags,