rss: Fix feed to show text and images

layouts/_default/rss.xml

@@ -29,12 +29,13 @@
     <item>
       <title>{{ .Title }}</title>
       <link>{{ .Permalink }}</link>
-      <pubDate>{{ .Date.Format "2006-01-02 15:04" | safeHTML }}</pubDate>
+      <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
       {{ with .Site.Author.email }}<author>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}}
       <guid>{{ .Permalink }}</guid>
       <description>
-        <p><strong>{{ .Description | transform.XMLEscape | safeHTML }}</strong></p>
-        {{ .Content | transform.XMLEscape | safeHTML }}
+            &lt;strong&gt;{{ .Description | transform.XMLEscape | safeHTML }}&lt;/strong&gt;
+
+            {{ .Content | transform.XMLEscape | safeHTML }}
         </description>
     </item>
     {{ end }}

layouts/_markup/render-image.html

@@ -1,15 +1,40 @@
+{{- $u := urls.Parse .Destination -}}
+{{- $src := $u.String -}}
+{{- if not $u.IsAbs -}}
+  {{- $path := strings.TrimPrefix "./" $u.Path -}}
+  {{- with or (.PageInner.Resources.Get $path) (resources.Get $path) -}}
+    {{- $src = .RelPermalink -}}
+    {{- with $u.RawQuery -}}
+      {{- $src = printf "%s?%s" $src . -}}
+    {{- end -}}
+    {{- with $u.Fragment -}}
+      {{- $src = printf "%s#%s" $src . -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
 {{- if .IsBlock -}}
   <figure>
     <img
-      src="{{ .Destination | safeURL }}"
+      src="{{ $src }}"
       {{- with .PlainText }}alt="{{ . }}"{{ end -}}
+      {{- range $k, $v := .Attributes -}}
+        {{- if $v -}}
+          {{- printf " %s=%q" $k ($v | transform.HTMLEscape) | safeHTMLAttr -}}
+        {{- end -}}
+      {{- end -}}
     />
     {{- with .Title }}<figcaption>{{ . }}</figcaption>{{ end -}}
   </figure>
 {{- else -}}
   <img
-    src="{{ .Destination | safeURL }}"
-    {{- with .PlainText }}alt="{{ . }}"{{ end -}}
-    {{- with .Title }}title="{{ . }}"{{ end -}}
+    src="{{ $src }}"
+    alt="{{ .PlainText }}"
+    {{- with .Title }}title="{{ . }}"{{- end -}}
+    {{- range $k, $v := .Attributes -}}
+      {{- if $v -}}
+        {{- printf " %s=%q" $k ($v | transform.HTMLEscape) | safeHTMLAttr -}}
+      {{- end -}}
+    {{- end -}}
   />
 {{- end -}}
+{{- /**/ -}}

layouts/partials/head.html

@@ -9,6 +9,9 @@
 <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
 <meta name="apple-mobile-web-app-title" content="MyWebSite" />
 <link rel="manifest" href="/site.webmanifest" />
+{{ with .OutputFormats.Get "rss" }}
+  {{ printf `<link rel=%q type=%q href=%q title=%q>` .Rel .MediaType.Type .Permalink site.Title | safeHTML }}
+{{ end }}
 <title>
   {{ if .IsHome }}
     {{ site.Title }}