From 0e45e336f62a411b3c423be46d16252355c754d7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Nov 2022 10:47:39 +0100 Subject: Fix HTML in account/channel description --- client/src/app/core/renderer/markdown.service.ts | 27 +++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'client/src/app/core/renderer/markdown.service.ts') diff --git a/client/src/app/core/renderer/markdown.service.ts b/client/src/app/core/renderer/markdown.service.ts index 42e8c4a88..a5fd72862 100644 --- a/client/src/app/core/renderer/markdown.service.ts +++ b/client/src/app/core/renderer/markdown.service.ts @@ -62,23 +62,40 @@ export class MarkdownService { constructor (private htmlRenderer: HtmlRendererService) {} - textMarkdownToHTML (markdown: string, withHtml = false, withEmoji = false) { + textMarkdownToHTML (options: { + markdown: string + withHtml?: boolean + withEmoji?: boolean + }) { + const { markdown, withHtml = false, withEmoji = false } = options + if (withHtml) return this.render({ name: 'textWithHTMLMarkdownIt', markdown, withEmoji }) return this.render({ name: 'textMarkdownIt', markdown, withEmoji }) } - enhancedMarkdownToHTML (markdown: string, withHtml = false, withEmoji = false) { + enhancedMarkdownToHTML (options: { + markdown: string + withHtml?: boolean + withEmoji?: boolean + }) { + const { markdown, withHtml = false, withEmoji = false } = options + if (withHtml) return this.render({ name: 'enhancedWithHTMLMarkdownIt', markdown, withEmoji }) return this.render({ name: 'enhancedMarkdownIt', markdown, withEmoji }) } - unsafeMarkdownToHTML (markdown: string, _trustedInput: true) { - return this.render({ name: 'unsafeMarkdownIt', markdown, withEmoji: true }) + markdownToUnsafeHTML (options: { markdown: string }) { + return this.render({ name: 'unsafeMarkdownIt', markdown: options.markdown, withEmoji: true }) } - customPageMarkdownToHTML (markdown: string, additionalAllowedTags: string[]) { + customPageMarkdownToHTML (options: { + markdown: string + additionalAllowedTags: string[] + }) { + const { markdown, additionalAllowedTags } = options + return this.render({ name: 'customPageMarkdownIt', markdown, withEmoji: true, additionalAllowedTags }) } -- cgit v1.2.3