nodebb-plugin-markdown 12.2.7 → 12.2.9

package/.jshintrc

@@ -1,86 +1,86 @@
-{
-    // JSHint Default Configuration File (as on JSHint website)
-    // See http://jshint.com/docs/ for more details
-
-    "maxerr" : 50, // {int} Maximum error before stopping
-
-    // Enforcing
-    "bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.)
-    "camelcase" : false, // true: Identifiers must be in camelCase
-    "curly" : true, // true: Require {} for every new block or scope
-    "eqeqeq" : true, // true: Require triple equals (===) for comparison
-    "forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty()
-    "immed" : false, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
-    "indent" : 4, // {int} Number of spaces to use for indentation
-    "latedef" : false, // true: Require variables/functions to be defined before being used
-    "newcap" : false, // true: Require capitalization of all constructor functions e.g. `new F()`
-    "noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee`
-    "noempty" : true, // true: Prohibit use of empty blocks
-    "nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment)
-    "plusplus" : false, // true: Prohibit use of `++` & `--`
-    "quotmark" : false, // Quotation mark consistency:
-                                // false : do nothing (default)
-                                // true : ensure whatever is used is consistent
-                                // "single" : require single quotes
-                                // "double" : require double quotes
-    "undef" : true, // true: Require all non-global variables to be declared (prevents global leaks)
-    "unused" : true, // true: Require all defined variables be used
-    "strict" : true, // true: Requires all functions run in ES5 Strict Mode
-    "trailing" : false, // true: Prohibit trailing whitespaces
-    "maxparams" : false, // {int} Max number of formal params allowed per function
-    "maxdepth" : false, // {int} Max depth of nested blocks (within functions)
-    "maxstatements" : false, // {int} Max number statements per function
-    "maxcomplexity" : false, // {int} Max cyclomatic complexity per function
-    "maxlen" : false, // {int} Max number of characters per line
-
-    // Relaxing
-    "asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
-    "boss" : false, // true: Tolerate assignments where comparisons would be expected
-    "debug" : false, // true: Allow debugger statements e.g. browser breakpoints.
-    "eqnull" : false, // true: Tolerate use of `== null`
-    "es5" : false, // true: Allow ES5 syntax (ex: getters and setters)
-    "esnext" : false, // true: Allow ES.next (ES6) syntax (ex: `const`)
-    "moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features)
-                                 // (ex: `for each`, multiple try/catch, function expression…)
-    "evil" : false, // true: Tolerate use of `eval` and `new Function()`
-    "expr" : false, // true: Tolerate `ExpressionStatement` as Programs
-    "funcscope" : false, // true: Tolerate defining variables inside control statements"
-    "globalstrict" : false, // true: Allow global "use strict" (also enables 'strict')
-    "iterator" : false, // true: Tolerate using the `__iterator__` property
-    "lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block
-    "laxbreak" : false, // true: Tolerate possibly unsafe line breakings
-    "laxcomma" : false, // true: Tolerate comma-first style coding
-    "loopfunc" : false, // true: Tolerate functions being defined in loops
-    "multistr" : false, // true: Tolerate multi-line strings
-    "proto" : false, // true: Tolerate using the `__proto__` property
-    "scripturl" : false, // true: Tolerate script-targeted URLs
-    "smarttabs" : false, // true: Tolerate mixed tabs/spaces when used for alignment
-    "shadow" : false, // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
-    "sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation
-    "supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;`
-    "validthis" : false, // true: Tolerate using this in a non-constructor function
-
-    // Environments
-    "browser" : true, // Web Browser (window, document, etc)
-    "couch" : false, // CouchDB
-    "devel" : true, // Development/debugging (alert, confirm, etc)
-    "dojo" : false, // Dojo Toolkit
-    "jquery" : true, // jQuery
-    "mootools" : false, // MooTools
-    "node" : true, // Node.js
-    "nonstandard" : false, // Widely adopted globals (escape, unescape, etc)
-    "prototypejs" : false, // Prototype and Scriptaculous
-    "rhino" : false, // Rhino
-    "worker" : false, // Web Workers
-    "wsh" : false, // Windows Scripting Host
-    "yui" : false, // Yahoo User Interface
-
-    // Legacy
-    "nomen" : false, // true: Prohibit dangling `_` in variables
-    "onevar" : false, // true: Allow only one `var` statement per function
-    "passfail" : false, // true: Stop on first error
-    "white" : false, // true: Check against strict whitespace and indentation rules
-
-    // Custom Globals
-    "globals" : {} // additional predefined global variables
+{
+    // JSHint Default Configuration File (as on JSHint website)
+    // See http://jshint.com/docs/ for more details
+
+    "maxerr" : 50, // {int} Maximum error before stopping
+
+    // Enforcing
+    "bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.)
+    "camelcase" : false, // true: Identifiers must be in camelCase
+    "curly" : true, // true: Require {} for every new block or scope
+    "eqeqeq" : true, // true: Require triple equals (===) for comparison
+    "forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty()
+    "immed" : false, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
+    "indent" : 4, // {int} Number of spaces to use for indentation
+    "latedef" : false, // true: Require variables/functions to be defined before being used
+    "newcap" : false, // true: Require capitalization of all constructor functions e.g. `new F()`
+    "noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee`
+    "noempty" : true, // true: Prohibit use of empty blocks
+    "nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment)
+    "plusplus" : false, // true: Prohibit use of `++` & `--`
+    "quotmark" : false, // Quotation mark consistency:
+                                // false : do nothing (default)
+                                // true : ensure whatever is used is consistent
+                                // "single" : require single quotes
+                                // "double" : require double quotes
+    "undef" : true, // true: Require all non-global variables to be declared (prevents global leaks)
+    "unused" : true, // true: Require all defined variables be used
+    "strict" : true, // true: Requires all functions run in ES5 Strict Mode
+    "trailing" : false, // true: Prohibit trailing whitespaces
+    "maxparams" : false, // {int} Max number of formal params allowed per function
+    "maxdepth" : false, // {int} Max depth of nested blocks (within functions)
+    "maxstatements" : false, // {int} Max number statements per function
+    "maxcomplexity" : false, // {int} Max cyclomatic complexity per function
+    "maxlen" : false, // {int} Max number of characters per line
+
+    // Relaxing
+    "asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
+    "boss" : false, // true: Tolerate assignments where comparisons would be expected
+    "debug" : false, // true: Allow debugger statements e.g. browser breakpoints.
+    "eqnull" : false, // true: Tolerate use of `== null`
+    "es5" : false, // true: Allow ES5 syntax (ex: getters and setters)
+    "esnext" : false, // true: Allow ES.next (ES6) syntax (ex: `const`)
+    "moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features)
+                                 // (ex: `for each`, multiple try/catch, function expression…)
+    "evil" : false, // true: Tolerate use of `eval` and `new Function()`
+    "expr" : false, // true: Tolerate `ExpressionStatement` as Programs
+    "funcscope" : false, // true: Tolerate defining variables inside control statements"
+    "globalstrict" : false, // true: Allow global "use strict" (also enables 'strict')
+    "iterator" : false, // true: Tolerate using the `__iterator__` property
+    "lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block
+    "laxbreak" : false, // true: Tolerate possibly unsafe line breakings
+    "laxcomma" : false, // true: Tolerate comma-first style coding
+    "loopfunc" : false, // true: Tolerate functions being defined in loops
+    "multistr" : false, // true: Tolerate multi-line strings
+    "proto" : false, // true: Tolerate using the `__proto__` property
+    "scripturl" : false, // true: Tolerate script-targeted URLs
+    "smarttabs" : false, // true: Tolerate mixed tabs/spaces when used for alignment
+    "shadow" : false, // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
+    "sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation
+    "supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;`
+    "validthis" : false, // true: Tolerate using this in a non-constructor function
+
+    // Environments
+    "browser" : true, // Web Browser (window, document, etc)
+    "couch" : false, // CouchDB
+    "devel" : true, // Development/debugging (alert, confirm, etc)
+    "dojo" : false, // Dojo Toolkit
+    "jquery" : true, // jQuery
+    "mootools" : false, // MooTools
+    "node" : true, // Node.js
+    "nonstandard" : false, // Widely adopted globals (escape, unescape, etc)
+    "prototypejs" : false, // Prototype and Scriptaculous
+    "rhino" : false, // Rhino
+    "worker" : false, // Web Workers
+    "wsh" : false, // Windows Scripting Host
+    "yui" : false, // Yahoo User Interface
+
+    // Legacy
+    "nomen" : false, // true: Prohibit dangling `_` in variables
+    "onevar" : false, // true: Allow only one `var` statement per function
+    "passfail" : false, // true: Stop on first error
+    "white" : false, // true: Check against strict whitespace and indentation rules
+
+    // Custom Globals
+    "globals" : {} // additional predefined global variables
 }

package/README.md

@@ -1,9 +1,9 @@
-# NodeBB Markdown Parser
-
-This NodeBB plugin is a parser that allows users to write posts using [Markdown](https://daringfireball.net/projects/markdown/).
-
-To customise options for the parser, please consult the "Markdown" page in the administration panel, under the "Plugins" heading.
-
-## Installation
-
-    npm install nodebb-plugin-markdown
+# NodeBB Markdown Parser
+
+This NodeBB plugin is a parser that allows users to write posts using [Markdown](https://daringfireball.net/projects/markdown/).
+
+To customise options for the parser, please consult the "Markdown" page in the administration panel, under the "Plugins" heading.
+
+## Installation
+
+    npm install nodebb-plugin-markdown

package/index.js

@@ -4,15 +4,10 @@ const MarkdownIt = require('markdown-it');
 const fs = require('fs');
 const path = require('path');
 
-const probe = require('probe-image-size');
-
 const nconf = require.main.require('nconf');
 const winston = require.main.require('winston');
 const meta = require.main.require('./src/meta');
-const posts = require.main.require('./src/posts');
-const translator = require.main.require('./src/translator');
 const plugins = require.main.require('./src/plugins');
-const cacheCreate = require.main.require('./src/cacheCreate');
 
 const SocketPlugins = require.main.require('./src/socket.io/plugins');
 SocketPlugins.markdown = require('./websockets');
@@ -21,8 +16,6 @@ let parser;
 let app;
 const Markdown = {
 	config: {},
-	_externalImageCache: undefined,
-	_externalImageFailures: new Set(),
 	onLoad: async function (params) {
 		app = params.app;
 		const { router } = params;
@@ -88,9 +81,6 @@ const Markdown = {
 			highlight: true,
 			highlightTheme: 'default.css',
 
-			probe: true,
-			probeCacheSize: 256,
-
 			xhtmlOut: true,
 			breaks: true,
 			linkify: true,
@@ -101,7 +91,7 @@ const Markdown = {
 			checkboxes: true,
 			multimdTables: true,
 		};
-		const notCheckboxes = ['langPrefix', 'highlightTheme', 'probeCacheSize'];
+		const notCheckboxes = ['langPrefix', 'highlightTheme'];
 
 		meta.settings.get('markdown', (err, options) => {
 			if (err) {
@@ -125,15 +115,6 @@ const Markdown = {
 			parser = new MarkdownIt(_self.config);
 
 			Markdown.updateParserRules(parser);
-
-			// External image size cache
-			if (_self.config.probe) {
-				Markdown._externalImageCache = cacheCreate({
-					name: 'markdown.externalImageCache',
-					max: parseInt(_self.config.probeCacheSize, 10) || 256,
-					ttl: 1000 * 60 * 60 * 24, // 1 day
-				});
-			}
 		});
 	},
 
@@ -174,62 +155,11 @@ const Markdown = {
 		return Markdown.afterParse(raw);
 	},
 
-	beforeParse: async (data) => {
+	beforeParse: async (/* data */) => {
 		const env = {
 			images: new Map(),
 		};
 
-		if (data && data.postData && data.postData.pid) {
-			// Check that pid for images, and return their sizes
-			const images = await posts.uploads.listWithSizes(data.postData.pid);
-			env.images = images.reduce((memo, cur) => {
-				memo.set(cur.name, cur);
-				delete cur.name;
-				return memo;
-			}, env.images);
-		}
-
-		// Probe post data for external images as well
-		if (Markdown.config.probe && data && data.postData && data.postData.content) {
-			const matcher = /!\[[^\]]*?\]\((https?[^)]+?)\)/g;
-			let current;
-
-			// eslint-disable-next-line no-cond-assign
-			while ((current = matcher.exec(data.postData.content)) !== null) {
-				const match = current[1];
-				if (match && Markdown.isExternalLink(match)) { // for security only parse external images
-					const parsedUrl = new URL(match, nconf.get('url'));
-					const filename = path.basename(parsedUrl.pathname);
-					const size = Markdown._externalImageCache.get(match);
-
-					// Short-circuit to ignore previous failures
-					const hasFailed = Markdown._externalImageFailures.has(match);
-					if (!hasFailed) {
-						if (size) {
-							env.images.set(filename, size);
-						} else {
-							// Size checked asynchronously, see: https://github.com/tomas/needle/issues/389
-							probe(match, {
-								follow_max: 2,
-							}).then((size) => {
-								let { width, height } = size;
-
-								// Swap width and height if orientation bit is set
-								if (size.orientation >= 5 && size.orientation <= 8) {
-									[width, height] = [height, width];
-								}
-
-								Markdown._externalImageCache.set(match, { width, height });
-							}).catch(() => {
-								// Likely an issue getting the external image size, ignore in the future
-								Markdown._externalImageFailures.add(match);
-							});
-						}
-					}
-				}
-			}
-		}
-
 		return env;
 	},
 
@@ -262,10 +192,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;
 	},
 
@@ -351,23 +279,12 @@ const Markdown = {
 		parser.renderer.rules.image = function (tokens, idx, options, env, self) {
 			const token = tokens[idx];
 			const attributes = new Map(token.attrs);
-			const parsedSrc = new URL(attributes.get('src'), nconf.get('url'));
 
 			// Validate the url
 			if (!Markdown.isUrlValid(attributes.get('src'))) { return ''; }
 
 			token.attrSet('class', `${token.attrGet('class') || ''} img-fluid img-markdown`);
 
-			// Append sizes to images
-			if (parsedSrc.pathname) {
-				const filename = path.basename(parsedSrc.pathname);
-				if (env.images && env.images.has(filename)) {
-					const size = env.images.get(filename);
-					token.attrSet('width', size.width);
-					token.attrSet('height', size.height);
-				}
-			}
-
 			return renderImage(tokens, idx, options, env, self);
 		};
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-markdown",
-  "version": "12.2.7",
+  "version": "12.2.9",
   "description": "A Markdown parser for NodeBB",
   "main": "index.js",
   "repository": {
@@ -33,8 +33,7 @@
     "highlightjs-line-numbers.js": "^2.8.0",
     "markdown-it": "^12.0.6",
     "markdown-it-checkbox": "^1.1.0",
-    "markdown-it-multimd-table": "^4.0.1",
-    "probe-image-size": "^7.2.1"
+    "markdown-it-multimd-table": "^4.0.1"
   },
   "nbbpm": {
     "compatibility": "^3.0.0"

package/public/languages/de/markdown.json

@@ -1,12 +1,12 @@
-{
-	"bold": "Fettschrift",
-	"italic": "Kursivschrift",
-	"list-item": "Listenpunkt",
-	"strikethrough-text": "Durchgestrichen",
-	"code-text": "code_text",
-	"link-text": "Link Text",
-	"link-url": "Link Adresse",
-	"picture-text": "Bild Text",
-	"picture-url": "Bild Link",
-	"help-text": "Dieses Forum unterstützt Markdown. Für mehr Informationen, [hier klicken](http://commonmark.org/help/)"
-}
+{
+	"bold": "Fettschrift",
+	"italic": "Kursivschrift",
+	"list-item": "Listenpunkt",
+	"strikethrough-text": "Durchgestrichen",
+	"code-text": "code_text",
+	"link-text": "Link Text",
+	"link-url": "Link Adresse",
+	"picture-text": "Bild Text",
+	"picture-url": "Bild Link",
+	"help-text": "Dieses Forum unterstützt Markdown. <a href=\"http://commonmark.org/help/\" class=\"text-decoration-underline\">Für mehr Informationen, hier klicken.</a>"
+}

package/public/languages/en-GB/markdown.json

@@ -1,13 +1,13 @@
-{
-	"bold": "bolded text",
-	"italic": "italicised text",
-	"list-item": "list item",
-	"heading": "heading",
-	"strikethrough-text": "strikethrough text",
-	"code-text": "code_text",
-	"link-text": "link text",
-	"link-url": "link url",
-	"picture-text": "alt text",
-	"picture-url": "image url",
-	"help-text": "This forum is powered by Markdown. For full documentation, [click here](http://commonmark.org/help/)"
+{
+	"bold": "bolded text",
+	"italic": "italicised text",
+	"list-item": "list item",
+	"heading": "heading",
+	"strikethrough-text": "strikethrough text",
+	"code-text": "code_text",
+	"link-text": "link text",
+	"link-url": "link url",
+	"picture-text": "alt text",
+	"picture-url": "image url",
+	"help-text": "This forum is powered by Markdown. <a href=\"http://commonmark.org/help/\" class=\"text-decoration-underline\">For full documentation, click here.</a>"
 }

package/public/languages/fa-IR/markdown.json

@@ -1,11 +1,11 @@
-{
-	"bold": "متن پررنگ",
-	"italic": "متن ایتالیک ( کج )",
-	"list-item": "لیست",
-	"strikethrough-text": "متن خط خورده",
-	"link-text": "متن لینک",
-	"link-url": "آدرس لینک",
-	"picture-text": "متن جایگزین",
-	"picture-url": "آدرس عکس",
-	"help-text": "این انجمن از زبان مارک دون استفاده می کند، برای اطلاعات بیشتر [اینجا](http://commonmark.org/help/) کلیک کنید!"
-}
+{
+	"bold": "متن پررنگ",
+	"italic": "متن ایتالیک ( کج )",
+	"list-item": "لیست",
+	"strikethrough-text": "متن خط خورده",
+	"link-text": "متن لینک",
+	"link-url": "آدرس لینک",
+	"picture-text": "متن جایگزین",
+	"picture-url": "آدرس عکس",
+	"help-text": "این انجمن از زبان مارک دون استفاده می کند، برای اطلاعات بیشتر [اینجا](http://commonmark.org/help/) کلیک کنید!"
+}

package/public/languages/fr/markdown.json

@@ -1,11 +1,11 @@
-{
-	"bold": "texte en gras",
-	"italic": "texte en italique",
-	"list-item": "élément de liste",
-	"strikethrough-text": "strikethrough text",
-	"link-text": "texte du lien",
-	"link-url": "url du lien",
-	"picture-text": "text alternatif",
-	"picture-url": "url de l'image",
-	"help-text": "Ce forum utilise la syntaxe Markdown. Pour accéder à la documentation, suivre ce [lien](http://commonmark.org/help/)"
-}
+{
+	"bold": "texte en gras",
+	"italic": "texte en italique",
+	"list-item": "élément de liste",
+	"strikethrough-text": "strikethrough text",
+	"link-text": "texte du lien",
+	"link-url": "url du lien",
+	"picture-text": "text alternatif",
+	"picture-url": "url de l'image",
+	"help-text": "Ce forum utilise la syntaxe Markdown. <a href=\"http://commonmark.org/help/\" class=\"text-decoration-underline\">Pour accéder à la documentation, suivre ce lien.</a>"
+}

package/public/languages/he/markdown.json

@@ -1,12 +1,12 @@
-{
-	"bold": "טקסט מודגש",
-	"italic": "טקסט נטוי",
-	"list-item": "פריט רשימה",
-	"strikethrough-text": "קו חוצה",
-	"code-text": "קוד",
-	"link-text": "טקסט קישור",
-	"link-url": "כתובת קישור",
-	"picture-text": "כיתוב בבעיות טעינה",
-	"picture-url": "כתובת תמונה",
-	"help-text": "הפורום עובד עם Markdown. להסבר מלא, [לחץ כאן](http://commonmark.org/help/)"
-}
+{
+	"bold": "טקסט מודגש",
+	"italic": "טקסט נטוי",
+	"list-item": "פריט רשימה",
+	"strikethrough-text": "קו חוצה",
+	"code-text": "קוד",
+	"link-text": "טקסט קישור",
+	"link-url": "כתובת קישור",
+	"picture-text": "כיתוב בבעיות טעינה",
+	"picture-url": "כתובת תמונה",
+	"help-text": "הפורום עובד עם Markdown. להסבר מלא, [לחץ כאן](http://commonmark.org/help/)"
+}

package/public/languages/pl/markdown.json

@@ -1,11 +1,11 @@
-{
-	"bold": "pogrubienie",
-	"italic": "pochylenie",
-	"list-item": "wypunktowanie",
-	"strikethrough-text": "przekreślenie",
-	"link-text": "tekst odnośnika",
-	"link-url": "url odnośnika",
-	"picture-text": "text alternatywny",
-	"picture-url": "url obrazu",
-	"help-text": "Forum działa dzięki Markdown. By uzyskać pełną dokumentację, [kliknij tutaj](http://commonmark.org/help/)"
-}
+{
+	"bold": "pogrubienie",
+	"italic": "pochylenie",
+	"list-item": "wypunktowanie",
+	"strikethrough-text": "przekreślenie",
+	"link-text": "tekst odnośnika",
+	"link-url": "url odnośnika",
+	"picture-text": "text alternatywny",
+	"picture-url": "url obrazu",
+	"help-text": "Forum działa dzięki Markdown. <a href=\"http://commonmark.org/help/\" class=\"text-decoration-underline\">By uzyskać pełną dokumentację, kliknij tutaj.</a>"
+}

package/public/languages/ru/markdown.json

@@ -7,5 +7,5 @@
 	"link-url": "Адрес ссылки",
 	"picture-text": "Описание",
 	"picture-url": "URL-адрес изображения",
-	"help-text": "Этот форум работает на основе Markdown. Для получения полной документации [перейдите на сайт](http://commonmark.org/help/)"
+	"help-text": "Этот форум работает на основе Markdown. <a href=\"http://commonmark.org/help/\" class=\"text-decoration-underline\">Для получения полной документации перейдите на сайт.</a>"
 }

package/public/languages/tr/markdown.json

@@ -1,11 +1,11 @@
-{
-	"bold": "kalın yazı",
-	"italic": "İtalik yazı",
-	"list-item": "liste madde",
-	"strikethrough-text": "Üstü çizili metin",
-	"link-text": "bağlantı metni",
-	"link-url": "link url",
-	"picture-text": "alt metni",
-	"picture-url": "görsel url",
-	"help-text": "This forum is powered by Markdown. For full documentation, [click here](http://commonmark.org/help/)"
-}
+{
+	"bold": "kalın yazı",
+	"italic": "İtalik yazı",
+	"list-item": "liste madde",
+	"strikethrough-text": "Üstü çizili metin",
+	"link-text": "bağlantı metni",
+	"link-url": "link url",
+	"picture-text": "alt metni",
+	"picture-url": "görsel url",
+	"help-text": "This forum is powered by Markdown. <a href=\"http://commonmark.org/help/\" class=\"text-decoration-underline\">For full documentation, click here.</a>"
+}

package/public/languages/zh-CN/markdown.json

@@ -1,11 +1,11 @@
-{
-	"bold": "粗体字",
-	"italic": "斜体字",
-	"list-item": "列表",
-	"strikethrough-text": "删除线",
-	"link-text": "链接文本",
-	"link-url": "链接地址",
-	"picture-text": "替代文字",
-	"picture-url": "图片地址",
-	"help-text": "该论坛使用 Markdown 语法。[点此查看](http://commonmark.org/help/) 语法说明。"
-}
+{
+	"bold": "粗体字",
+	"italic": "斜体字",
+	"list-item": "列表",
+	"strikethrough-text": "删除线",
+	"link-text": "链接文本",
+	"link-url": "链接地址",
+	"picture-text": "替代文字",
+	"picture-url": "图片地址",
+	"help-text": "该论坛使用 Markdown 语法。[点此查看](http://commonmark.org/help/) 语法说明。"
+}

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

@@ -148,24 +148,6 @@
 					</div>
 				</div>
 
-				<div class="mb-4">
-					<h5 class="fw-bold tracking-tight settings-header">Images</h5>
-
-					<div class="mb-3 form-check form-switch">
-						<input type="checkbox" class="form-check-input" name="probe" id="probe" />
-						<label class="form-check-label" for="probe">
-							Append image sizes for externally linked images
-						</label>
-					</div>
-					<div class="mb-3">
-						<label class="form-label" for="probeCacheSize">Cache size (number of images)</label>
-						<input class="form-control" type="number" id="probeCacheSize" name="probeCacheSize" placeholder="256 (Default)" />
-						<p class="form-text">
-							Markdown automatically saves image sizes so as to not make too many unnecessary calls. It remembers this value for 24 hours, to a maximum number of images as defined here. Increase this number if your forum posts contain links to many external images.
-						</p>
-					</div>
-				</div>
-
 				<div class="mb-4">
 					<h5 class="fw-bold tracking-tight settings-header">HTML Sanitization</h5>
 

package/public/templates/modals/markdown-help.tpl

@@ -1,3 +1,6 @@
+<h2>Markdown</h2>
+<p>[[markdown:help-text]]</p>
+
 <table class="table markdown-reference">
 	<thead>
 		<tr>