ActivityPub-federated video streaming platform using P2P directly in your web browser
client: dont use rel=ugc for plugins markdown
kontrollantenf07112109bfe
diff --git a/client/src/app/core/plugins/plugin.service.ts b/client/src/app/core/plugins/plugin.service.tsindex 2afb41d1de..2f3eb39831 100644--- a/client/src/app/core/plugins/plugin.service.ts+++ b/client/src/app/core/plugins/plugin.service.ts@@ -316,11 +316,11 @@ export class PluginService implements ClientHook {markdownRenderer: {textMarkdownToHTML: (textMarkdown: string) => {- return this.markdownRenderer.textMarkdownToHTML({ markdown: textMarkdown })+ return this.markdownRenderer.textMarkdownToHTML({ markdown: textMarkdown, userGeneratedLinks: false })},enhancedMarkdownToHTML: (enhancedMarkdown: string) => {- return this.markdownRenderer.enhancedMarkdownToHTML({ markdown: enhancedMarkdown })+ return this.markdownRenderer.enhancedMarkdownToHTML({ markdown: enhancedMarkdown, userGeneratedLinks: false })}},diff --git a/client/src/app/core/renderer/markdown.service.ts b/client/src/app/core/renderer/markdown.service.tsindex 8251eae8b0..35e393375e 100644--- a/client/src/app/core/renderer/markdown.service.ts+++ b/client/src/app/core/renderer/markdown.service.ts@@ -67,28 +67,30 @@ export class MarkdownService {markdown: stringwithHtml?: boolean // default falsewithEmoji?: boolean // default false+ userGeneratedLinks?: boolean // default true}) {- const { markdown, withHtml = false, withEmoji = false } = options+ const { markdown, withHtml = false, withEmoji = false, userGeneratedLinks = true } = options- if (withHtml) return this.render({ name: 'textWithHTMLMarkdownIt', markdown, withEmoji })+ if (withHtml) return this.render({ name: 'textWithHTMLMarkdownIt', markdown, withEmoji, userGeneratedLinks })- return this.render({ name: 'textMarkdownIt', markdown, withEmoji })+ return this.render({ name: 'textMarkdownIt', markdown, withEmoji, userGeneratedLinks })}enhancedMarkdownToHTML (options: {markdown: stringwithHtml?: boolean // default falsewithEmoji?: boolean // default false+ userGeneratedLinks?: boolean // default true}) {- const { markdown, withHtml = false, withEmoji = false } = options+ const { markdown, withHtml = false, withEmoji = false, userGeneratedLinks = true } = options- if (withHtml) return this.render({ name: 'enhancedWithHTMLMarkdownIt', markdown, withEmoji })+ if (withHtml) return this.render({ name: 'enhancedWithHTMLMarkdownIt', markdown, withEmoji, userGeneratedLinks })- return this.render({ name: 'enhancedMarkdownIt', markdown, withEmoji })+ return this.render({ name: 'enhancedMarkdownIt', markdown, withEmoji, userGeneratedLinks })}markdownToUnsafeHTML (options: { markdown: string }) {- return this.render({ name: 'unsafeMarkdownIt', markdown: options.markdown, withEmoji: true })+ return this.render({ name: 'unsafeMarkdownIt', markdown: options.markdown, withEmoji: true, userGeneratedLinks: true })}customPageMarkdownToHTML (options: {@@ -97,7 +99,7 @@ export class MarkdownService {}) {const { markdown, additionalAllowedTags } = options- return this.render({ name: 'customPageMarkdownIt', markdown, withEmoji: true, additionalAllowedTags })+ return this.render({ name: 'customPageMarkdownIt', markdown, withEmoji: true, additionalAllowedTags, userGeneratedLinks: false })}// ---------------------------------------------------------------------------@@ -121,13 +123,14 @@ export class MarkdownService {markdown: stringwithEmoji: booleanadditionalAllowedTags?: string[]+ userGeneratedLinks: boolean}) {- const { name, markdown, withEmoji, additionalAllowedTags } = options+ const { name, markdown, withEmoji, additionalAllowedTags, userGeneratedLinks } = optionsif (!markdown) return ''const config = this.parsersConfig[name]if (!this.markdownParsers[name]) {- this.markdownParsers[name] = await this.createMarkdownIt(config)+ this.markdownParsers[name] = await this.createMarkdownIt(config, { userGeneratedLinks })if (withEmoji) {if (!this.emojiModule) {@@ -151,7 +154,7 @@ export class MarkdownService {return html}- private async createMarkdownIt (config: MarkdownConfig) {+ private async createMarkdownIt (config: MarkdownConfig, options: { userGeneratedLinks: boolean }) {const MarkdownItClass = (await import('markdown-it')).defaultconst markdownIt = new MarkdownItClass('zero', { linkify: true, breaks: config.breaks, html: config.html })@@ -160,12 +163,12 @@ export class MarkdownService {markdownIt.enable(rule)}- this.setTargetToLinks(markdownIt)+ this.setTargetToLinks(markdownIt, options)return markdownIt}- private setTargetToLinks (markdownIt: MarkdownIt) {+ private setTargetToLinks (markdownIt: MarkdownIt, { userGeneratedLinks }: { userGeneratedLinks: boolean }) {// Snippet from markdown-it documentation: https://github.com/markdown-it/markdown-it/blob/master/docs/architecture.md#rendererconst defaultRender = markdownIt.renderer.rules.link_open || function (tokens, idx, options, env, self) {return self.renderToken(tokens, idx, options)@@ -178,7 +181,7 @@ export class MarkdownService {if (targetIndex < 0) token.attrPush([ 'target', '_blank' ])else token.attrs[targetIndex][1] = '_blank'- const relValues = 'noopener noreferrer ugc'+ const relValues = 'noopener noreferrer '.concat(userGeneratedLinks ? 'ugc' : '')const relIndex = token.attrIndex('rel')if (relIndex < 0) token.attrPush([ 'rel', relValues ])else token.attrs[relIndex][1] = relValues