Commit 30185c1f authored by Jamie Tanna's avatar Jamie Tanna

Add a `kind` hint to MF2 content

To make it easier to render the correct content type, as well as have
links such as i.e. /kind/replies/, we want to have the `kind` taxonomy
set up for our content.

This makes it possible to strip some painful duplication that was
introduced as part of #572, while also making it an easier experience
for determining what content type an MF2 entry is.

As part of this, we're also wanting to pluralise the content type, as it
makes the URLs more readable in line with what the content structure has
them named as.

Note that we still need to specify the existing taxonomies we have,
otherwise they won't render!

We also need to ad the `kind` hint to any existing content, so it'll
render properly.

Closes #689.
parent 7e44bd0b
......@@ -34,6 +34,12 @@ paginate = 25
mf2 = "/mf2/:filename/"
posts = "/posts/:year/:month/:day/:slug/"
tags = "/tags/:title/"
kinds = "/kind/:title/"
[taxonomies]
category = "categories"
kind = "kind"
tag = "tags"
[outputs]
home = ["HTML", "RSS", "jsonFeed", "postFrequency", "rsvpCalendar"]
......
......@@ -36,6 +36,6 @@
}
},
"h": "h-entry",
"date": "2019-08-09T16:55:00Z"
"date": "2019-08-09T16:55:00Z",
"kind": "rsvps"
}
......@@ -23,5 +23,6 @@
"date": "2019-08-19T17:27:18Z",
"tags": [
"code-style"
]
],
"kind": "bookmarks"
}
......@@ -29,5 +29,6 @@
"tags": [
"shell",
"cli"
]
],
"kind": "bookmarks"
}
......@@ -21,5 +21,6 @@
"date": "2019-07-17T13:04:35+0200",
"tags": [
"software-quality"
]
],
"kind": "bookmarks"
}
......@@ -33,5 +33,6 @@
"tags": [
"security",
"ssh"
]
],
"kind": "bookmarks"
}
......@@ -11,5 +11,6 @@
]
},
"h": "h-entry",
"date": "2019-08-13T16:45:28Z"
"date": "2019-08-13T16:45:28Z",
"kind": "likes"
}
......@@ -11,5 +11,6 @@
]
},
"h": "h-entry",
"date": "2019-08-07T13:20:00Z"
"date": "2019-08-07T13:20:00Z",
"kind": "bookmarks"
}
......@@ -11,5 +11,6 @@
]
},
"h": "h-entry",
"date": "2019-08-09T07:33:46Z"
"date": "2019-08-09T07:33:46Z",
"kind": "likes"
}
......@@ -31,5 +31,6 @@
"date": "2019-06-27T08:24:08+0100",
"tags": [
"indieweb"
]
],
"kind": "bookmarks"
}
......@@ -25,5 +25,6 @@
"tags": [
"cucumber",
"testing"
]
],
"kind": "bookmarks"
}
......@@ -21,5 +21,6 @@
"tags": [
"blogging"
],
"date": "2019-07-22T22:34:13+0100"
"date": "2019-07-22T22:34:13+0100",
"kind": "likes"
}
......@@ -49,5 +49,6 @@
"date": "2019-05-18T09:08:09+0100",
"tags": [
"homebrew-website-club"
]
],
"kind": "rsvps"
}
......@@ -52,5 +52,6 @@
"date": "2019-06-04T21:47:17+0100",
"tags": [
"notts-techfast"
]
],
"kind": "rsvps"
}
......@@ -25,5 +25,6 @@
"tags": [
"banking",
"regulation"
]
],
"kind": "bookmarks"
}
......@@ -11,5 +11,6 @@
]
},
"h": "h-entry",
"date": "2019-08-22T07:04:38Z"
"date": "2019-08-22T07:04:38Z",
"kind": "likes"
}
......@@ -27,5 +27,6 @@
"date": "2019-06-13T12:08:29+0100",
"tags": [
"nottingham"
]
],
"kind": "bookmarks"
}
......@@ -26,5 +26,6 @@
"tags": [
"android",
"phone"
]
],
"kind": "notes"
}
......@@ -21,5 +21,6 @@
"date": "2019-07-18T15:33:04+0200",
"tags": [
"open-source"
]
],
"kind": "bookmarks"
}
......@@ -11,5 +11,6 @@
]
},
"h": "h-entry",
"date": "2019-08-17T22:31:32Z"
"date": "2019-08-17T22:31:32Z",
"kind": "likes"
}
......@@ -21,6 +21,6 @@
"tags": [
"blogging"
],
"date": "2019-07-28T22:21:00+0100"
"date": "2019-07-28T22:21:00+0100",
"kind": "likes"
}
......@@ -21,5 +21,6 @@
"date": "2019-07-26T06:55:00+0100",
"tags": [
"homebrew-website-club"
]
],
"kind": "likes"
}
......@@ -32,5 +32,6 @@
"tags": [
"security",
"podcasts"
]
],
"kind": "bookmarks"
}
......@@ -27,5 +27,6 @@
"date": "2019-06-27T21:07:28+0100",
"tags": [
"licensing"
]
],
"kind": "bookmarks"
}
......@@ -17,5 +17,6 @@
]
},
"h": "h-entry",
"date": "2019-08-09T16:15:29Z"
"date": "2019-08-09T16:15:29Z",
"kind": "bookmarks"
}
......@@ -49,5 +49,6 @@
"date": "2019-07-31T07:59:11+0100",
"tags": [
"homebrew-website-club"
]
],
"kind": "rsvps"
}
......@@ -23,5 +23,6 @@
"tags": [
"indieweb",
"webmention"
]
],
"kind": "bookmarks"
}
......@@ -17,5 +17,6 @@
"date": "2019-08-16T17:39:24Z",
"tags": [
"star-trek"
]
],
"kind": "likes"
}
......@@ -52,5 +52,6 @@
"date": "2019-07-10T21:55:07+0100",
"tags": [
"homebrew-website-club"
]
],
"kind": "rsvps"
}
......@@ -27,5 +27,6 @@
"date": "2019-05-31T22:22:59+0100",
"tags": [
"feminism"
]
],
"kind": "bookmarks"
}
......@@ -23,5 +23,6 @@
"tags": [
"indieweb",
"social-media"
]
],
"kind": "bookmarks"
}
......@@ -46,5 +46,6 @@
"date": "2019-07-09T22:48:04+0100",
"tags": [
"homebrew-website-club-nottingham"
]
],
"kind": "rsvps"
}
......@@ -29,5 +29,6 @@
"tags": [
"impostor-syndrome",
"events"
]
],
"kind": "bookmarks"
}
......@@ -11,5 +11,6 @@
]
},
"h": "h-entry",
"date": "2019-08-25T08:53:21Z"
"date": "2019-08-25T08:53:21Z",
"kind": "likes"
}
......@@ -52,5 +52,6 @@
"date": "2019-06-26T10:44:00+0100",
"tags": [
"devops-notts"
]
],
"kind": "rsvps"
}
......@@ -39,6 +39,6 @@
}
},
"h": "h-entry",
"date": "2019-08-11T10:59:26Z"
"date": "2019-08-11T10:59:26Z",
"kind": "rsvps"
}
......@@ -29,5 +29,6 @@
"tags": [
"security",
"pgp"
]
],
"kind": "bookmarks"
}
......@@ -27,5 +27,6 @@
"date": "2019-06-30T21:30:13+0100",
"tags": [
"git"
]
],
"kind": "bookmarks"
}
......@@ -23,5 +23,6 @@
"tags": [
"aws",
"amazon"
]
],
"kind": "likes"
}
......@@ -11,5 +11,6 @@
]
},
"h": "h-entry",
"date": "2019-08-13T11:01:56Z"
"date": "2019-08-13T11:01:56Z",
"kind": "likes"
}
......@@ -26,5 +26,6 @@
"tags": [
"announcement",
"phpminds"
]
],
"kind": "notes"
}
......@@ -29,5 +29,6 @@
"tags": [
"burnout",
"self-care"
]
],
"kind": "bookmarks"
}
......@@ -31,5 +31,6 @@
"events",
"wit-notts",
"negotiation"
]
],
"kind": "replies"
}
......@@ -29,5 +29,6 @@
"tags": [
"inclusivity",
"communication"
]
],
"kind": "bookmarks"
}
......@@ -23,5 +23,6 @@
"date": "2019-08-19T07:07:11Z",
"tags": [
"yaml"
]
],
"kind": "bookmarks"
}
......@@ -27,5 +27,6 @@
"date": "2019-06-02T14:11:52+0100",
"tags": [
"communication"
]
],
"kind": "bookmarks"
}
......@@ -21,5 +21,6 @@
"date": "2019-07-27T08:59:00+0100",
"tags": [
"personal-website"
]
],
"kind": "likes"
}
......@@ -21,5 +21,6 @@
"date": "2019-06-12T18:13:09+0100",
"tags": [
"mozilla"
]
],
"kind": "likes"
}
......@@ -46,5 +46,6 @@
"date": "2019-05-18T09:08:09+0100",
"tags": [
"oggcamp"
]
],
"kind": "rsvps"
}
{
"date" : "2019-08-26T23:46:59.299+02:00",
"h" : "h-entry",
"properties" : {
"name" : [ "Encrypted Partitions in Ubuntu" ],
"bookmark-of" : [ "https://annadodson.co.uk/blog/2019/08/18/partitioning-in-ubuntu/" ],
"published" : [ "2019-08-26T23:46:59.299+02:00" ]
}
"date": "2019-08-26T23:46:59.299+02:00",
"h": "h-entry",
"properties": {
"name": [
"Encrypted Partitions in Ubuntu"
],
"bookmark-of": [
"https://annadodson.co.uk/blog/2019/08/18/partitioning-in-ubuntu/"
],
"published": [
"2019-08-26T23:46:59.299+02:00"
]
},
"kind": "bookmarks"
}
......@@ -46,5 +46,6 @@
"date": "2019-06-17T21:39:00+0100",
"tags": [
"wit-notts"
]
],
"kind": "rsvps"
}
......@@ -27,5 +27,6 @@
"date": "2019-07-22T18:38:00+0100",
"tags": [
"automation"
]
],
"kind": "bookmarks"
}
......@@ -27,5 +27,6 @@
"date": "2019-07-23T14:54:00+0100",
"tags": [
"automation"
]
],
"kind": "bookmarks"
}
......@@ -23,5 +23,6 @@
"tags": [
"indieweb",
"webmention"
]
],
"kind": "likes"
}
......@@ -29,5 +29,6 @@
"tags": [
"indieweb",
"indieweb-summit"
]
],
"kind": "bookmarks"
}
......@@ -27,5 +27,6 @@
"date": "2019-07-18T18:20:56+0200",
"tags": [
"incident-management"
]
],
"kind": "bookmarks"
}
{
"date" : "2019-08-28T07:46:00+0100",
"h" : "h-entry",
"properties" : {
"name" : [ "Bookmark of https://twitter.com/DuckDuckGo/status/1166390671705612293" ],
"bookmark-of" : [ "https://twitter.com/DuckDuckGo/status/1166390671705612293" ],
"published" : [ "2019-08-28T07:46:00+0100" ],
"category" : [ "privacy", "search" ],
"content" : [ {
"html" : "",
"value" : "I've been using DuckDuckGo for a couple of years now, and have no complaints. The privacy baked into the product is great, and their extensibility for things like `!gh` to search on GitHub or searching \"html pretty print\" is awesome for quick productivity boosting.\n\nI'd recommend you giving it a go, and see how you feel after a while. And if you're finding search results aren't so great every so often, you can `!g` to get your Google results! "
} ]
"date": "2019-08-28T07:46:00+0100",
"h": "h-entry",
"properties": {
"name": [
"Bookmark of https://twitter.com/DuckDuckGo/status/1166390671705612293"
],
"bookmark-of": [
"https://twitter.com/DuckDuckGo/status/1166390671705612293"
],
"published": [
"2019-08-28T07:46:00+0100"
],
"category": [
"privacy",
"search"
],
"content": [
{
"html": "",
"value": "I've been using DuckDuckGo for a couple of years now, and have no complaints. The privacy baked into the product is great, and their extensibility for things like `!gh` to search on GitHub or searching \"html pretty print\" is awesome for quick productivity boosting.\n\nI'd recommend you giving it a go, and see how you feel after a while. And if you're finding search results aren't so great every so often, you can `!g` to get your Google results! "
}
]
},
"tags" : [ "privacy", "search" ]
"tags": [
"privacy",
"search"
],
"kind": "bookmarks"
}
......@@ -37,5 +37,6 @@
"indieweb",
"licensing",
"www.jvt.me"
]
],
"kind": "notes"
}
......@@ -31,5 +31,6 @@
"events",
"dotnet-notts",
"software-quality"
]
],
"kind": "replies"
}
......@@ -23,5 +23,6 @@
"tags": [
"habits",
"work-ethic"
]
],
"kind": "bookmarks"
}
......@@ -29,5 +29,6 @@
"tags": [
"indieweb",
"homebrew-website-club"
]
],
"kind": "replies"
}
......@@ -29,5 +29,6 @@
"tags": [
"firefox",
"privacy"
]
],
"kind": "bookmarks"
}
......@@ -29,5 +29,6 @@
"tags": [
"inclusivity",
"events"
]
],
"kind": "bookmarks"
}
......@@ -25,5 +25,6 @@
"tags": [
"tools",
"rest"
]
],
"kind": "bookmarks"
}
......@@ -46,5 +46,6 @@
"date": "2019-05-16T20:51:53+0100",
"tags": [
"wit-notts"
]
],
"kind": "rsvps"
}
......@@ -23,5 +23,6 @@
"tags": [
"public-speaking",
"call-for-papers"
]
],
"kind": "bookmarks"
}
......@@ -23,5 +23,6 @@
"date": "2019-08-17T22:39:56Z",
"tags": [
"git"
]
],
"kind": "bookmarks"
}
......@@ -17,5 +17,6 @@
]
},
"h": "h-entry",
"date": "2019-08-19T22:12:14Z"
"date": "2019-08-19T22:12:14Z",
"kind": "bookmarks"
}
......@@ -27,6 +27,6 @@
"date": "2019-07-30T20:23:00+0100",
"tags": [
"commandline"
]
],
"kind": "bookmarks"
}
......@@ -27,5 +27,6 @@
"date": "2019-07-25T07:19:00+0100",
"tags": [
"job"
]
],
"kind": "bookmarks"
}
......@@ -52,5 +52,6 @@
"date": "2019-06-27T15:15:00+0100",
"tags": [
"notts-js"
]
],
"kind": "rsvps"
}
......@@ -46,5 +46,6 @@
"date": "2019-05-30T21:07:00+0100",
"tags": [
"notts-iot"
]
],
"kind": "rsvps"
}
......@@ -23,5 +23,6 @@
"date": "2019-08-19T22:01:25Z",
"tags": [
"game-of-thrones"
</