nodebb-plugin-composer-default 10.2.13 → 10.2.15

package/package.json

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

package/plugin.json

@@ -28,6 +28,7 @@
 		"composer/tags.js": "./static/lib/composer/tags.js",
 		"composer/uploads.js": "./static/lib/composer/uploads.js",
 		"composer/autocomplete.js": "./static/lib/composer/autocomplete.js",
+		"composer/post-queue.js": "./static/lib/composer/post-queue.js",
 		"../admin/plugins/composer-default.js": "./static/lib/admin.js"
 	},
 	"templates": "static/templates"

package/static/lib/composer/categoryList.js

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

package/static/lib/composer/formatting.js

@@ -75,7 +75,8 @@ define('composer/formatting', [
 	};
 
 	formatting.addComposerButtons = function () {
-		const fileForm = $('.formatting-bar .formatting-group #fileForm');
+		const formattingBarEl = $('.formatting-bar');
+		const fileForm = formattingBarEl.find('.formatting-group #fileForm');
 		buttons.forEach((btn) => {
 			let markup = ``;
 			if (Array.isArray(btn.dropdownItems) && btn.dropdownItems.length) {
@@ -89,6 +90,12 @@ define('composer/formatting', [
 			}
 			fileForm.before(markup);
 		});
+		formattingBarEl.tooltip({
+			selector: '.formatting-group>li',
+			container: '#content',
+			animation: false,
+			trigger: 'hover',
+		});
 	};
 
 	function generateFormattingDropdown(btn) {
@@ -107,8 +114,8 @@ define('composer/formatting', [
 			`;
 		});
 		return `
-			<li class="dropdown bottom-sheet" tab-index="-1">
-				<button class="btn btn-sm btn-link text-reset" data-bs-toggle="dropdown" title="${btn.title}">
+			<li class="dropdown bottom-sheet" tab-index="-1" title="${btn.title}">
+				<button class="btn btn-sm btn-link text-reset" data-bs-toggle="dropdown" >
 					<i class="${btn.iconClass}"></i>
 				</button>
 				<ul class="dropdown-menu p-1">

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

@@ -0,0 +1,23 @@
+'use strict';
+
+define('composer/post-queue', [], function () {
+	const postQueue = {};
+
+	postQueue.isExempt = async function (postData) {
+		if (!config.postQueue || app.user.isAdmin || app.user.isGlobalMod || app.user.isMod) {
+			return true;
+		}
+		return await socket.emit('plugins.composer.isExemptFromPostQueue', { postData: postData });
+	};
+
+	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);
+	};
+
+	return postQueue;
+});

package/static/lib/composer.js

@@ -12,6 +12,7 @@ define('composer', [
 	'composer/resize',
 	'composer/autocomplete',
 	'composer/scheduler',
+	'composer/post-queue',
 	'scrollStop',
 	'topicThumbs',
 	'api',
@@ -22,7 +23,7 @@ define('composer', [
 	'search',
 	'screenfull',
 ], function (taskbar, translator, uploads, formatting, drafts, tags,
-	categoryList, preview, resize, autocomplete, scheduler, scrollStop,
+	categoryList, preview, resize, autocomplete, scheduler, postQueue, scrollStop,
 	topicThumbs, api, bootbox, alerts, hooks, messagesModule, search, screenfull) {
 	var composer = {
 		active: undefined,
@@ -476,6 +477,7 @@ 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-formatting.tpl

@@ -6,8 +6,8 @@
 			{{{ else }}}
 			{{{ if (./visibility.desktop && ((isTopicOrMain && ./visibility.main) || (!isTopicOrMain && ./visibility.reply))) }}}
 			{{{ if ./dropdownItems.length }}}
-			<li class="dropdown bottom-sheet" tabindex="-1">
-				<button class="btn btn-sm btn-link text-reset" data-bs-toggle="dropdown" title="{./title}">
+			<li class="dropdown bottom-sheet" tabindex="-1" title="{./title}">
+				<button class="btn btn-sm btn-link text-reset" data-bs-toggle="dropdown">
 					<i class="{./className}"></i>
 				</button>
 				<ul class="dropdown-menu p-1">

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

@@ -1,5 +1,6 @@
 <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">
+	<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>
 		<textarea class="write shadow-none rounded-1 w-100 form-control" tabindex="4" placeholder="[[modules:composer.textarea.placeholder]]">{body}</textarea>
 	</div>

package/websockets.js

@@ -66,5 +66,29 @@ Sockets.renderHelp = async function () {
 };
 
 Sockets.getFormattingOptions = async function () {
-	return await module.parent.exports.getFormattingOptions();
+	return await require('./library').getFormattingOptions();
+};
+
+Sockets.isExemptFromPostQueue = async function (socket, data) {
+	if (!data || !data.postData) {
+		throw new Error('[[error:invalid-data]]');
+	}
+	if (socket.uid <= 0) {
+		return false;
+	}
+
+	let shouldQueue = false;
+	const { postData } = data;
+	if (postData.action === 'posts.reply') {
+		shouldQueue = await posts.shouldQueue(socket.uid, {
+			tid: postData.tid,
+			content: postData.content || '',
+		});
+	} else if (postData.action === 'topics.post') {
+		shouldQueue = await posts.shouldQueue(socket.uid, {
+			cid: postData.cid,
+			content: postData.content || '',
+		});
+	}
+	return !shouldQueue;
 };