diff --git a/modules/markup/orgmode/orgmode.go b/modules/markup/orgmode/orgmode.go
index a6dac120398..9b6175649f1 100644
--- a/modules/markup/orgmode/orgmode.go
+++ b/modules/markup/orgmode/orgmode.go
@@ -153,18 +153,31 @@ func (r *Writer) WriteRegularLink(l org.RegularLink) {
link = []byte(util.URLJoin(r.URLPrefix, lnk))
}
- description := string(link)
- if l.Description != nil {
- description = r.WriteNodesAsString(l.Description...)
- }
+ // Inspired by https://github.com/niklasfasching/go-org/blob/6eb20dbda93cb88c3503f7508dc78cbbc639378f/org/html_writer.go#L406-L427
switch l.Kind() {
case "image":
- imageSrc := getMediaURL(link)
- fmt.Fprintf(r, ``, imageSrc, description, description)
+ if l.Description == nil {
+ imageSrc := getMediaURL(link)
+ fmt.Fprintf(r, `
`, imageSrc, link, link)
+ } else {
+ description := strings.TrimPrefix(org.String(l.Description...), "file:")
+ imageSrc := getMediaURL([]byte(description))
+ fmt.Fprintf(r, `
`, link, imageSrc, imageSrc)
+ }
case "video":
- videoSrc := getMediaURL(link)
- fmt.Fprintf(r, ``, videoSrc, description, description)
+ if l.Description == nil {
+ imageSrc := getMediaURL(link)
+ fmt.Fprintf(r, ``, imageSrc, link, link)
+ } else {
+ description := strings.TrimPrefix(org.String(l.Description...), "file:")
+ videoSrc := getMediaURL([]byte(description))
+ fmt.Fprintf(r, ``, link, videoSrc, videoSrc)
+ }
default:
+ description := string(link)
+ if l.Description != nil {
+ description = r.WriteNodesAsString(l.Description...)
+ }
fmt.Fprintf(r, `%s`, link, description, description)
}
}
diff --git a/modules/markup/orgmode/orgmode_test.go b/modules/markup/orgmode/orgmode_test.go
index d6467c36f71..8f454e99558 100644
--- a/modules/markup/orgmode/orgmode_test.go
+++ b/modules/markup/orgmode/orgmode_test.go
@@ -42,7 +42,7 @@ func TestRender_StandardLinks(t *testing.T) {
"