nodebb-plugin-composer-default 10.2.15 → 10.2.17

package/package.json

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

package/static/lib/composer/post-queue.js

@@ -3,20 +3,20 @@
 define('composer/post-queue', [], function () {
 	const postQueue = {};
 
-	postQueue.isExempt = async function (postData) {
+	postQueue.showAlert = async function (postContainer, postData) {
 		if (!config.postQueue || app.user.isAdmin || app.user.isGlobalMod || app.user.isMod) {
-			return true;
+			return;
 		}
-		return await socket.emit('plugins.composer.isExemptFromPostQueue', { postData: postData });
+		const shouldQueue = await socket.emit('plugins.composer.shouldQueue', { postData: postData });
+		postContainer.find('[component="composer/post-queue/alert"]')
+			.toggleClass('show', shouldQueue);
 	};
 
 	postQueue.onChangeCategory = async function (postContainer, postData) {
 		if (!config.postQueue) {
 			return;
 		}
-		const isExempt = await postQueue.isExempt(postData);
-		postContainer.find('[component="composer/post-queue/alert"]')
-			.toggleClass('hidden', isExempt);
+		postQueue.showAlert(postContainer, postData);
 	};
 
 	return postQueue;

package/static/lib/composer.js

@@ -343,7 +343,7 @@ define('composer', [
 		formatting.addHandler(postContainer);
 		formatting.addComposerButtons();
 		preview.handleToggler(postContainer);
-
+		postQueue.showAlert(postContainer, postData);
 		uploads.initialize(post_uuid);
 		tags.init(postContainer, composer.posts[post_uuid]);
 		autocomplete.init(postContainer, post_uuid);
@@ -477,7 +477,6 @@ define('composer', [
 			tagWhitelist: postData.category ? postData.category.tagWhitelist : ajaxify.data.tagWhitelist,
 			privileges: app.user.privileges,
 			selectedCategory: postData.category,
-			exemptFromPostQueue: await postQueue.isExempt(postData),
 			submitOptions: [
 				// Add items using `filter:composer.create`, or just add them to the <ul> in DOM
 				// {

package/static/templates/partials/composer-write-preview.tpl

@@ -1,7 +1,7 @@
 <div class="write-preview-container d-flex gap-2 flex-grow-1 overflow-auto">
 	<div class="write-container d-flex d-md-flex w-50 position-relative">
-		<div component="composer/post-queue/alert" class="{{{ if exemptFromPostQueue }}}hidden{{{ end }}} m-2 alert alert-info position-absolute top-0 start-0 alert-dismissible">[[modules:composer.post-queue-alert]]<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>
-		<div class="float-end draft-icon hidden-md hidden-lg"></div>
+		<div component="composer/post-queue/alert" class="m-2 alert alert-info fade position-absolute top-0 start-0 alert-dismissible">[[modules:composer.post-queue-alert]]<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>
+		<div class="draft-icon position-absolute end-0 top-0 mx-2 my-1 hidden-md hidden-lg"></div>
 		<textarea class="write shadow-none rounded-1 w-100 form-control" tabindex="4" placeholder="[[modules:composer.textarea.placeholder]]">{body}</textarea>
 	</div>
 	<div class="preview-container d-none d-md-flex w-50">

package/websockets.js

@@ -69,7 +69,7 @@ Sockets.getFormattingOptions = async function () {
 	return await require('./library').getFormattingOptions();
 };
 
-Sockets.isExemptFromPostQueue = async function (socket, data) {
+Sockets.shouldQueue = async function (socket, data) {
 	if (!data || !data.postData) {
 		throw new Error('[[error:invalid-data]]');
 	}
@@ -90,5 +90,5 @@ Sockets.isExemptFromPostQueue = async function (socket, data) {
 			content: postData.content || '',
 		});
 	}
-	return !shouldQueue;
+	return shouldQueue;
 };