feat: v3 compatibility

Author: oplik0

index.js

@@ -19,23 +19,25 @@ const SocketPlugins = require.main.require('./src/socket.io/plugins');
 SocketPlugins.markdown = require('./websockets');
 
 let parser;
-
+let app;
 const Markdown = {
 	config: {},
 	_externalImageCache: undefined,
 	_externalImageFailures: new Set(),
 	onLoad: async function (params) {
+		app = params.app;
+		const { router } = params;
 		const controllers = require('./lib/controllers');
 		const hostMiddleware = require.main.require('./src/middleware');
+		const routeHelpers = require.main.require('./src/routes/helpers');
 		const middlewares = [
 			hostMiddleware.maintenanceMode, hostMiddleware.registrationComplete, hostMiddleware.pluginHooks,
 		];
 
-		params.router.get('/admin/plugins/markdown', params.middleware.admin.buildHeader, controllers.renderAdmin);
-		params.router.get('/api/admin/plugins/markdown', controllers.renderAdmin);
+		routeHelpers.setupAdminPageRoute(router, '/admin/plugins/markdown', controllers.renderAdmin);
 
 		// Return raw markdown via GET
-		params.router.get('/api/post/:pid/raw', middlewares, controllers.retrieveRaw);
+		router.get('/api/post/:pid/raw', middlewares, controllers.retrieveRaw);
 
 		Markdown.init();
 		await Markdown.loadThemes();
@@ -44,11 +46,18 @@ const Markdown = {
 	},
 
 	getConfig: async (config) => {
-		const { defaultHighlightLanguage, highlightTheme } = await meta.settings.get('markdown');
+		let { defaultHighlightLanguage, highlightTheme, hljsLanguages, highlightLinesLanguageList } = await meta.settings.get('markdown');
+
+		try {
+			hljsLanguages = JSON.parse(hljsLanguages);
+		} catch (e) {
+			hljsLanguages = ['common'];
+		}
 
 		config.markdown = {
 			highlight: Markdown.highlight ? 1 : 0,
-			highlightLinesLanguageList: Markdown.config.highlightLinesLanguageList,
+			highlightLinesLanguageList,
+			hljsLanguages,
 			theme: highlightTheme || 'default.css',
 			defaultHighlightLanguage: defaultHighlightLanguage || '',
 		};
@@ -79,7 +88,6 @@ const Markdown = {
 
 			langPrefix: 'language-',
 			highlight: true,
-			highlightLinesLanguageList: [],
 			highlightTheme: 'default.css',
 
 			probe: true,
@@ -95,7 +103,7 @@ const Markdown = {
 			checkboxes: true,
 			multimdTables: true,
 		};
-		const notCheckboxes = ['langPrefix', 'highlightTheme', 'highlightLinesLanguageList', 'probeCacheSize'];
+		const notCheckboxes = ['langPrefix', 'highlightTheme', 'probeCacheSize'];
 
 		meta.settings.get('markdown', (err, options) => {
 			if (err) {
@@ -116,17 +124,6 @@ const Markdown = {
 			_self.highlight = _self.config.highlight;
 			delete _self.config.highlight;
 
-			if (typeof _self.config.highlightLinesLanguageList === 'string') {
-				try {
-					_self.config.highlightLinesLanguageList = JSON.parse(_self.config.highlightLinesLanguageList);
-				} catch (e) {
-					winston.warn('[plugins/markdown] Invalid config for highlightLinesLanguageList, blanking.');
-					_self.config.highlightLinesLanguageList = [];
-				}
-
-				_self.config.highlightLinesLanguageList = _self.config.highlightLinesLanguageList.join(',').split(',');
-			}
-
 			parser = new MarkdownIt(_self.config);
 
 			Markdown.updateParserRules(parser);
@@ -273,7 +270,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}`);
-		helpContent += parsed;
+		const html = await app.renderAsync('modals/markdown-help', {});
+		helpContent += parsed + html;
 		return helpContent;
 	},
 
@@ -361,7 +359,7 @@ const Markdown = {
 			// Validate the url
 			if (!Markdown.isUrlValid(attributes.get('src'))) { return ''; }
 
-			token.attrSet('class', `${token.attrGet('class') || ''} img-responsive img-markdown`);
+			token.attrSet('class', `${token.attrGet('class') || ''} img-fluid img-markdown`);
 
 			// Append sizes to images
 			if (parsedSrc.pathname) {

lib/controllers.js

@@ -1,12 +1,20 @@
 'use strict';
 
+const path = require('path');
+
 const parent = module.parent.exports;
 const posts = require.main.require('./src/posts');
+const file = require.main.require('./src/file');
 const Controllers = {};
 
-Controllers.renderAdmin = function renderAdmin(req, res) {
+Controllers.renderAdmin = async function renderAdmin(req, res) {
+	let hljsLanguages = await file.walk(path.resolve(require.main.path, 'node_modules/highlight.js/lib/languages'));
+	hljsLanguages = hljsLanguages.map(language => path.basename(language, '.js')).filter(language => !language.endsWith('.js'));
+
 	res.render('admin/plugins/markdown', {
 		themes: parent.themes,
+		hljsLanguages,
+		title: 'Markdown',
 	});
 };