nodebb-plugin-markdown 9.0.0 → 9.0.4

package/index.js

@@ -6,6 +6,7 @@ const path = require('path');
 const url = require('url');
 
 const probe = require('probe-image-size');
+const punycode = require('punycode');
 
 const nconf = require.main.require('nconf');
 const winston = require.main.require('winston');
@@ -35,19 +36,19 @@ const Markdown = {
 		params.router.get('/api/post/:pid/raw', middlewares, controllers.retrieveRaw);
 
 		Markdown.init();
-		Markdown.loadThemes();
+		await Markdown.loadThemes();
 
 		return params;
 	},
 
 	getConfig: async (config) => {
-		const { defaultHighlightLanguage } = await meta.settings.get('markdown');
+		const { defaultHighlightLanguage, highlightTheme } = await meta.settings.get('markdown');
 
 		config.markdown = {
 			highlight: Markdown.highlight ? 1 : 0,
 			highlightLinesLanguageList: Markdown.config.highlightLinesLanguageList,
-			theme: Markdown.config.highlightTheme || 'default.min.css',
-			defaultHighlightLanguage,
+			theme: highlightTheme || 'default.min.css',
+			defaultHighlightLanguage: defaultHighlightLanguage || '',
 		};
 
 		return config;
@@ -59,13 +60,13 @@ const Markdown = {
 		hookData.links.push({
 			rel: 'prefetch stylesheet',
 			type: '',
-			href: `https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.4.0/styles/${highlightTheme || 'default.min.css'}`,
+			href: `${nconf.get('relative_path')}/assets/plugins/nodebb-plugin-markdown/themes/${highlightTheme || 'default.min.css'}`,
 		}, {
 			rel: 'prefetch',
 			href: `${nconf.get('relative_path')}/assets/language/${meta.config.defaultLang || 'en-GB'}/markdown.json?${meta.config['cache-buster']}`,
 		}, {
 			rel: 'prefetch',
-			href: 'https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.4.0/highlight.min.js',
+			href: `${nconf.get('relative_path')}/assets/src/modules/highlight.js`,
 		});
 
 		return hookData;
@@ -143,22 +144,17 @@ const Markdown = {
 		});
 	},
 
-	loadThemes: function () {
-		fs.readdir(path.resolve(__dirname, 'node_modules/@highlightjs/cdn-assets/styles'), function (err, files) {
-			if (err) {
-				winston.error('[plugin/markdown] Could not load Markdown themes: ' + err.message);
-				Markdown.themes = [];
-				return;
-			}
+	loadThemes: async () => {
+		try {
+			const files = await fs.promises.readdir(path.resolve(require.main.paths[0], '@highlightjs/cdn-assets/styles'));
 			const isStylesheet = /\.css$/;
 			Markdown.themes = files.filter(function (file) {
 				return isStylesheet.test(file);
-			}).map(function (file) {
-				return {
-					name: file,
-				};
 			});
-		});
+		} catch (err) {
+			winston.error('[plugin/markdown] Could not load Markdown themes: ' + err.message);
+			Markdown.themes = [];
+		}
 	},
 
 	parsePost: async function (data) {
@@ -406,6 +402,11 @@ const Markdown = {
 				}
 			}
 
+			// Convert any homographs in link text to punycode
+			if (tokens[idx + 1] && tokens[idx + 1].type === 'text') {
+				tokens[idx + 1].content = punycode.toASCII(tokens[idx + 1].content);
+			}
+
 			return renderLink(tokens, idx, options, env, self);
 		};
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-markdown",
-  "version": "9.0.0",
+  "version": "9.0.4",
   "description": "A Markdown parser for NodeBB",
   "main": "index.js",
   "repository": {
@@ -34,7 +34,8 @@
     "markdown-it": "^12.0.6",
     "markdown-it-checkbox": "^1.1.0",
     "markdown-it-multimd-table": "^4.0.1",
-    "probe-image-size": "^7.2.1"
+    "probe-image-size": "^7.2.1",
+    "punycode": "^2.1.1"
   },
   "nbbpm": {
     "compatibility": "^1.17.0"

package/plugin.json

@@ -14,10 +14,10 @@
         "public/js/admin.js"
     ],
     "staticDirs": {
-        "js": "public/js"
+        "themes": "../@highlightjs/cdn-assets/styles"
     },
     "modules": {
-        "highlight.js": "./node_modules/@highlightjs/cdn-assets/highlight.min.js",
+        "highlight.js": "../@highlightjs/cdn-assets/highlight.min.js",
         "highlightjs-line-numbers.js": "./public/js/highlightjs-line-numbers.js"
     },
     "languages": "public/languages",
@@ -36,5 +36,8 @@
         { "hook": "filter:config.get", "method": "getConfig" },
         { "hook": "filter:meta.getLinkTags", "method": "getLinkTags"},
         { "hook": "filter:sanitize.config", "method": "updateSanitizeConfig" }
+    ],
+    "upgrades": [
+        "upgrades/reset_md_hljs_theme.js"
     ]
 }

package/public/templates/admin/plugins/markdown.tpl

@@ -82,9 +82,9 @@
 							<div class="form-group">
 								<label for="highlightTheme">Use this theme for highlighted code blocks</label>
 								<select class="form-control" name="highlightTheme" id="highlightTheme">
-									<!-- BEGIN themes -->
-									<option value="{themes.name}">{themes.name}</option>
-									<!-- END themes -->
+									{{{ each themes }}}
+									<option value="{@value}">{@value}</option>
+									{{{ end }}}
 								</select>
 							</div>
 

package/upgrades/reset_md_hljs_theme.js

@@ -0,0 +1,20 @@
+'use strict';
+
+const meta = require.main.require('./src/meta');
+const markdown = require('..');
+
+module.exports = {
+	name: 'Reset Markdown Theme (if selected theme is not available)',
+	timestamp: Date.UTC(2022, 0, 31),
+	method: async () => {
+		const { highlightTheme } = await meta.settings.get('markdown');
+		await markdown.loadThemes();
+
+		let newTheme = highlightTheme.replace('.css', '.min.css');
+		if (!markdown.themes.includes(newTheme)) {
+			newTheme = 'default.min.css';
+		}
+
+		await meta.settings.setOne('markdown', 'highlightTheme', newTheme);
+	},
+};