From c94aa3f6cf86b02cdfa61f5953186565056c0964 Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Sun, 12 Jan 2020 15:52:09 -0500
Subject: [PATCH] Change permalink format

---
 lib/generate/posts.ts                         |   2 +-
 package-lock.json                             |  24 +++++++++---------
 site/layouts/article.html.ejs                 |   2 +-
 site/posts/2016-05-05-hello-world.md          |   2 +-
 site/posts/2016-05-21-194-porting-spree.md    |   2 +-
 site/posts/2016-06-29-introducing-rtfm.md     |   2 +-
 site/posts/2016-06-30-forge-1102-tutorials.md |   2 +-
 site/posts/2016-07-28-introducing-mirror.md   |   2 +-
 site/posts/2016-08-06-kotlin-and-forge.md     |   2 +-
 site/posts/2016-08-07-the-great-redesign.md   |   2 +-
 site/posts/2016-10-02-type.md                 |   2 +-
 ...2017-02-13-the-pretty-good-minor-update.md |   2 +-
 .../2018-04-23-comments-powered-by-github.md  |   4 +--
 site/posts/2019-09-18-reincarnation.md        |   1 +
 .../posts/2019-09-22-activitypub-resources.md |   1 +
 site/posts/2019-10-10-learning-elixir.md      |   1 +
 .../2019-11-11-js-free-hamburger-menu.md      |   1 +
 .../2019-12-22-mock-http-ios-ui-testing.md    |   1 +
 .../js-free-hamburger-menu/background.html    |   0
 .../2019/js-free-hamburger-menu/dismiss.html  |   0
 .../2019/js-free-hamburger-menu/final.html    |   0
 .../2019/js-free-hamburger-menu/toggling.html |   0
 .../js-free-hamburger-menu/transition.html    |   0
 .../2019/reincarnation/galactic_entity.png    | Bin
 24 files changed, 30 insertions(+), 25 deletions(-)
 rename site/static/{web => }/2019/js-free-hamburger-menu/background.html (100%)
 rename site/static/{web => }/2019/js-free-hamburger-menu/dismiss.html (100%)
 rename site/static/{web => }/2019/js-free-hamburger-menu/final.html (100%)
 rename site/static/{web => }/2019/js-free-hamburger-menu/toggling.html (100%)
 rename site/static/{web => }/2019/js-free-hamburger-menu/transition.html (100%)
 rename site/static/{meta => }/2019/reincarnation/galactic_entity.png (100%)

diff --git a/lib/generate/posts.ts b/lib/generate/posts.ts
index 9c7362b..0566061 100644
--- a/lib/generate/posts.ts
+++ b/lib/generate/posts.ts
@@ -20,7 +20,7 @@ export default async function posts(): Promise<Page[]> {
 			let postMeta = <PostMetadata>page.metadata;
 			postMeta.date = dateFns.parse(postMeta.date);
 			postMeta.slug = postMeta.slug || slugify(postMeta.title);
-			postMeta.permalink = `/${postMeta.category}/${postMeta.date.getFullYear()}/${postMeta.slug}/`;
+			postMeta.permalink = `/${postMeta.date.getFullYear()}/${postMeta.slug}/`;
 		}
 
 		page.text = util.render(page.text, { metadata: page.metadata }, postPath);
diff --git a/package-lock.json b/package-lock.json
index 753aa1e..4dfe055 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1357,7 +1357,7 @@
     },
     "load-json-file": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "requires": {
         "graceful-fs": "^4.1.2",
@@ -1494,7 +1494,7 @@
     },
     "meow": {
       "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
       "requires": {
         "camelcase-keys": "^2.0.0",
@@ -1547,7 +1547,7 @@
     },
     "minimist": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
     },
     "mkdirp": {
@@ -1638,7 +1638,7 @@
       "dependencies": {
         "semver": {
           "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
           "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
         }
       }
@@ -1743,12 +1743,12 @@
     },
     "os-homedir": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
     },
     "os-locale": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
       "requires": {
         "lcid": "^1.0.0"
@@ -1756,7 +1756,7 @@
     },
     "os-tmpdir": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
     },
     "osenv": {
@@ -1933,7 +1933,7 @@
     },
     "pify": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
     },
     "pinkie": {
@@ -2105,7 +2105,7 @@
     },
     "readable-stream": {
       "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
       "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
       "requires": {
         "core-util-is": "~1.0.0",
@@ -2353,7 +2353,7 @@
     },
     "source-map": {
       "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+      "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
       "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
       "requires": {
         "amdefine": ">=0.0.4"
@@ -2458,7 +2458,7 @@
     },
     "string-width": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
       "requires": {
         "code-point-at": "^1.0.0",
@@ -2873,7 +2873,7 @@
     },
     "wrap-ansi": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
       "requires": {
         "string-width": "^1.0.1",
diff --git a/site/layouts/article.html.ejs b/site/layouts/article.html.ejs
index 3d0d490..f147d8c 100644
--- a/site/layouts/article.html.ejs
+++ b/site/layouts/article.html.ejs
@@ -17,7 +17,7 @@ metadata.layout = "default.html.ejs"
 		</summary>
         <p id="comments-info">
 			Comments powered by ActivityPub. To respond to this post or to another comment, copy its URL into the search interface of your client for Mastodon, Pleroma, or other compatible software.
-			<a href="/meta/2019/reincarnation/#activity-pub">Learn more</a>.
+			<a href="/2019/reincarnation/#activity-pub">Learn more</a>.
 		</p>
         <noscript>
 			<p id="comments-js-warning">
diff --git a/site/posts/2016-05-05-hello-world.md b/site/posts/2016-05-05-hello-world.md
index 407209d..4fd80e6 100644
--- a/site/posts/2016-05-05-hello-world.md
+++ b/site/posts/2016-05-05-hello-world.md
@@ -2,7 +2,7 @@
 metadata.title = "Hello, World!"
 metadata.category = "meta"
 metadata.date = "2016-05-06 11:13:18 -0400"
-metadata.oldPermalink = "/meta/2016/06/07/hello-world/"
+metadata.oldPermalink = ["/meta/2016/06/07/hello-world/", "/meta/2016/hello-world/"]
 metadata.shortDesc = "Hello again, world! Welcome to the third iteration of my website."
 ```
 
diff --git a/site/posts/2016-05-21-194-porting-spree.md b/site/posts/2016-05-21-194-porting-spree.md
index eed5d35..3ed481a 100644
--- a/site/posts/2016-05-21-194-porting-spree.md
+++ b/site/posts/2016-05-21-194-porting-spree.md
@@ -2,7 +2,7 @@
 metadata.title = "1.9.4 Porting Spree"
 metadata.category = "minecraft"
 metadata.date = "2016-05-21 17:47:18 -0400"
-metadata.oldPermalink = "/mods/2016/05/21/194-porting-spree/"
+metadata.oldPermalink = ["/mods/2016/05/21/194-porting-spree/", "/minecraft/2016/1-9-4-porting-spree/"]
 metadata.shortDesc = "Now that Forge for 1.9.4 is out, I've begun the log and arduous process of porting my mods to 1.9.4 (if by long and arduous, you mean short and trivial)."
 ```
 
diff --git a/site/posts/2016-06-29-introducing-rtfm.md b/site/posts/2016-06-29-introducing-rtfm.md
index d4ab727..bbae28b 100644
--- a/site/posts/2016-06-29-introducing-rtfm.md
+++ b/site/posts/2016-06-29-introducing-rtfm.md
@@ -2,7 +2,7 @@
 metadata.title = "Introducing RTFM"
 metadata.category = "minecraft"
 metadata.date = "2016-06-29 12:00:00 -0400"
-metadata.oldPermalink = "/meta/2016/06/29/introducing-rtfm/"
+metadata.oldPermalink = ["/meta/2016/06/29/introducing-rtfm/", "/minecraft/2016/introducing-rtfm/"]
 metadata.shortDesc = "RTFM is the brand new website that will contain the documentation for all of my projects, currently it only contains documentation for MC mods."
 ```
 
diff --git a/site/posts/2016-06-30-forge-1102-tutorials.md b/site/posts/2016-06-30-forge-1102-tutorials.md
index 2313905..d89e3cf 100644
--- a/site/posts/2016-06-30-forge-1102-tutorials.md
+++ b/site/posts/2016-06-30-forge-1102-tutorials.md
@@ -2,7 +2,7 @@
 metadata.title = "Forge Modding Tutorials for 1.10.2"
 metadata.category = "minecraft"
 metadata.date = "2016-06-30 10:35:00 -0400"
-metadata.oldPermalink = "/meta/2016/06/30/forge-1102-tutorials/"
+metadata.oldPermalink = ["/meta/2016/06/30/forge-1102-tutorials/", "/minecraft/2016/forge-modding-tutorials-for-1-10-2"]
 metadata.shortDesc = "The Forge modding tutorials have all the been updated to MC 1.10.2 as has the GitHub repo."
 ```
 
diff --git a/site/posts/2016-07-28-introducing-mirror.md b/site/posts/2016-07-28-introducing-mirror.md
index f06167a..b4cd814 100644
--- a/site/posts/2016-07-28-introducing-mirror.md
+++ b/site/posts/2016-07-28-introducing-mirror.md
@@ -2,7 +2,7 @@
 metadata.title = "Introducing Mirror"
 metadata.category = "java"
 metadata.date = "2016-07-28 16:45:00 -0400"
-metadata.oldPermalink = "/java/2016/07/28/introducing-mirror/"
+metadata.oldPermalink = ["/java/2016/07/28/introducing-mirror/", "/java/2016/introducing-mirror/"]
 metadata.shortDesc = "Allow me to introduce my latest project, Mirror. Mirror is a reflection library for Java designed to take advantage of the streams, lambdas, and optionals introduced in Java 8."
 ```
 
diff --git a/site/posts/2016-08-06-kotlin-and-forge.md b/site/posts/2016-08-06-kotlin-and-forge.md
index 5818f0a..31470fe 100644
--- a/site/posts/2016-08-06-kotlin-and-forge.md
+++ b/site/posts/2016-08-06-kotlin-and-forge.md
@@ -2,7 +2,7 @@
 metadata.title = "Kotlin and Minecraft Forge"
 metadata.category = "minecraft"
 metadata.date = "2016-08-06 16:45:30 -0400"
-metadata.oldPermalink = "/forge/2016/08/06/kotlin-and-forge/"
+metadata.oldPermalink = ["/forge/2016/08/06/kotlin-and-forge/", "/minecraft/2016/kotlin-and-minecraft-forge/"]
 metadata.shortDesc = "So, you wanna use Kotlin in your Forge mod? Well there's good news, I've just released Forgelin, a fork of Emberwalker's Forgelin, a library that provides utilities for using Kotlin with Minecraft/Forge. "
 ```
 
diff --git a/site/posts/2016-08-07-the-great-redesign.md b/site/posts/2016-08-07-the-great-redesign.md
index 52a6e79..aadaf6e 100644
--- a/site/posts/2016-08-07-the-great-redesign.md
+++ b/site/posts/2016-08-07-the-great-redesign.md
@@ -2,7 +2,7 @@
 metadata.title = "The Great Redesign"
 metadata.category = "meta"
 metadata.date = "2016-08-07 15:39:48 -0400"
-metadata.oldPermalink = "/meta/2016/08/07/the-great-redesign/"
+metadata.oldPermalink = ["/meta/2016/08/07/the-great-redesign/", "/meta/2016/the-great-redesign/"]
 metadata.shortDesc = "Welcome to the fourth iteration of my website."
 ```
 
diff --git a/site/posts/2016-10-02-type.md b/site/posts/2016-10-02-type.md
index 940547f..d35cdce 100644
--- a/site/posts/2016-10-02-type.md
+++ b/site/posts/2016-10-02-type.md
@@ -2,7 +2,7 @@
 metadata.title = "Type: A FOSS clone of typing.io"
 metadata.category = "misc"
 metadata.date = "2016-10-08 17:29:42 -0400"
-metadata.oldPermalink = "/misc/2016/10/08/type/"
+metadata.oldPermalink = ["/misc/2016/10/08/type/", "/misc/2016/type/"]
 metadata.shortDesc = "I made an awesome FOSS clone of typing.io that you can check out at type.shadowfacts.net."
 ```
 
diff --git a/site/posts/2017-02-13-the-pretty-good-minor-update.md b/site/posts/2017-02-13-the-pretty-good-minor-update.md
index 7f0b768..579a6dd 100644
--- a/site/posts/2017-02-13-the-pretty-good-minor-update.md
+++ b/site/posts/2017-02-13-the-pretty-good-minor-update.md
@@ -2,7 +2,7 @@
 metadata.title = "The Pretty Good Minor Update"
 metadata.category = "meta"
 metadata.date = "2017-02-17 14:30:42 -0400"
-metadata.oldPermalink = "/meta/2017/02/17/the-pretty-good-minor-update/"
+metadata.oldPermalink = ["/meta/2017/02/17/the-pretty-good-minor-update/", "/meta/2017/the-pretty-good-minor-update/"]
 metadata.shortDesc = "It's been about six months since the last time I redesigned the site, and while I didn't want to redesign it yet again, I felt it could use a little update to make sure everything's still good."
 ```
 
diff --git a/site/posts/2018-04-23-comments-powered-by-github.md b/site/posts/2018-04-23-comments-powered-by-github.md
index e18170e..2d25d2c 100644
--- a/site/posts/2018-04-23-comments-powered-by-github.md
+++ b/site/posts/2018-04-23-comments-powered-by-github.md
@@ -2,11 +2,11 @@
 metadata.title = "Comments Powered by GitHub"
 metadata.category = "meta"
 metadata.date = "2017-04-23 09:05:42 -0400"
-metadata.oldPermalink = "/meta/2017/04/23/comments-powered-by-github/"
+metadata.oldPermalink = ["/meta/2017/04/23/comments-powered-by-github/", "/meta/2017/comments-powered-by-git-hub/"]
 metadata.shortDesc = "I built a way of commenting on my static website using GitHub to store comments."
 ```
 
-**NOTE:** This article has been superseded by the [ActivityPub comments system](/meta/2019/reincarnation/#activity-pub).
+**NOTE:** This article has been superseded by the [ActivityPub comments system](/2019/reincarnation/#activity-pub).
 
 After seeing [this article][orig] the other morning about replacing the Disqus comments on a blog powered by a static site generator (like this one) with comments backed by a GitHub issue and some front-end JavaScript to load and display them, I thought it would be fun to implement something similar. First I only built the code for displaying comments, similar to the aforementioned article, but I decided to take it one step further by allowing users to submit comments directly from my site.
 
diff --git a/site/posts/2019-09-18-reincarnation.md b/site/posts/2019-09-18-reincarnation.md
index 6235025..c2ee293 100644
--- a/site/posts/2019-09-18-reincarnation.md
+++ b/site/posts/2019-09-18-reincarnation.md
@@ -3,6 +3,7 @@ metadata.title = "Reincarnation"
 metadata.category = "meta"
 metadata.date = "2019-09-18 10:34:42 -0400"
 metadata.shortDesc = "Stand by for reincarnation."
+metadata.oldPermalink = "/meta/2019/reincarnation/"
 ```
 
 <figure>
diff --git a/site/posts/2019-09-22-activitypub-resources.md b/site/posts/2019-09-22-activitypub-resources.md
index f6efb7d..06c4dbf 100644
--- a/site/posts/2019-09-22-activitypub-resources.md
+++ b/site/posts/2019-09-22-activitypub-resources.md
@@ -3,6 +3,7 @@ metadata.title = "ActivityPub Resources"
 metadata.category = "activitypub"
 metadata.date = "2019-09-22 17:50:42 -0400"
 metadata.shortDesc = "A compilation of resources I found useful in learning/implementing ActivityPub."
+metadata.oldPermalink = "/activitypub/2019/activity-pub-resources/"
 ```
 
 This isn't really going to be a blog most, but more of a collection of tidbits and resources I found helpful in implenting the [ActivityPub integration](/meta/2019/reincarnation/#activity-pub) for the new version of my blog.
diff --git a/site/posts/2019-10-10-learning-elixir.md b/site/posts/2019-10-10-learning-elixir.md
index 454effb..023e627 100644
--- a/site/posts/2019-10-10-learning-elixir.md
+++ b/site/posts/2019-10-10-learning-elixir.md
@@ -3,6 +3,7 @@ metadata.title = "Learning Elixir"
 metadata.category = "elixir"
 metadata.date = "2019-10-10 12:29:42 -0400"
 metadata.shortDesc = "How I learned Elixir and why I love it."
+metadata.oldPermalink = "/elixir/2019/learning-elixir/"
 ```
 
 About a year ago, I set out to learn the [Elixir](https://elixir-lang.org) programming language. At the time, it was mainly so I could contribute to [Pleroma](https://pleroma.social), but I've since fallen in love with the language.
diff --git a/site/posts/2019-11-11-js-free-hamburger-menu.md b/site/posts/2019-11-11-js-free-hamburger-menu.md
index b224e8e..eb55327 100644
--- a/site/posts/2019-11-11-js-free-hamburger-menu.md
+++ b/site/posts/2019-11-11-js-free-hamburger-menu.md
@@ -3,6 +3,7 @@ metadata.title = "Building a JavaScript-Free Slide-Over Menu"
 metadata.category = "web"
 metadata.date = "2019-11-11 21:08:42 -0400"
 metadata.shortDesc = "Building a slide-over hamburger menu without using JavaScript."
+metadata.oldPermalink = "/web/2019/js-free-hamburger-menu/"
 metadata.slug = "js-free-hamburger-menu"
 ```
 
diff --git a/site/posts/2019-12-22-mock-http-ios-ui-testing.md b/site/posts/2019-12-22-mock-http-ios-ui-testing.md
index c83ce53..ffc281c 100644
--- a/site/posts/2019-12-22-mock-http-ios-ui-testing.md
+++ b/site/posts/2019-12-22-mock-http-ios-ui-testing.md
@@ -3,6 +3,7 @@ metadata.title = "Mocking HTTP Requests for iOS App UI Tests"
 metadata.category = "ios"
 metadata.date = "2019-12-22 19:12:42 -0400"
 metadata.shortDesc = "Integrating a tiny web server into your Xcode UI test target to mock HTTP requests."
+metadata.oldPermalink = "/ios/2019/mock-http-ios-ui-testing/"
 metadata.slug = "mock-http-ios-ui-testing"
 ```
 
diff --git a/site/static/web/2019/js-free-hamburger-menu/background.html b/site/static/2019/js-free-hamburger-menu/background.html
similarity index 100%
rename from site/static/web/2019/js-free-hamburger-menu/background.html
rename to site/static/2019/js-free-hamburger-menu/background.html
diff --git a/site/static/web/2019/js-free-hamburger-menu/dismiss.html b/site/static/2019/js-free-hamburger-menu/dismiss.html
similarity index 100%
rename from site/static/web/2019/js-free-hamburger-menu/dismiss.html
rename to site/static/2019/js-free-hamburger-menu/dismiss.html
diff --git a/site/static/web/2019/js-free-hamburger-menu/final.html b/site/static/2019/js-free-hamburger-menu/final.html
similarity index 100%
rename from site/static/web/2019/js-free-hamburger-menu/final.html
rename to site/static/2019/js-free-hamburger-menu/final.html
diff --git a/site/static/web/2019/js-free-hamburger-menu/toggling.html b/site/static/2019/js-free-hamburger-menu/toggling.html
similarity index 100%
rename from site/static/web/2019/js-free-hamburger-menu/toggling.html
rename to site/static/2019/js-free-hamburger-menu/toggling.html
diff --git a/site/static/web/2019/js-free-hamburger-menu/transition.html b/site/static/2019/js-free-hamburger-menu/transition.html
similarity index 100%
rename from site/static/web/2019/js-free-hamburger-menu/transition.html
rename to site/static/2019/js-free-hamburger-menu/transition.html
diff --git a/site/static/meta/2019/reincarnation/galactic_entity.png b/site/static/2019/reincarnation/galactic_entity.png
similarity index 100%
rename from site/static/meta/2019/reincarnation/galactic_entity.png
rename to site/static/2019/reincarnation/galactic_entity.png