From 1d36b810a3d6d0d8d33c0421e104aaf909d9ed3e Mon Sep 17 00:00:00 2001
From: Zach Leatherman <zachleatherman@gmail.com>
Date: Sat, 27 Jan 2018 23:22:40 -0600
Subject: [PATCH] Fixes urls in feed.

---
 _includes/layouts/base.njk |  6 +++---
 _src/HtmlToAbsoluteUrls.js |  4 +++-
 feed/feed.njk              | 11 ++++++-----
 3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/_includes/layouts/base.njk b/_includes/layouts/base.njk
index 3f97269..8886a3e 100644
--- a/_includes/layouts/base.njk
+++ b/_includes/layouts/base.njk
@@ -4,13 +4,13 @@
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>{{ title or metadata.title }}</title>
-		<link rel="stylesheet" href="{{ 'css/index.css' | url }}">
-		<link rel="stylesheet" href="{{ 'css/prism-base16-monokai.dark.css' | url }}">
+		<link rel="stylesheet" href="{{ '/css/index.css' | url }}">
+		<link rel="stylesheet" href="{{ '/css/prism-base16-monokai.dark.css' | url }}">
 		<link rel="alternate" href="{{ metadata.feed.path | url }}" type="application/atom+xml" title="{{ metadata.title }}">
 	</head>
 	<body>
 		<header>
-			<h1 class="home"><a href="{{ '' | url }}">{{ metadata.title }}</a></h1>
+			<h1 class="home"><a href="{{ '/' | url }}">{{ metadata.title }}</a></h1>
 			<ul class="nav">
 				{%- for nav in collections.nav | reverse -%}
 				<li class="nav-item{% if nav.url == page.url %} nav-item-active{% endif %}"><a href="{{ nav.url | url }}">{{ nav.data.navtitle }}</a></li>
diff --git a/_src/HtmlToAbsoluteUrls.js b/_src/HtmlToAbsoluteUrls.js
index d71717e..2b219e0 100644
--- a/_src/HtmlToAbsoluteUrls.js
+++ b/_src/HtmlToAbsoluteUrls.js
@@ -5,8 +5,10 @@ const absoluteUrl = require("./AbsoluteUrl");
 module.exports = function(htmlContent, base) {
   let options = {
     eachURL: function(url, attr, element) {
+      url = url.trim();
+
     	// #anchor in-page
-    	if( url.trim().indexOf("#") === 0 ) {
+    	if( url.indexOf("#") === 0 ) {
     		return url;
     	}
 
diff --git a/feed/feed.njk b/feed/feed.njk
index 86ee46a..636c9c2 100644
--- a/feed/feed.njk
+++ b/feed/feed.njk
@@ -13,13 +13,14 @@ permalink: feed/feed.xml
 		<name>{{ metadata.author.name }}</name>
 		<email>{{ metadata.author.email }}</email>
 	</author>
-	{% for post in collections.posts %}
+	{%- for post in collections.posts %}
+	{% set absolutePostUrl %}{{ post.url | url | absoluteUrl(metadata.url) }}{% endset %}
 	<entry>
 		<title>{{ post.data.title }}</title>
-		<link href="{{ post.url | absoluteUrl(metadata.url) }}"/>
+		<link href="{{ absolutePostUrl }}"/>
 		<updated>{{ post.date | rssDate }}</updated>
-		<id>{{ post.url | absoluteUrl(metadata.url) }}</id>
-		<content type="html">{{ post.templateContent | htmlToAbsoluteUrls(metadata.url) }}</content>
+		<id>{{ absolutePostUrl }}</id>
+		<content type="html">{{ post.templateContent | htmlToAbsoluteUrls(absolutePostUrl) }}</content>
 	</entry>
-	{% endfor %}
+	{%- endfor %}
 </feed>
\ No newline at end of file
