diff options
author | Chocobozzz <me@florianbigard.com> | 2022-11-14 10:47:39 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-11-14 10:47:39 +0100 |
commit | 0e45e336f62a411b3c423be46d16252355c754d7 (patch) | |
tree | d26efa3db4aca580ad2c6a154dded7a0e09593bb /client/src/app/core | |
parent | d91021548ed0dd3acec28722d0166bf38c67e0da (diff) | |
download | PeerTube-0e45e336f62a411b3c423be46d16252355c754d7.tar.gz PeerTube-0e45e336f62a411b3c423be46d16252355c754d7.tar.zst PeerTube-0e45e336f62a411b3c423be46d16252355c754d7.zip |
Fix HTML in account/channel description
Diffstat (limited to 'client/src/app/core')
-rw-r--r-- | client/src/app/core/plugins/plugin.service.ts | 4 | ||||
-rw-r--r-- | client/src/app/core/renderer/markdown.service.ts | 27 |
2 files changed, 24 insertions, 7 deletions
diff --git a/client/src/app/core/plugins/plugin.service.ts b/client/src/app/core/plugins/plugin.service.ts index 1e79cbf79..bd8c61d9a 100644 --- a/client/src/app/core/plugins/plugin.service.ts +++ b/client/src/app/core/plugins/plugin.service.ts | |||
@@ -259,11 +259,11 @@ export class PluginService implements ClientHook { | |||
259 | 259 | ||
260 | markdownRenderer: { | 260 | markdownRenderer: { |
261 | textMarkdownToHTML: (textMarkdown: string) => { | 261 | textMarkdownToHTML: (textMarkdown: string) => { |
262 | return this.markdownRenderer.textMarkdownToHTML(textMarkdown) | 262 | return this.markdownRenderer.textMarkdownToHTML({ markdown: textMarkdown }) |
263 | }, | 263 | }, |
264 | 264 | ||
265 | enhancedMarkdownToHTML: (enhancedMarkdown: string) => { | 265 | enhancedMarkdownToHTML: (enhancedMarkdown: string) => { |
266 | return this.markdownRenderer.enhancedMarkdownToHTML(enhancedMarkdown) | 266 | return this.markdownRenderer.enhancedMarkdownToHTML({ markdown: enhancedMarkdown }) |
267 | } | 267 | } |
268 | }, | 268 | }, |
269 | 269 | ||
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 { | |||
62 | 62 | ||
63 | constructor (private htmlRenderer: HtmlRendererService) {} | 63 | constructor (private htmlRenderer: HtmlRendererService) {} |
64 | 64 | ||
65 | textMarkdownToHTML (markdown: string, withHtml = false, withEmoji = false) { | 65 | textMarkdownToHTML (options: { |
66 | markdown: string | ||
67 | withHtml?: boolean | ||
68 | withEmoji?: boolean | ||
69 | }) { | ||
70 | const { markdown, withHtml = false, withEmoji = false } = options | ||
71 | |||
66 | if (withHtml) return this.render({ name: 'textWithHTMLMarkdownIt', markdown, withEmoji }) | 72 | if (withHtml) return this.render({ name: 'textWithHTMLMarkdownIt', markdown, withEmoji }) |
67 | 73 | ||
68 | return this.render({ name: 'textMarkdownIt', markdown, withEmoji }) | 74 | return this.render({ name: 'textMarkdownIt', markdown, withEmoji }) |
69 | } | 75 | } |
70 | 76 | ||
71 | enhancedMarkdownToHTML (markdown: string, withHtml = false, withEmoji = false) { | 77 | enhancedMarkdownToHTML (options: { |
78 | markdown: string | ||
79 | withHtml?: boolean | ||
80 | withEmoji?: boolean | ||
81 | }) { | ||
82 | const { markdown, withHtml = false, withEmoji = false } = options | ||
83 | |||
72 | if (withHtml) return this.render({ name: 'enhancedWithHTMLMarkdownIt', markdown, withEmoji }) | 84 | if (withHtml) return this.render({ name: 'enhancedWithHTMLMarkdownIt', markdown, withEmoji }) |
73 | 85 | ||
74 | return this.render({ name: 'enhancedMarkdownIt', markdown, withEmoji }) | 86 | return this.render({ name: 'enhancedMarkdownIt', markdown, withEmoji }) |
75 | } | 87 | } |
76 | 88 | ||
77 | unsafeMarkdownToHTML (markdown: string, _trustedInput: true) { | 89 | markdownToUnsafeHTML (options: { markdown: string }) { |
78 | return this.render({ name: 'unsafeMarkdownIt', markdown, withEmoji: true }) | 90 | return this.render({ name: 'unsafeMarkdownIt', markdown: options.markdown, withEmoji: true }) |
79 | } | 91 | } |
80 | 92 | ||
81 | customPageMarkdownToHTML (markdown: string, additionalAllowedTags: string[]) { | 93 | customPageMarkdownToHTML (options: { |
94 | markdown: string | ||
95 | additionalAllowedTags: string[] | ||
96 | }) { | ||
97 | const { markdown, additionalAllowedTags } = options | ||
98 | |||
82 | return this.render({ name: 'customPageMarkdownIt', markdown, withEmoji: true, additionalAllowedTags }) | 99 | return this.render({ name: 'customPageMarkdownIt', markdown, withEmoji: true, additionalAllowedTags }) |
83 | } | 100 | } |
84 | 101 | ||