nodebb-plugin-composer-default 10.2.51 → 10.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-composer-default",
-  "version": "10.2.51",
+  "version": "10.3.1",
   "description": "Default composer for NodeBB",
   "main": "library.js",
   "repository": {
@@ -26,7 +26,7 @@
   },
   "readmeFilename": "README.md",
   "nbbpm": {
-    "compatibility": "^4.0.0"
+    "compatibility": "^4.5.0"
   },
   "dependencies": {
     "screenfull": "^5.0.2",

package/static/lib/composer/categoryList.js

@@ -92,11 +92,23 @@ define('composer/categoryList', [
 		}
 	}
 
+	function updateTopicTemplate(postContainer, category, previousCategory) {
+		const currentText = postContainer.find('textarea.write').val();
+		const previousTopicTemplate = previousCategory && previousCategory.topicTemplate;
+		if (category && (!currentText.length || currentText === previousTopicTemplate) &&
+			currentText !== category.topicTemplate) {
+			postContainer.find('textarea.write').val(category.topicTemplate).trigger('input');
+		}
+	}
+
 	async function changeCategory(postContainer, postData, selectedCategory) {
+		const previousCategory = postData.category;
 		postData.cid = selectedCategory.cid;
 		const categoryData = await window.fetch(`${config.relative_path}/api/category/${encodeURIComponent(selectedCategory.cid)}`).then(r => r.json());
 		postData.category = categoryData;
 		updateTaskbarByCategory(postContainer, categoryData);
+		updateTopicTemplate(postContainer, categoryData, previousCategory);
+
 		require(['composer/scheduler', 'composer/tags', 'composer/post-queue'], function (scheduler, tags, postQueue) {
 			scheduler.onChangeCategory(categoryData);
 			tags.onChangeCategory(postContainer, postData, selectedCategory.cid, categoryData);

package/static/lib/composer/drafts.js

@@ -41,7 +41,6 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 		});
 
 		drafts.migrateGuest();
-		drafts.migrateThumbs(...arguments);
 	};
 
 	function getStorage(uid) {
@@ -100,6 +99,7 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 					draftData.tags = tags;
 					draftData.title = title;
 					draftData.cid = postData.cid;
+					draftData.thumbs = postData.thumbs || [];
 				} else if (postData.action === 'posts.reply') {
 					// new reply only
 					draftData.title = postData.title;
@@ -108,6 +108,7 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 				} else if (postData.action === 'posts.edit') {
 					draftData.pid = postData.pid;
 					draftData.title = title || postData.title;
+					draftData.thumbs = postData.thumbs || [];
 				}
 				if (!app.user.uid) {
 					draftData.handle = postContainer.find('input.handle').val();
@@ -208,26 +209,6 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 		}
 	};
 
-	drafts.migrateThumbs = function (postContainer, postData) {
-		if (!app.uid) {
-			return;
-		}
-
-		// If any thumbs were uploaded, migrate them to this new composer's uuid
-		const newUUID = postContainer.attr('data-uuid');
-		const draft = drafts.get(postData.save_id);
-
-		if (draft && draft.uuid) {
-			api.put(`/topics/${draft.uuid}/thumbs`, {
-				tid: newUUID,
-			}).then(() => {
-				require(['composer'], function (composer) {
-					composer.updateThumbCount(newUUID, postContainer);
-				});
-			});
-		}
-	};
-
 	drafts.listAvailable = function () {
 		const available = drafts.getList('available');
 		return available.map(drafts.get).filter(Boolean);
@@ -286,6 +267,7 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 					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) {
@@ -307,6 +289,7 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 					pid: draft.pid,
 					title: draft.title ? utils.escapeHTML(draft.title) : undefined,
 					body: draft.text,
+					thumbs: draft.thumbs || [],
 				});
 			}
 		});

package/static/lib/composer/formatting.js

@@ -28,8 +28,8 @@ define('composer/formatting', [
 				const composerObj = composer.posts[uuid];
 
 				if (composerObj.action === 'topics.post' || (composerObj.action === 'posts.edit' && composerObj.isMain)) {
-					topicThumbs.modal.open({ id: uuid, pid: composerObj.pid }).then(() => {
-						postContainer.trigger('thumb.uploaded'); // toggle draft save
+					topicThumbs.modal.open({ id: uuid, postData: composerObj }).then(() => {
+						postContainer.trigger('thumb.uploaded');
 
 						// Update client-side with count
 						composer.updateThumbCount(uuid, postContainer);

package/static/lib/composer/uploads.js

@@ -19,7 +19,7 @@ define('composer/uploads', [
 		initializePaste(post_uuid);
 
 		addChangeHandlers(post_uuid);
-		addTopicThumbHandlers(post_uuid);
+
 		translator.translate('[[modules:composer.uploading, ' + 0 + '%]]', function (translated) {
 			uploadingText = translated;
 		});
@@ -37,36 +37,6 @@ define('composer/uploads', [
 		});
 	}
 
-	function addTopicThumbHandlers(post_uuid) {
-		var postContainer = $('.composer[data-uuid="' + post_uuid + '"]');
-
-		postContainer.on('click', '.topic-thumb-clear-btn', function (e) {
-			postContainer.find('input#topic-thumb-url').val('').trigger('change');
-			resetInputFile(postContainer.find('input#topic-thumb-file'));
-			$(this).addClass('hide');
-			e.preventDefault();
-		});
-
-		postContainer.on('paste change keypress', 'input#topic-thumb-url', function () {
-			var urlEl = $(this);
-			setTimeout(function () {
-				var url = urlEl.val();
-				if (url) {
-					postContainer.find('.topic-thumb-clear-btn').removeClass('hide');
-				} else {
-					resetInputFile(postContainer.find('input#topic-thumb-file'));
-					postContainer.find('.topic-thumb-clear-btn').addClass('hide');
-				}
-				postContainer.find('img.topic-thumb-preview').attr('src', url);
-			}, 100);
-		});
-	}
-
-	function resetInputFile($el) {
-		$el.wrap('<form />').closest('form').get(0).reset();
-		$el.unwrap();
-	}
-
 	function initializeDragAndDrop(post_uuid) {
 		var postContainer = $('.composer[data-uuid="' + post_uuid + '"]');
 		uploadHelpers.handleDragDrop({

package/static/lib/composer.js

@@ -201,6 +201,7 @@ define('composer', [
 			title: data.title || '',
 			body: data.body || '',
 			tags: data.tags || [],
+			thumbs: data.thumbs || [],
 			modified: !!((data.title && data.title.length) || (data.body && data.body.length)),
 			isMain: true,
 		};
@@ -417,7 +418,7 @@ define('composer', [
 		handleHelp(postContainer);
 		handleSearch(postContainer);
 		focusElements(postContainer);
-		if (postData.action === 'posts.edit') {
+		if (postData.action === 'posts.edit' || postData.action === 'topics.post') {
 			composer.updateThumbCount(post_uuid, postContainer);
 		}
 
@@ -459,10 +460,11 @@ define('composer', [
 		var title = postData.title.replace(/%/g, '%').replace(/,/g, ',');
 		postData.category = await getSelectedCategory(postData);
 		const privileges = postData.category ? postData.category.privileges : ajaxify.data.privileges;
+		const topicTemplate = isTopic && postData.category ? postData.category.topicTemplate : null;
 		var data = {
 			topicTitle: title,
 			titleLength: title.length,
-			body: translator.escape(utils.escapeHTML(postData.body)),
+			body: translator.escape(utils.escapeHTML(topicTemplate || postData.body)),
 			mobile: composer.bsEnvironment === 'xs' || composer.bsEnvironment === 'sm',
 			resizable: true,
 			thumb: postData.thumb,
@@ -736,6 +738,7 @@ define('composer', [
 				thumb: thumbEl.val() || '',
 				cid: categoryList.getSelectedCid(),
 				tags: tags.getTags(post_uuid),
+				thumbs: postData.thumbs || [],
 				timestamp: scheduler.getTimestamp(),
 			};
 		} else if (action === 'posts.reply') {
@@ -756,7 +759,7 @@ define('composer', [
 				handle: handleEl ? handleEl.val() : undefined,
 				content: bodyEl.val(),
 				title: titleEl.val(),
-				thumb: thumbEl.val() || '',
+				thumbs: postData.thumbs || [],
 				tags: tags.getTags(post_uuid),
 				timestamp: scheduler.getTimestamp(),
 			};
@@ -883,20 +886,12 @@ define('composer', [
 
 	composer.updateThumbCount = function (uuid, postContainer) {
 		const composerObj = composer.posts[uuid];
-		if (composerObj.action === 'topics.post' || (composerObj.action === 'posts.edit' && composerObj.isMain)) {
-			const calls = [
-				topicThumbs.get(uuid),
-			];
-			if (composerObj.pid) {
-				calls.push(topicThumbs.getByPid(composerObj.pid));
-			}
-			Promise.all(calls).then((thumbs) => {
-				const thumbCount = thumbs.flat().length;
-				const formatEl = postContainer.find('[data-format="thumbs"]');
-				formatEl.find('.badge')
-					.text(thumbCount)
-					.toggleClass('hidden', !thumbCount);
-			});
+		if (composerObj && (composerObj.action === 'topics.post' || (composerObj.action === 'posts.edit' && composerObj.isMain))) {
+			const thumbCount = composerObj.thumbs ? composerObj.thumbs.length : 0;
+			const formatEl = postContainer.find('[data-format="thumbs"]');
+			formatEl.find('.badge')
+				.text(thumbCount)
+				.toggleClass('hidden', !thumbCount);
 		}
 	};
 

package/static/scss/composer.scss

@@ -107,13 +107,11 @@
 				color: $body-color;
 				font-size: 16px;
 				width: 50%;
+				height: 28px;
+				padding: 4px 6px;
 				@include media-breakpoint-down(md) {
 					width: 100%;
 				}
-
-
-				height: 28px;
-				padding: 4px 6px;
 			}
 
 			.ui-autocomplete {

package/websockets.js

@@ -19,9 +19,8 @@ Sockets.push = async function (socket, pid) {
 		throw new Error('[[error:invalid-pid]]');
 	}
 
-	const [topic, tags, isMain] = await Promise.all([
+	const [topic, isMain] = await Promise.all([
 		topics.getTopicDataByPid(pid),
-		topics.getTopicTags(postData.tid),
 		posts.isMain(pid),
 	]);
 
@@ -35,8 +34,8 @@ Sockets.push = async function (socket, pid) {
 		handle: parseInt(meta.config.allowGuestHandles, 10) ? postData.handle : undefined,
 		body: postData.sourceContent || postData.content,
 		title: topic.title,
-		thumb: topic.thumb,
-		tags: tags,
+		thumbs: topic.thumbs,
+		tags: topic.tags.map(t => t.value),
 		isMain: isMain,
 		timestamp: postData.timestamp,
 	});