diff options
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/feed/template/feed.tpl.go | 11 | ||||
| -rw-r--r-- | internal/feed/template/template.go | 6 |
2 files changed, 10 insertions, 7 deletions
diff --git a/internal/feed/template/feed.tpl.go b/internal/feed/template/feed.tpl.go index bb49818..8aab9d7 100644 --- a/internal/feed/template/feed.tpl.go +++ b/internal/feed/template/feed.tpl.go @@ -40,14 +40,15 @@ const feedTpl = `{{- /*gotype:github.com/Necoro/feed2imap-go/internal/feed.feedi </td> </tr> </table> -{{with .Item.Description}} +{{with .Item.Content}} <br /> <!-- originally: only if content and 'content !~ /\A\s*</m' --> {{html .}} -{{end}} -{{with .Item.Content}} +{{else}} +{{with .Item.Description}} <br /> <!-- originally: only if content and 'content !~ /\A\s*</m' --> {{html .}} {{end}} +{{end}} {{with .Item.Enclosures}} <table border="1" width="100%" cellpadding="0" cellspacing="0" style="border-spacing: 0; "> <tr> @@ -71,6 +72,8 @@ const feedTpl = `{{- /*gotype:github.com/Necoro/feed2imap-go/internal/feed.feedi <table width="100%" cellpadding="0" cellspacing="0"> {{template "bottomLine" (dict "descr" "Date:" "content" .Item.Published)}} {{template "bottomLine" (dict "descr" "Author:" "content" .Creator)}} - {{template "bottomLine" (dict "descr" "Subject:" "content" .Item.Title)}} {{template "bottomLine" (dict "descr" "Filed under:" "content" (join ", " .Item.Categories))}} + {{with .Feed.FeedLink}} + {{template "bottomLine" (dict "descr" "Feed-Link:" "content" (print "<a style=\"color: #ababab;\" href=\"" . "\">" . "</a>" | html))}} + {{end}} </table>` diff --git a/internal/feed/template/template.go b/internal/feed/template/template.go index 7871e06..4c7b636 100644 --- a/internal/feed/template/template.go +++ b/internal/feed/template/template.go @@ -9,11 +9,11 @@ import ( "github.com/Necoro/feed2imap-go/pkg/log" ) -func dict(v ...string) map[string]string { - dict := map[string]string{} +func dict(v ...interface{}) map[string]interface{} { + dict := make(map[string]interface{}) lenv := len(v) for i := 0; i < lenv; i += 2 { - key := v[i] + key := v[i].(string) if i+1 >= lenv { dict[key] = "" continue |