5 files changed, 32 insertions, 16 deletions
diff --git a/http/bin/gmi2upphtml b/http/bin/gmi2upphtml
index 07d9623..afaf9ef 100755
--- a/http/bin/gmi2upphtml
+++ b/http/bin/gmi2upphtml
@@ -5,6 +5,7 @@ post_title="${POST_TITLE:-}"
 is_in_list=0
 is_in_link_block=0
 is_in_preformatted_block=0
+is_first_line_of_preformatted_block=0
 is_in_blockquote=0
 
 if_in_list_then_close()
@@ -105,7 +106,20 @@ while read line
 do
   if [ $is_in_preformatted_block -ne 0 ]
   then
-    echo "$(escape_upphtml "${line}")"
+    if [ $is_first_line_of_preformatted_block -ne 0 ]
+    then
+      prefix="<pre><code>"
+      is_first_line_of_preformatted_block=0
+    else
+      prefix=""
+    fi
+    if [ "$(echo "$line" | cut -c1-3)" = "\`\`\`" ]
+    then
+      echo "${prefix}</code></pre>"
+      is_in_preformatted_block=0
+    else
+      echo "${prefix}$(escape_upphtml "${line}")"
+    fi
     continue
   fi
 
@@ -171,15 +185,9 @@ do
 
   if [ "$(echo "$line" | cut -c1-3)" = "\`\`\`" ]
   then
-    if [ $is_in_preformatted_block -eq 0 ]
-    then
-      close_all_open_blocks_except pre
-      echo "<pre>"
-      is_in_preformatted_block=1
-    else
-      echo "</pre>"
-      is_in_preformatted_block=0
-    fi
+    close_all_open_blocks_except pre
+    is_in_preformatted_block=1
+    is_first_line_of_preformatted_block=1
     continue
   fi
 
diff --git a/http/src/blog.upphtml b/http/src/blog.upphtml
index 8c0e429..f96f1df 100644
--- a/http/src/blog.upphtml
+++ b/http/src/blog.upphtml
@@ -53,7 +53,7 @@ for post in $POSTS; do if [ "$(echo "${post}" | cut -c1-4)" = "$year" ]; then
 title="$(grep "^export TITLE=" "${SRC}/blog/${post}" | cut -c15-)"
 title="$(echo ${title} | cut -c1-$(( ${#title} - 16 )) )"
 date_published="$(echo "${post}" | cut -c1-10)"
-href="${SITE_URL}/blog/$(echo "$post" | cut -c1-10).html"
+href="${SITE_URL}/blog/$(echo "$post" | cut -c1-10)"
 #!
 
 <li class='h-entry'>
diff --git a/http/src/blog/rss.uppxml b/http/src/blog/rss.uppxml
index 78800aa..c8183a6 100644
--- a/http/src/blog/rss.uppxml
+++ b/http/src/blog/rss.uppxml
@@ -10,7 +10,11 @@ NOW_RFC_822="$(TZ=UT date +"%a, %d %b %Y %H:%M:%S UT")"
 <title>Joe Carstairs’ blog</title>
 <description>Short posts on random topics I find interesting</description>
 <link>${SITE_URL}/blog</link>
-<image>${SITE_URL}/images/headshot.webp</image>
+<image>
+  <title>Joe Carstairs’ ugly mug</title>
+  <url>${SITE_URL}/images/headshot.webp</url>
+  <link>${SITE_URL}</link>
+</image>
 <language>en-GB</language>
 <pubDate>${NOW_RFC_822}</pubDate>
 
@@ -38,7 +42,7 @@ NO_META=1 pp "${SRC}/blog/$post" "${SITE_URL}" \
   | sed "s/\\\$/\\\\\$/g"
 #!
 </description>
-<author>Joe Carstairs</author>
+<author>me@joeac.net</author>
 
 </item>
 #!
diff --git a/http/src/microlog.upphtml b/http/src/microlog.upphtml
index aa3cfea..55c1dfc 100644
--- a/http/src/microlog.upphtml
+++ b/http/src/microlog.upphtml
@@ -55,7 +55,7 @@ for post in $POSTS; do if [ "$(echo "${post}" | cut -c1-4)" = "$year" ]; then
 title="$(grep "^export TITLE=" "${SRC}/microlog/${post}" | cut -c15-)"
 title="$(echo "${title}" | cut -c1-$(( ${#title} - 16)) )"
 date_published="$(echo "${post}" | cut -c1-10)"
-href="${SITE_URL}/microlog/$(echo ${post} | cut -c1-$(( ${#post} - 17 )) ).html"
+href="${SITE_URL}/microlog/$(echo ${post} | cut -c1-$(( ${#post} - 17 )) )"
 #!
 
 <li class='h-entry'>
diff --git a/http/src/microlog/rss.uppxml b/http/src/microlog/rss.uppxml
index 20a6ced..517ee1a 100644
--- a/http/src/microlog/rss.uppxml
+++ b/http/src/microlog/rss.uppxml
@@ -10,7 +10,11 @@ NOW_RFC_822="$(TZ=UT date +"%a, %d %b %Y %H:%M:%S UT")"
 <title>Joe Carstairs’ microlog</title>
 <description>My private X feed I guess?</description>
 <link>${SITE_URL}/microlog</link>
-<image>${SITE_URL}/images/headshot.webp</image>
+<image>
+  <title>Joe Carstairs’ ugly mug</title>
+  <url>${SITE_URL}/images/headshot.webp</url>
+  <link>${SITE_URL}</link>
+</image>
 <language>en-GB</language>
 <pubDate>${NOW_RFC_822}</pubDate>
 
@@ -38,7 +42,7 @@ NO_META=1 pp "${SRC}/microlog/$post" "${SITE_URL}" \
   | sed "s/\\\$/\\\\\$/g"
 #!
 </description>
-<author>Joe Carstairs</author>
+<author>me@joeac.net</author>
 
 </item>
 #!