nodebb-plugin-markdown 13.0.0-pre.8 → 13.0.0

package/index.js

@@ -8,7 +8,6 @@ const nconf = require.main.require('nconf');
 const winston = require.main.require('winston');
 const meta = require.main.require('./src/meta');
 const activitypub = require.main.require('./src/activitypub');
-const translator = require.main.require('./src/translator');
 const plugins = require.main.require('./src/plugins');
 
 const SocketPlugins = require.main.require('./src/socket.io/plugins');
@@ -136,6 +135,7 @@ const Markdown = {
 		if (env.parse && data && data.postData && data.postData.content && parser) {
 			data.postData.content = parser.render(data.postData.content, env || {});
 		}
+
 		return Markdown.afterParse(data);
 	},
 
@@ -160,17 +160,20 @@ const Markdown = {
 	beforeParse: async (data) => {
 		let env = {
 			parse: true,
+			type: data.type,
 			images: new Map(), // is this still used?
 		};
 
 		({ env } = await plugins.hooks.fire('filter:markdown.beforeParse', { env, data: Object.freeze({ ...data }) }));
 
-		if (
-			activitypub.helpers.isUri(data.postData.pid) &&
-			(!data.postData.hasOwnProperty('sourceContent') || !data.postData.sourceContent)
-		) {
-			// content contained is likely already html, bypass parsing
-			env.parse = false;
+		if (activitypub.helpers.isUri(data.postData.pid)) {
+			if (data.postData.sourceContent) {
+				data.content = data.sourceContent;
+				delete data.sourceContent;
+			} else {
+				// content contained is likely already html, bypass parsing
+				env.parse = false;
+			}
 		}
 
 		return env;
@@ -205,10 +208,8 @@ const Markdown = {
 	},
 
 	renderHelp: async function (helpContent) {
-		const translated = await translator.translate('[[markdown:help-text]]');
-		const parsed = await plugins.hooks.fire('filter:parse.raw', `## Markdown\n${translated}`);
 		const html = await app.renderAsync('modals/markdown-help', {});
-		helpContent += parsed + html;
+		helpContent += html;
 		return helpContent;
 	},
 
@@ -294,6 +295,10 @@ const Markdown = {
 		parser.renderer.rules.image = function (tokens, idx, options, env, self) {
 			const token = tokens[idx];
 			const attributes = new Map(token.attrs);
+			if (env.type === 'plaintext') {
+				const filename = path.basename(attributes.get('src'));
+				return `[image: ${filename}]`;
+			}
 
 			// Validate the url
 			if (!Markdown.isUrlValid(attributes.get('src'))) { return ''; }
@@ -304,6 +309,10 @@ const Markdown = {
 		};
 
 		parser.renderer.rules.link_open = function (tokens, idx, options, env, self) {
+			if (env.type === 'plaintext') {
+				return '';
+			}
+
 			const attributes = new Map(tokens[idx].attrs);
 
 			if (attributes.has('href') && Markdown.isExternalLink(attributes.get('href'))) {
@@ -337,6 +346,15 @@ const Markdown = {
 			return renderLink(tokens, idx, options, env, self);
 		};
 
+		parser.renderer.rules.link_close = function (...args) {
+			const [,,, env, self] = args;
+			if (env === 'plaintext') {
+				return '';
+			}
+
+			return self.renderToken(...args);
+		};
+
 		parser.renderer.rules.table_open = function (tokens, idx, options, env, self) {
 			const classIdx = tokens[idx].attrIndex('class');