forks/peertube
1
0
Fork 0
Code Releases Activity

Don't support images in account descriptions

Browse source
This commit is contained in:
Chocobozzz 2019-12-06 14:01:28 +01:00
parent 7e049ea467
commit 3131c13e02
No known key found for this signature in database
GPG key ID: 583A612D890159BE
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/src/app/+accounts/account-about/account-about.component.ts
View file

@ -27,7 +27,7 @@ export class AccountAboutComponent implements OnInit, OnDestroy {
this.accountSub = this.accountService.accountLoaded this.accountSub = this.accountService.accountLoaded
.subscribe(async account => { .subscribe(async account => {
this.account = account this.account = account
this.descriptionHTML = await this.markdownService.enhancedMarkdownToHTML(this.account.description, true) this.descriptionHTML = await this.markdownService.textMarkdownToHTML(this.account.description, true)
}) })
} }

29
client/src/app/shared/renderer/markdown.service.ts
View file

@ -1,12 +1,14 @@
import { Injectable } from '@angular/core' import { Injectable } from '@angular/core'
import { MarkdownIt } from 'markdown-it' import { MarkdownIt } from 'markdown-it'
import { HtmlRendererService } from '@app/shared/renderer/html-renderer.service' import { HtmlRendererService } from '@app/shared/renderer/html-renderer.service'
import { mark } from '@angular/compiler-cli/src/ngtsc/perf/src/clock'
type MarkdownParsers = { type MarkdownParsers = {
textMarkdownIt: MarkdownIt textMarkdownIt: MarkdownIt
textWithHTMLMarkdownIt: MarkdownIt
enhancedMarkdownIt: MarkdownIt enhancedMarkdownIt: MarkdownIt
enhancedMarkdownWithHTMLIt: MarkdownIt enhancedWithHTMLMarkdownIt: MarkdownIt
completeMarkdownIt: MarkdownIt completeMarkdownIt: MarkdownIt
} }
@ -30,36 +32,45 @@ export class MarkdownService {
'newline', 'newline',
'list' 'list'
] ]
static TEXT_WITH_HTML_RULES = MarkdownService.TEXT_RULES.concat([ 'html_inline', 'html_block' ])
static ENHANCED_RULES = MarkdownService.TEXT_RULES.concat([ 'image' ]) static ENHANCED_RULES = MarkdownService.TEXT_RULES.concat([ 'image' ])
static ENHANCED_WITH_HTML_RULES = MarkdownService.ENHANCED_RULES.concat([ 'html_inline', 'html_block' ]) static ENHANCED_WITH_HTML_RULES = MarkdownService.TEXT_WITH_HTML_RULES.concat([ 'image' ])
static COMPLETE_RULES = MarkdownService.ENHANCED_WITH_HTML_RULES.concat([ 'block', 'inline', 'heading', 'paragraph' ]) static COMPLETE_RULES = MarkdownService.ENHANCED_WITH_HTML_RULES.concat([ 'block', 'inline', 'heading', 'paragraph' ])
private markdownParsers: MarkdownParsers = { private markdownParsers: MarkdownParsers = {
textMarkdownIt: null, textMarkdownIt: null,
textWithHTMLMarkdownIt: null,
enhancedMarkdownIt: null, enhancedMarkdownIt: null,
enhancedMarkdownWithHTMLIt: null, enhancedWithHTMLMarkdownIt: null,
completeMarkdownIt: null completeMarkdownIt: null
} }
private parsersConfig: MarkdownParserConfigs = { private parsersConfig: MarkdownParserConfigs = {
textMarkdownIt: { rules: MarkdownService.TEXT_RULES, html: false }, textMarkdownIt: { rules: MarkdownService.TEXT_RULES, html: false },
textWithHTMLMarkdownIt: { rules: MarkdownService.TEXT_WITH_HTML_RULES, html: true, escape: true },
enhancedMarkdownIt: { rules: MarkdownService.ENHANCED_RULES, html: false }, enhancedMarkdownIt: { rules: MarkdownService.ENHANCED_RULES, html: false },
enhancedMarkdownWithHTMLIt: { rules: MarkdownService.ENHANCED_WITH_HTML_RULES, html: true, escape: true }, enhancedWithHTMLMarkdownIt: { rules: MarkdownService.ENHANCED_WITH_HTML_RULES, html: true, escape: true },
completeMarkdownIt: { rules: MarkdownService.COMPLETE_RULES, html: true } completeMarkdownIt: { rules: MarkdownService.COMPLETE_RULES, html: true }
} }
constructor (private htmlRenderer: HtmlRendererService) {} constructor (private htmlRenderer: HtmlRendererService) {}
textMarkdownToHTML (markdown: string) { textMarkdownToHTML (markdown: string, withHtml = false) {
if (withHtml) return this.render('textWithHTMLMarkdownIt', markdown)
return this.render('textMarkdownIt', markdown) return this.render('textMarkdownIt', markdown)
} }
async enhancedMarkdownToHTML (markdown: string, withHtml = false) { enhancedMarkdownToHTML (markdown: string, withHtml = false) {
if (withHtml) return this.render('enhancedMarkdownWithHTMLIt', markdown) if (withHtml) return this.render('enhancedWithHTMLMarkdownIt', markdown)
return this.render('enhancedMarkdownIt', markdown) return this.render('enhancedMarkdownIt', markdown)
} }
async completeMarkdownToHTML (markdown: string) { completeMarkdownToHTML (markdown: string) {
return this.render('completeMarkdownIt', markdown) return this.render('completeMarkdownIt', markdown)
} }