nodebb-plugin-composer-default 10.3.23 → 10.3.25

package/package.json

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

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'], function (api, hooks) {
 	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);
-
 		}
 	}
 
@@ -249,51 +250,51 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 		}
 	};
 
-	function openComposer(save_id, draft) {
+	async function openComposer(save_id, draft) {
 		const saveObj = save_id.split(':');
 		const uid = saveObj[1];
 		// Don't open other peoples' drafts
 		if (parseInt(app.user.uid, 10) !== parseInt(uid, 10)) {
 			return;
 		}
-		require(['composer'], function (composer) {
-			if (draft.action === 'topics.post') {
-				composer.newTopic({
-					fromDraft: true,
-					save_id: draft.save_id,
-					cid: draft.cid,
-					handle: app.user && app.user.uid ? undefined : utils.escapeHTML(draft.handle),
-					title: utils.escapeHTML(draft.title),
-					body: draft.text,
-					tags: String(draft.tags || '').split(','),
-					thumbs: draft.thumbs || [],
-				});
-			} else if (draft.action === 'posts.reply') {
-				api.get('/topics/' + draft.tid, {}, function (err, topicObj) {
-					if (err) {
-						return alerts.error(err);
-					}
-
-					composer.newReply({
-						fromDraft: true,
-						save_id: draft.save_id,
-						tid: draft.tid,
-						toPid: draft.toPid,
-						title: topicObj.title,
-						body: draft.text,
-					});
-				});
-			} else if (draft.action === 'posts.edit') {
-				composer.editPost({
-					fromDraft: true,
-					save_id: draft.save_id,
-					pid: draft.pid,
-					title: draft.title ? utils.escapeHTML(draft.title) : undefined,
-					body: draft.text,
-					thumbs: draft.thumbs || [],
-				});
-			}
-		});
+		const composer = await app.require('composer');
+		if (draft.action === 'topics.post') {
+			let composerData = {
+				fromDraft: true,
+				save_id: draft.save_id,
+				cid: draft.cid,
+				handle: app.user && app.user.uid ? undefined : utils.escapeHTML(draft.handle),
+				title: utils.escapeHTML(draft.title),
+				body: draft.text,
+				tags: String(draft.tags || '').split(','),
+				thumbs: draft.thumbs || [],
+			};
+			({ composerData } = await hooks.fire('filter:composer.drafts.open', { draft, composerData }));
+			composer.newTopic(composerData);
+		} else if (draft.action === 'posts.reply') {
+			const topicObj = await api.get('/topics/' + draft.tid, {});
+			let composerData = {
+				fromDraft: true,
+				save_id: draft.save_id,
+				tid: draft.tid,
+				toPid: draft.toPid,
+				title: topicObj.title,
+				body: draft.text,
+			};
+			({ composerData } = await hooks.fire('filter:composer.drafts.open', { draft, composerData }));
+			composer.newReply(composerData);
+		} else if (draft.action === 'posts.edit') {
+			let composerData = {
+				fromDraft: true,
+				save_id: draft.save_id,
+				pid: draft.pid,
+				title: draft.title ? utils.escapeHTML(draft.title) : undefined,
+				body: draft.text,
+				thumbs: draft.thumbs || [],
+			};
+			({ composerData } = await hooks.fire('filter:composer.drafts.open', { draft, composerData }));
+			composer.editPost(composerData);
+		}
 	}
 
 	// Feature detection courtesy of: https://developer.mozilla.org/en-US/docs/Web/API/Web_Storage_API/Using_the_Web_Storage_API

package/static/lib/composer.js

@@ -253,20 +253,24 @@ define('composer', [
 		});
 	};
 
-	composer.newReply = function (data) {
-		translator.translate(data.body, config.defaultLang, function (translated) {
-			push({
-				fromDraft: data.fromDraft,
-				save_id: data.save_id,
-				action: 'posts.reply',
-				tid: data.tid,
-				toPid: data.toPid,
-				title: data.title,
-				body: translated,
-				modified: !!(translated && translated.length),
-				isMain: false,
-			});
-		});
+	composer.newReply = async function (data) {
+		const translated = await translator.translate(data.body, config.defaultLang);
+		let pushData = {
+			fromDraft: data.fromDraft,
+			save_id: data.save_id,
+			action: 'posts.reply',
+			tid: data.tid,
+			toPid: data.toPid,
+			title: data.title,
+			body: translated,
+			modified: !!(translated && translated.length),
+			isMain: false,
+		};
+		({ pushData } = await hooks.fire('filter:composer.reply.push', {
+			data: data,
+			pushData: pushData,
+		}));
+		push(pushData);
 	};
 
 	composer.editPost = function (data) {
@@ -880,5 +884,12 @@ define('composer', [
 		}
 	};
 
+	composer.updateFormattingBtnBadgeCount = function (postContainer, formatName, count) {
+		const formatEl = postContainer.find(`[data-format="${formatName}"]`);
+		formatEl.find('.badge')
+			.text(count)
+			.toggleClass('hidden', !count);
+	};
+
 	return composer;
 });

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]]');
 	}