mirror/Hangar
2
0
Fork 0
mirror of https://github.com/HangarMC/Hangar.git synced 2025-01-30 14:30:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow video embeds in Markdown and in the BBCodeConverter

Browse Source
This commit is contained in:
syldium 2021-10-05 10:54:31 +02:00 committed by Nassim Jahnke
parent de9ba05de4
commit 6b3cd04384
5 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/nuxt.config.ts
View File

@ -200,7 +200,7 @@ export default {
'data: papermc.io paper.readthedocs.io',
'https:', // ppl can use images in descriptions, we would need an image proxy or smth
],
frameSrc: ["'self'", 'http://localhost/', 'https://papermc.io/', 'https://hangar.crowdin.com'],
frameSrc: ["'self'", 'http://localhost/', 'https://papermc.io/', 'https://hangar.crowdin.com', 'https://www.youtube-nocookie.com'],
manifestSrc: ["'self'"],
connectSrc: ["'self'", 'https://www.google-analytics.com', 'https://stats.g.doubleclick.net', 'https://hangar.crowdin.com'],
mediaSrc: ["'self'"],

4
src/main/java/io/papermc/hangar/service/internal/MarkdownService.java
View File

@ -13,6 +13,7 @@ import com.vladsch.flexmark.ext.gitlab.GitLabExtension;
import com.vladsch.flexmark.ext.tables.TablesExtension;
import com.vladsch.flexmark.ext.typographic.TypographicExtension;
import com.vladsch.flexmark.ext.wikilink.WikiLinkExtension;
import com.vladsch.flexmark.ext.youtube.embedded.YouTubeLinkExtension;
import com.vladsch.flexmark.html.HtmlRenderer;
import com.vladsch.flexmark.html.LinkResolver;
import com.vladsch.flexmark.html.LinkResolverFactory;
@ -68,7 +69,8 @@ public class MarkdownService {
EmojiExtension.create(),
FootnoteExtension.create(),
AdmonitionExtension.create(),
GitLabExtension.create()
GitLabExtension.create(),
YouTubeLinkExtension.create()
)
);

7
src/main/java/io/papermc/hangar/util/BBCodeConverter.java
View File

@ -37,6 +37,7 @@ public class BBCodeConverter {
REPLACERS.put("i", (tag, tagArg, content) -> "*" + content + "*");
REPLACERS.put("s", (tag, tagArg, content) -> "~~" + content + "~~");
REPLACERS.put("img", (tag, tagArg, content) -> "![" + content + "](" + content + ")");
REPLACERS.put("media", (tag, tagArg, content) -> "youtube".equals(tagArg) ? "@[YouTube](https://youtu.be/" + content + ")" : null);
REPLACERS.put("url", (tag, tagArg, content) -> {
String url = tagArg == null ? content : tagArg;
char firstCharacter = url.length() > 2 ? url.charAt(0) : '-';
@ -106,7 +107,11 @@ public class BBCodeConverter {
}
String processed = replacer.process(currentTag, currentArg, currentContent);
s = s.substring(0, index) + processed + s.substring(closingIndex);
if (processed == null) {
index++;
} else {
s = s.substring(0, index) + processed + s.substring(closingIndex);
}
}
return s;
}

1
src/main/resources/application.yml
View File

@ -143,6 +143,7 @@ hangar:
timeout: 10000
safe-download-hosts:
- "github.com"
- "youtu.be"
discourse:
enabled: true

12
src/test/java/io/papermc/hangar/util/BBCodeConverterTest.java
View File

@ -60,6 +60,18 @@ class BBCodeConverterTest {
Assertions.assertEquals("![https://www.spigotmc.org/attachments/100](https://www.spigotmc.org/attachments/100)", result);
}
@Test
void testMedia() {
String result = converter.convertToMarkdown("[MEDIA=youtube]dQw4w9WgXcQ[/MEDIA]");
Assertions.assertEquals("@[YouTube](https://youtu.be/dQw4w9WgXcQ)", result);
}
@Test
void testMediaUnsupportedPlatform() {
String result = converter.convertToMarkdown("[MEDIA=vimeo]163721649[/MEDIA]");
Assertions.assertEquals("[MEDIA=vimeo]163721649[/MEDIA]", result);
}
@Test
void testComplexExample() throws IOException {
// Be sure to retest/-generate this output if "breaking" changes are made, for example to spacing