import * as MarkdownIt from 'markdown-it'
-import { buildVideoLink } from 'src/assets/player/utils'
import { Injectable } from '@angular/core'
+import { buildVideoLink, decorateVideoLink } from '@shared/core-utils'
import {
COMPLETE_RULES,
ENHANCED_RULES,
constructor (private htmlRenderer: HtmlRendererService) {}
- textMarkdownToHTML (markdown: string, withHtml = false, withEmoji = false) {
+ textMarkdownToHTML (options: {
+ markdown: string
+ withHtml?: boolean // default false
+ withEmoji?: boolean // default false
+ }) {
+ 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 // default false
+ withEmoji?: boolean // default false
+ }) {
+ 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 })
}
- processVideoTimestamps (html: string) {
+ // ---------------------------------------------------------------------------
+
+ processVideoTimestamps (videoShortUUID: string, html: string) {
return html.replace(/((\d{1,2}):)?(\d{1,2}):(\d{1,2})/g, function (str, _, h, m, s) {
const t = (3600 * +(h || 0)) + (60 * +(m || 0)) + (+(s || 0))
- const url = buildVideoLink({ startTime: t })
+
+ const url = decorateVideoLink({
+ url: buildVideoLink({ shortUUID: videoShortUUID }),
+ startTime: t
+ })
+
+ // Sync class name with timestamp-route-transformer directive
return `<a class="video-timestamp" href="${url}">${str}</a>`
})
}
const { name, markdown, withEmoji, additionalAllowedTags } = options
if (!markdown) return ''
- const config = this.parsersConfig[ name ]
- if (!this.markdownParsers[ name ]) {
- this.markdownParsers[ name ] = await this.createMarkdownIt(config)
+ const config = this.parsersConfig[name]
+ if (!this.markdownParsers[name]) {
+ this.markdownParsers[name] = await this.createMarkdownIt(config)
if (withEmoji) {
if (!this.emojiModule) {
this.emojiModule = (await import('markdown-it-emoji/light')).default
}
- this.markdownParsers[ name ].use(this.emojiModule)
+ this.markdownParsers[name].use(this.emojiModule)
}
}
- let html = this.markdownParsers[ name ].render(markdown)
+ let html = this.markdownParsers[name].render(markdown)
html = this.avoidTruncatedTags(html)
if (config.escape) return this.htmlRenderer.toSafeHtml(html, additionalAllowedTags)
if (relIndex < 0) token.attrPush([ 'rel', 'noopener noreferrer' ])
else token.attrs[relIndex][1] = 'noopener noreferrer'
- // pass token to default renderer.
+ // pass token to default renderer.*
return defaultRender(tokens, index, options, env, self)
}
}
private avoidTruncatedTags (html: string) {
return html.replace(/\*\*?([^*]+)$/, '$1')
.replace(/<a[^>]+>([^<]+)<\/a>\s*...((<\/p>)|(<\/li>)|(<\/strong>))?$/mi, '$1...')
- .replace(/\[[^\]]+\]\(([^\)]+)$/m, '$1')
+ .replace(/\[[^\]]+\]\(([^)]+)$/m, '$1')
.replace(/\s?\[[^\]]+\]?[.]{3}<\/p>$/m, '...</p>')
}
}