nodebb-plugin-composer-default 10.3.5 → 10.3.7

package/library.js

@@ -178,7 +178,9 @@ plugin.filterComposerBuild = async function (hookData) {
 	}
 	globalPrivileges['topics:tag'] = canTagTopics;
 	const cid = parseInt(req.query.cid, 10);
-	const topicTitle = topicData && topicData.title ? topicData.title.replace(/%/g, '%').replace(/,/g, ',') : validator.escape(String(req.query.title || ''));
+	const topicTitle = topicData && topicData.title ?
+		topicData.title :
+		validator.escape(String(req.query.title || ''));
 	return {
 		req: req,
 		res: res,
@@ -197,6 +199,13 @@ plugin.filterComposerBuild = async function (hookData) {
 			// can't use title property as that is used for page title
 			topicTitle: topicTitle,
 			titleLength: topicTitle ? topicTitle.length : 0,
+			titleLabel: translator.compile(
+				isEditing ?
+					'topic:composer.editing-in' :
+					'topic:composer.replying-to',
+				`"${topicTitle}"`
+			),
+
 			topic: topicData,
 			thumb: topicData ? topicData.thumb : '',
 			body: body,

package/package.json

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

package/static/lib/composer.js

@@ -226,23 +226,24 @@ define('composer', [
 		if (data.body) {
 			data.body = '> ' + data.body.replace(/\n/g, '\n> ') + '\n\n';
 		}
-		var link = '[' + escapedTitle + '](' + config.relative_path + '/post/' + encodeURIComponent(data.selectedPid || data.toPid) + ')';
+
+		const composerTid = data.uuid ? composer.posts[data.uuid].tid : data.tid;
+		const inDifferentTopic = parseInt(data.tid, 10) !== parseInt(composerTid, 10);
+		const useTopicLink = data.title && (data.selectedPid || data.toPid) && inDifferentTopic;
+		const postHref = `${config.relative_path}/post/${encodeURIComponent(data.selectedPid || data.toPid)}`;
+		const topicLink = `[${escapedTitle}](${postHref})`;
+
+		const quoteKey = useTopicLink ?
+			'> [[modules:composer.user-said-in, ' + data.username + ', ' + topicLink + ']]\n>\n' :
+			'> [[modules:composer.user-said, ' + data.username + ', ' + postHref + ']]\n>\n';
+
 		if (data.uuid === undefined) {
-			if (data.title && (data.selectedPid || data.toPid)) {
-				composer.newReply({
-					tid: data.tid,
-					toPid: data.toPid,
-					title: data.title,
-					body: '[[modules:composer.user-said-in, ' + data.username + ', ' + link + ']]\n' + data.body,
-				});
-			} else {
-				composer.newReply({
-					tid: data.tid,
-					toPid: data.toPid,
-					title: data.title,
-					body: '[[modules:composer.user-said, ' + data.username + ']]\n' + data.body,
-				});
-			}
+			composer.newReply({
+				tid: data.tid,
+				toPid: data.toPid,
+				title: data.title,
+				body: quoteKey + data.body,
+			});
 			return;
 		} else if (data.uuid !== composer.active) {
 			// If the composer is not currently active, activate it
@@ -252,18 +253,13 @@ define('composer', [
 		var postContainer = $('.composer[data-uuid="' + data.uuid + '"]');
 		var bodyEl = postContainer.find('textarea');
 		var prevText = bodyEl.val();
-		if (data.title && (data.selectedPid || data.toPid)) {
-			translator.translate('[[modules:composer.user-said-in, ' + data.username + ', ' + link + ']]\n', config.defaultLang, onTranslated);
-		} else {
-			translator.translate('[[modules:composer.user-said, ' + data.username + ']]\n', config.defaultLang, onTranslated);
-		}
 
-		function onTranslated(translated) {
+		translator.translate(quoteKey, config.defaultLang, function (translated) {
 			composer.posts[data.uuid].body = (prevText.length ? prevText + '\n\n' : '') + translated + data.body;
 			bodyEl.val(composer.posts[data.uuid].body);
 			focusElements(postContainer);
 			preview.render(postContainer);
-		}
+		});
 	};
 
 	composer.newReply = function (data) {
@@ -448,18 +444,19 @@ define('composer', [
 		var isGuestPost = postData ? parseInt(postData.uid, 10) === 0 : false;
 		const isScheduled = postData.timestamp > Date.now();
 
-		// see
-		// https://github.com/NodeBB/NodeBB/issues/2994 and
-		// https://github.com/NodeBB/NodeBB/issues/1951
-		// remove when 1951 is resolved
-
-		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 : '';
-		var data = {
-			topicTitle: title,
-			titleLength: title.length,
+
+		let data = {
+			topicTitle: postData.title,
+			titleLength: postData.title.length,
+			titleLabel: translator.compile(
+				isEditing ?
+					'topic:composer.editing-in' :
+					'topic:composer.replying-to',
+				`"${postData.title}"`
+			),
 			body: utils.escapeHTML(translator.escape(postData.body) || topicTemplate),
 			mobile: composer.bsEnvironment === 'xs' || composer.bsEnvironment === 'sm',
 			resizable: true,

package/static/templates/composer.tpl

@@ -12,7 +12,7 @@
 			</div>
 			{{{ end }}}
 			{{{ if !isTopicOrMain }}}
-			<h4 class="title text-bg-primary">{{{ if isEditing }}}[[topic:composer.editing-in, "{topicTitle}"]]{{{ else }}}[[topic:composer.replying-to, "{topicTitle}"]]{{{ end }}}</h4>
+			<h4 class="title text-bg-primary">{titleLabel}</h4>
 			{{{ end }}}
 			<div class="display-scheduler p-2 {{{ if !canSchedule }}} hidden{{{ end }}}">
 				<i class="fa fa-clock-o"></i>

package/static/templates/partials/composer-title-container.tpl

@@ -15,7 +15,7 @@
 		{{{ if isTopicOrMain }}}
 		<input class="title form-control h-100 rounded-1 shadow-none" type="text" placeholder="[[topic:composer.title-placeholder]]" value="{topicTitle}" />
 		{{{ else }}}
-		<span class="{{{ if !template.compose }}}d-none d-md-block{{{ else }}}d-block{{{ end }}} title h-100 text-truncate">{{{ if isEditing }}}[[topic:composer.editing-in, "{topicTitle}"]]{{{ else }}}[[topic:composer.replying-to, "{topicTitle}"]]{{{ end }}}</span>
+		<span class="{{{ if !template.compose }}}d-none d-md-block{{{ else }}}d-block{{{ end }}} title h-100 text-truncate">{titleLabel}</span>
 		{{{ end }}}
 		<div id="quick-search-container" class="quick-search-container mt-2 dropdown-menu d-block p-2 hidden">
 			<div class="text-center loading-indicator"><i class="fa fa-spinner fa-spin"></i></div>