Bundle full content in RSS feed

5 files changed, 21 insertions, 35 deletions

diff --git a/Manifest.toml b/Manifest.toml
index 70f4a69..9b84805 100644
--- a/Manifest.toml
+++ b/Manifest.toml
@@ -42,9 +42,9 @@ uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
 
 [[Franklin]]
 deps = ["Dates", "DelimitedFiles", "DocStringExtensions", "ExprTools", "FranklinTemplates", "HTTP", "Literate", "LiveServer", "Logging", "Markdown", "NodeJS", "OrderedCollections", "Pkg", "REPL", "Random"]
-git-tree-sha1 = "eb5872418e5c0b86049adb62151530041368c9d1"
+git-tree-sha1 = "74b498430fffaae060b1bc996d71fd230b3b4ca4"
 uuid = "713c75ef-9fc9-4b05-94a9-213340da978e"
-version = "0.10.36"
+version = "0.10.37"
 
 [[FranklinTemplates]]
 deps = ["LiveServer"]
@@ -54,9 +54,9 @@ version = "0.8.16"
 
 [[HTTP]]
 deps = ["Base64", "Dates", "IniFile", "MbedTLS", "NetworkOptions", "Sockets", "URIs"]
-git-tree-sha1 = "b855bf8247d6e946c75bb30f593bfe7fe591058d"
+git-tree-sha1 = "1fd26bc48f96adcdd8823f7fc300053faf3d7ba1"
 uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
-version = "0.9.8"
+version = "0.9.9"
 
 [[IOCapture]]
 deps = ["Logging"]
diff --git a/_rss/head.xml b/_rss/head.xml
index 4c9f62b..28f4204 100644
--- a/_rss/head.xml
+++ b/_rss/head.xml
@@ -20,17 +20,13 @@ rss_file variable in your config file if you want to use something different tha
   xmlns:georss="http://www.georss.org/georss">
 
   <channel>
-    <title>
-      <![CDATA[  {{fd2rss website_title}}  ]]>
-    </title>
-    <link> {{website_url}} </link>
-    <description>
-      <![CDATA[  {{fd2rss website_description}}  ]]>
-    </description>
+    <title><![CDATA[{{fd2rss website_title}}]]></title>
+    <link>{{website_url}}</link>
+    <description><![CDATA[{{fd2rss website_description}}]]></description>
     <atom:link
       href="{{fd_rss_feed_url}}"
       rel="self"
-      type="application/rss+xml" />
+      type="application/rss+xml"/>
 <!--
 * items will be added here in chronological order
 * the channel will then be closed
diff --git a/_rss/item.xml b/_rss/item.xml
index 07f6506..554a7fd 100644
--- a/_rss/item.xml
+++ b/_rss/item.xml
@@ -17,44 +17,31 @@ We use the conservative 'only one' approach by default but you could tweak this
 defining your own `rss_enclosures` variable with a list of string and use that.
 -->
 <item>
-  <title>
-    <![CDATA[  {{fd2rss rss_title}}  ]]>
-  </title>
-  <link> {{fd_full_url}} </link>
-  <guid> {{fd_full_url}} </guid>
+  <title><![CDATA[{{fd2rss rss_title}}]]></title>
+  <link>{{fd_full_url}}</link>
+  <guid>{{fd_full_url}}</guid>
   <description>
-    <![CDATA[  {{fd2rss rss_description}}  ]]>
+    <![CDATA[{{fd2rss rss_description}}]]>
   </description>
 
   <!-- note that fd_page_html is already HTML, so we don't use fd2rss here -->
   {{if rss_full_content}}
   <content:encoded>
-    <![CDATA[  {{fix_relative_links fd_page_html}} ]]>
+    <![CDATA[{{fix_relative_links fd_page_html}}]]>
   </content:encoded>
   {{end}}
 
   <!-- RFC1123 enforces a RSS-compliant date formatting -->
   <pubDate>{{RFC822 rss_pubdate}}</pubDate>
 
-  <!-- if given this must be an email, see specs -->
-  {{isnotempty rss_author}}
-  <author> {{rss_author}} </author>
-  {{end}}
+  {{isnotempty rss_author}}<author>{{rss_author}}</author>{{end}}
   {{isnotempty author}}
   <atom:author>
     <atom:name>{{author}}</atom:name>
   </atom:author>
   {{end}}
 
-  {{isnotempty rss_category}}
-  <category> {{rss_category}} </category>
-  {{end}}
-
-  {{isnotempty rss_comments}}
-  <comments> {{rss_comments}} </comments>
-  {{end}}
-
-  {{isnotempty rss_enclosure}}
-  <enclosure> {{rss_enclosure}} </enclosure>
-  {{end}}
+  {{isnotempty rss_category}}<category>{{rss_category}}</category>{{end}}
+  {{isnotempty rss_comments}}<comments>{{rss_comments}}</comments>{{end}}
+  {{isnotempty rss_enclosure}}<enclosure>{{rss_enclosure}}</enclosure>{{end}}
 </item>
diff --git a/blog/teredo.md b/blog/teredo.md
index 48551e8..3b6d6ef 100644
--- a/blog/teredo.md
+++ b/blog/teredo.md
@@ -1,6 +1,6 @@
 +++
 rss = "Teredo Tunnel Simulation"
-date = Date(2020, 6, 5)
+date = Date(2020, 7, 3)
 +++
 @def tags = ["ipv6", "tunnel", "fun"]
 
diff --git a/config.md b/config.md
index 1092740..9a3ef0c 100644
--- a/config.md
+++ b/config.md
@@ -12,6 +12,9 @@ The website_* must be defined for the RSS to work
 
 @def mintoclevel = 2
 
+@def rss_author = "Nguyễn Gia Phong"
+@def rss_full_content = true
+
 <!--
 Add here files or directories that should be ignored by Franklin, otherwise
 these files might be copied and, if markdown, processed by Franklin which