discard post types. Need a new approach for this

cmd/owl/new_post.go

@@ -40,7 +40,7 @@ var newPostCmd = &cobra.Command{
 			return
 		}
 
-		post, err := user.CreateNewPost(postTitle, true)
+		post, err := user.CreateNewPost(owl.PostMeta{Type: "article", Title: postTitle, Draft: true}, "")
 		if err != nil {
 			println("Error creating post: ", err.Error())
 		} else {

cmd/owl/web/aliases_test.go

@@ -13,7 +13,7 @@ import (
 func TestRedirectOnAliases(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("test-1")
-	post, _ := user.CreateNewPost("post-1", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Title: "post-1"}, "")
 
 	content := "---\n"
 	content += "title: Test\n"
@@ -39,7 +39,7 @@ func TestRedirectOnAliases(t *testing.T) {
 func TestNoRedirectOnNonExistingAliases(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("test-1")
-	post, _ := user.CreateNewPost("post-1", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Title: "post-1"}, "")
 
 	content := "---\n"
 	content += "title: Test\n"
@@ -64,8 +64,8 @@ func TestNoRedirectOnNonExistingAliases(t *testing.T) {
 func TestNoRedirectIfValidPostUrl(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("test-1")
-	post, _ := user.CreateNewPost("post-1", false)
-	post2, _ := user.CreateNewPost("post-2", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Title: "post-1"}, "")
+	post2, _ := user.CreateNewPost(owl.PostMeta{Title: "post-2"}, "")
 
 	content := "---\n"
 	content += "title: Test\n"
@@ -89,7 +89,7 @@ func TestNoRedirectIfValidPostUrl(t *testing.T) {
 func TestRedirectIfInvalidPostUrl(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("test-1")
-	post, _ := user.CreateNewPost("post-1", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Title: "post-1"}, "")
 
 	content := "---\n"
 	content += "title: Test\n"
@@ -113,7 +113,7 @@ func TestRedirectIfInvalidPostUrl(t *testing.T) {
 func TestRedirectIfInvalidUserUrl(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("test-1")
-	post, _ := user.CreateNewPost("post-1", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Title: "post-1"}, "")
 
 	content := "---\n"
 	content += "title: Test\n"
@@ -137,7 +137,7 @@ func TestRedirectIfInvalidUserUrl(t *testing.T) {
 func TestRedirectIfInvalidMediaUrl(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("test-1")
-	post, _ := user.CreateNewPost("post-1", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Title: "post-1"}, "")
 
 	content := "---\n"
 	content += "title: Test\n"
@@ -161,7 +161,7 @@ func TestRedirectIfInvalidMediaUrl(t *testing.T) {
 func TestDeepAliasInSingleUserMode(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{SingleUser: "test-1"})
 	user, _ := repo.CreateUser("test-1")
-	post, _ := user.CreateNewPost("post-1", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Title: "post-1"}, "")
 
 	content := "---\n"
 	content += "title: Create tileable textures with GIMP\n"

cmd/owl/web/editor_handler.go

@@ -245,16 +245,16 @@ func userEditorPostHandler(repo *owl.Repository) func(http.ResponseWriter, *http
 		// TODO: scrape bookmark_url for title and description
 
 		// create post
-		post, err := user.CreateNewPostFull(owl.PostMeta{
+		post, err := user.CreateNewPost(owl.PostMeta{
 			Type:        post_type,
 			Title:       title,
 			Description: description,
 			Draft:       draft == "on",
 			Date:        time.Now(),
-			Reply: owl.Reply{
+			Reply: owl.ReplyData{
 				Url: reply_url,
 			},
-			Bookmark: owl.Bookmark{
+			Bookmark: owl.BookmarkData{
 				Url: bookmark_url,
 			},
 		}, content)

cmd/owl/web/editor_test.go

@@ -1,6 +1,7 @@
 package web_test
 
 import (
+	"h4kor/owl-blogs"
 	main "h4kor/owl-blogs/cmd/owl/web"
 	"h4kor/owl-blogs/test/assertions"
 	"h4kor/owl-blogs/test/mocks"
@@ -212,7 +213,7 @@ func TestEditorSendsWebmentions(t *testing.T) {
 	repo.Parser = &mocks.MockHtmlParser{}
 	user.ResetPassword("testpassword")
 
-	mentioned_post, _ := user.CreateNewPost("test", false)
+	mentioned_post, _ := user.CreateNewPost(owl.PostMeta{Title: "test"}, "")
 
 	sessionId := user.CreateNewSession()
 

cmd/owl/web/handler.go

@@ -144,7 +144,7 @@ func userWebmentionHandler(repo *owl.Repository) func(http.ResponseWriter, *http
 			return
 		}
 
-		tryAlias := func(target string) *owl.Post {
+		tryAlias := func(target string) owl.Post {
 			parsedTarget, _ := url.Parse(target)
 			aliases, _ := repo.PostAliases()
 			fmt.Printf("aliases %v", aliases)
@@ -155,7 +155,7 @@ func userWebmentionHandler(repo *owl.Repository) func(http.ResponseWriter, *http
 			return nil
 		}
 
-		var aliasPost *owl.Post
+		var aliasPost owl.Post
 		parts := strings.Split(target[0], "/")
 		if len(parts) < 2 {
 			aliasPost = tryAlias(target[0])
@@ -333,10 +333,10 @@ func userMicropubHandler(repo *owl.Repository) func(http.ResponseWriter, *http.R
 		}
 
 		// create post
-		post, err := user.CreateNewPostFull(
+		post, err := user.CreateNewPost(
 			owl.PostMeta{
 				Title: name,
-				Reply: owl.Reply{
+				Reply: owl.ReplyData{
 					Url: inReplyTo,
 				},
 				Date: time.Now(),

cmd/owl/web/multi_user_test.go

@@ -54,7 +54,7 @@ func TestMultiUserRepoIndexHandler(t *testing.T) {
 func TestMultiUserUserIndexHandler(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("test-1")
-	user.CreateNewPost("post-1", false)
+	user.CreateNewPost(owl.PostMeta{Type: "article", Title: "post-1"}, "")
 
 	// Create Request and Response
 	req, err := http.NewRequest("GET", user.UrlPath(), nil)
@@ -72,7 +72,7 @@ func TestMultiUserUserIndexHandler(t *testing.T) {
 func TestMultiUserPostHandler(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("test-1")
-	post, _ := user.CreateNewPost("post-1", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "post-1"}, "")
 
 	// Create Request and Response
 	req, err := http.NewRequest("GET", post.UrlPath(), nil)
@@ -87,7 +87,7 @@ func TestMultiUserPostHandler(t *testing.T) {
 func TestMultiUserPostMediaHandler(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("test-1")
-	post, _ := user.CreateNewPost("post-1", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "post-1"}, "")
 
 	// Create test media file
 	path := path.Join(post.MediaDir(), "data.txt")

cmd/owl/web/post_test.go

@@ -13,7 +13,7 @@ import (
 func TestPostHandlerReturns404OnDrafts(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("test-1")
-	post, _ := user.CreateNewPost("post-1", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Title: "post-1"}, "")
 
 	content := "---\n"
 	content += "title: test\n"

cmd/owl/web/rss_test.go

@@ -12,7 +12,7 @@ import (
 func TestMultiUserUserRssIndexHandler(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("test-1")
-	user.CreateNewPost("post-1", false)
+	user.CreateNewPost(owl.PostMeta{Type: "article", Title: "post-1"}, "")
 
 	// Create Request and Response
 	req, err := http.NewRequest("GET", user.UrlPath()+"index.xml", nil)

cmd/owl/web/single_user_test.go

@@ -19,7 +19,7 @@ func getSingleUserTestRepo() (owl.Repository, owl.User) {
 
 func TestSingleUserUserIndexHandler(t *testing.T) {
 	repo, user := getSingleUserTestRepo()
-	user.CreateNewPost("post-1", false)
+	user.CreateNewPost(owl.PostMeta{Type: "article", Title: "post-1"}, "")
 
 	// Create Request and Response
 	req, err := http.NewRequest("GET", user.UrlPath(), nil)
@@ -36,7 +36,7 @@ func TestSingleUserUserIndexHandler(t *testing.T) {
 
 func TestSingleUserPostHandler(t *testing.T) {
 	repo, user := getSingleUserTestRepo()
-	post, _ := user.CreateNewPost("post-1", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "post-1"}, "")
 
 	// Create Request and Response
 	req, err := http.NewRequest("GET", post.UrlPath(), nil)
@@ -50,7 +50,7 @@ func TestSingleUserPostHandler(t *testing.T) {
 
 func TestSingleUserPostMediaHandler(t *testing.T) {
 	repo, user := getSingleUserTestRepo()
-	post, _ := user.CreateNewPost("post-1", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "post-1"}, "")
 
 	// Create test media file
 	path := path.Join(post.MediaDir(), "data.txt")
@@ -72,7 +72,7 @@ func TestSingleUserPostMediaHandler(t *testing.T) {
 
 func TestHasNoDraftsInList(t *testing.T) {
 	repo, user := getSingleUserTestRepo()
-	post, _ := user.CreateNewPost("post-1", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "post-1"}, "")
 	content := ""
 	content += "---\n"
 	content += "title: Articles September 2019\n"
@@ -102,11 +102,11 @@ func TestHasNoDraftsInList(t *testing.T) {
 
 func TestSingleUserUserPostListHandler(t *testing.T) {
 	repo, user := getSingleUserTestRepo()
-	user.CreateNewPostFull(owl.PostMeta{
+	user.CreateNewPost(owl.PostMeta{
 		Title: "post-1",
 		Type:  "article",
 	}, "hi")
-	user.CreateNewPostFull(owl.PostMeta{
+	user.CreateNewPost(owl.PostMeta{
 		Title: "post-2",
 		Type:  "note",
 	}, "hi")

cmd/owl/web/webmention_test.go

@@ -38,7 +38,7 @@ func setupWebmentionTest(repo owl.Repository, user owl.User, target string, sour
 func TestWebmentionHandleAccepts(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("test-1")
-	post, _ := user.CreateNewPost("post-1", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "post-1"}, "")
 
 	target := post.FullUrl()
 	source := "https://example.com"
@@ -54,7 +54,7 @@ func TestWebmentionWrittenToPost(t *testing.T) {
 
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("test-1")
-	post, _ := user.CreateNewPost("post-1", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "post-1"}, "")
 
 	target := post.FullUrl()
 	source := "https://example.com"
@@ -77,7 +77,7 @@ func TestWebmentionSourceValidation(t *testing.T) {
 
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("test-1")
-	post, _ := user.CreateNewPost("post-1", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "post-1"}, "")
 
 	target := post.FullUrl()
 	source := "ftp://example.com"
@@ -92,7 +92,7 @@ func TestWebmentionTargetValidation(t *testing.T) {
 
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("test-1")
-	post, _ := user.CreateNewPost("post-1", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "post-1"}, "")
 
 	target := "ftp://example.com"
 	source := post.FullUrl()
@@ -109,7 +109,7 @@ func TestWebmentionSameTargetAndSource(t *testing.T) {
 
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("test-1")
-	post, _ := user.CreateNewPost("post-1", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "post-1"}, "")
 
 	target := post.FullUrl()
 	source := post.FullUrl()
@@ -126,7 +126,7 @@ func TestWebmentionSameTargetAndSource(t *testing.T) {
 func TestValidationOfTarget(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("test-1")
-	post, _ := user.CreateNewPost("post-1", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "post-1"}, "")
 
 	target := post.FullUrl()
 	target = target[:len(target)-1] + "invalid"
@@ -141,7 +141,7 @@ func TestValidationOfTarget(t *testing.T) {
 func TestAcceptWebmentionForAlias(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("test-1")
-	post, _ := user.CreateNewPost("post-1", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "post-1"}, "")
 
 	content := "---\n"
 	content += "title: Test\n"

cmd/owl/webmention.go

@@ -46,7 +46,7 @@ var webmentionCmd = &cobra.Command{
 			}
 		}
 
-		processPost := func(user owl.User, post *owl.Post) error {
+		processPost := func(user owl.User, post owl.Post) error {
 			println("Webmentions for post: ", post.Title())
 
 			err := post.ScanForLinks()

embed/article/detail.html

@@ -0,0 +1,60 @@
+<div class="h-entry">
+    <hgroup>
+        <h1 class="p-name">{{.Title}}</h1>
+        <small>
+            <a class="u-url" href="{{.Post.FullUrl}}">#</a>
+            Published:
+            <time class="dt-published" datetime="{{.Post.Meta.Date}}">
+                {{.Post.Meta.FormattedDate}}
+            </time>
+            {{ if .Post.User.Config.AuthorName }}
+            by
+            <a class="p-author h-card" href="{{.Post.User.FullUrl}}">
+                {{ if .Post.User.AvatarUrl }}
+                <img class="u-photo u-logo" style="height: 1em;" src="{{ .Post.User.AvatarUrl }}"
+                    alt="{{ .Post.User.Config.Title }}" />
+                {{ end }}
+                {{.Post.User.Config.AuthorName}}
+            </a>
+            {{ end }}
+        </small>
+    </hgroup>
+    <hr>
+    <br>
+
+    {{ if .Post.Meta.Bookmark.Url }}
+    <p style="font-style: italic;filter: opacity(80%);">
+        Bookmark: <a class="u-bookmark-of h-cite" href="{{.Post.Meta.Bookmark.Url}}">
+            {{ if .Post.Meta.Bookmark.Text }}
+            {{.Post.Meta.Bookmark.Text}}
+            {{ else }}
+            {{.Post.Meta.Bookmark.Url}}
+            {{ end }}
+        </a>
+    </p>
+    {{ end }}
+
+    <div class="e-content">
+        {{.Content}}
+    </div>
+
+    <hr>
+    {{if .Post.ApprovedIncomingWebmentions}}
+    <h3>
+        Webmentions
+    </h3>
+    <ul>
+        {{range .Post.ApprovedIncomingWebmentions}}
+        <li>
+            <a href="{{.Source}}">
+                {{if .Title}}
+                {{.Title}}
+                {{else}}
+                {{.Source}}
+                {{end}}
+            </a>
+        </li>
+        {{end}}
+    </ul>
+    {{end}}
+</div>

embed/bookmark/detail.html

@@ -0,0 +1,72 @@
+<div class="h-entry">
+    <hgroup>
+        <h1 class="p-name">{{.Title}}</h1>
+        <small>
+            <a class="u-url" href="{{.Post.FullUrl}}">#</a>
+            Published:
+            <time class="dt-published" datetime="{{.Post.Meta.Date}}">
+                {{.Post.Meta.FormattedDate}}
+            </time>
+            {{ if .Post.User.Config.AuthorName }}
+            by
+            <a class="p-author h-card" href="{{.Post.User.FullUrl}}">
+                {{ if .Post.User.AvatarUrl }}
+                <img class="u-photo u-logo" style="height: 1em;" src="{{ .Post.User.AvatarUrl }}"
+                    alt="{{ .Post.User.Config.Title }}" />
+                {{ end }}
+                {{.Post.User.Config.AuthorName}}
+            </a>
+            {{ end }}
+        </small>
+    </hgroup>
+    <hr>
+    <br>
+
+    {{ if .Post.Meta.Reply.Url }}
+    <p style="font-style: italic;filter: opacity(80%);">
+        In reply to: <a class="u-in-reply-to h-cite" rel="in-reply-to" href="{{.Post.Meta.Reply.Url}}">
+            {{ if .Post.Meta.Reply.Text }}
+            {{.Post.Meta.Reply.Text}}
+            {{ else }}
+            {{.Post.Meta.Reply.Url}}
+            {{ end }}
+        </a>
+    </p>
+    {{ end }}
+
+    {{ if .Post.Meta.Bookmark.Url }}
+    <p style="font-style: italic;filter: opacity(80%);">
+        Bookmark: <a class="u-bookmark-of h-cite" href="{{.Post.Meta.Bookmark.Url}}">
+            {{ if .Post.Meta.Bookmark.Text }}
+            {{.Post.Meta.Bookmark.Text}}
+            {{ else }}
+            {{.Post.Meta.Bookmark.Url}}
+            {{ end }}
+        </a>
+    </p>
+    {{ end }}
+
+    <div class="e-content">
+        {{.Content}}
+    </div>
+
+    <hr>
+    {{if .Post.ApprovedIncomingWebmentions}}
+    <h3>
+        Webmentions
+    </h3>
+    <ul>
+        {{range .Post.ApprovedIncomingWebmentions}}
+        <li>
+            <a href="{{.Source}}">
+                {{if .Title}}
+                {{.Title}}
+                {{else}}
+                {{.Source}}
+                {{end}}
+            </a>
+        </li>
+        {{end}}
+    </ul>
+    {{end}}
+</div>

embed/note/detail.html

@@ -0,0 +1,47 @@
+<div class="h-entry">
+    <hgroup>
+        <small>
+            <a class="u-url" href="{{.Post.FullUrl}}">#</a>
+            Published:
+            <time class="dt-published" datetime="{{.Post.Meta.Date}}">
+                {{.Post.Meta.FormattedDate}}
+            </time>
+            {{ if .Post.User.Config.AuthorName }}
+            by
+            <a class="p-author h-card" href="{{.Post.User.FullUrl}}">
+                {{ if .Post.User.AvatarUrl }}
+                <img class="u-photo u-logo" style="height: 1em;" src="{{ .Post.User.AvatarUrl }}"
+                    alt="{{ .Post.User.Config.Title }}" />
+                {{ end }}
+                {{.Post.User.Config.AuthorName}}
+            </a>
+            {{ end }}
+        </small>
+    </hgroup>
+    <hr>
+    <br>
+
+    <div class="e-content">
+        {{.Content}}
+    </div>
+
+    <hr>
+    {{if .Post.ApprovedIncomingWebmentions}}
+    <h3>
+        Webmentions
+    </h3>
+    <ul>
+        {{range .Post.ApprovedIncomingWebmentions}}
+        <li>
+            <a href="{{.Source}}">
+                {{if .Title}}
+                {{.Title}}
+                {{else}}
+                {{.Source}}
+                {{end}}
+            </a>
+        </li>
+        {{end}}
+    </ul>
+    {{end}}
+</div>

embed/page/detail.html

@@ -0,0 +1,34 @@
+<div class="h-entry">
+    <hgroup>
+        <h1 class="p-name">{{.Title}}</h1>
+        <small>
+            <a class="u-url" href="{{.Post.FullUrl}}">#</a>
+        </small>
+    </hgroup>
+    <hr>
+    <br>
+
+    <div class="e-content">
+        {{.Content}}
+    </div>
+
+    <hr>
+    {{if .Post.ApprovedIncomingWebmentions}}
+    <h3>
+        Webmentions
+    </h3>
+    <ul>
+        {{range .Post.ApprovedIncomingWebmentions}}
+        <li>
+            <a href="{{.Source}}">
+                {{if .Title}}
+                {{.Title}}
+                {{else}}
+                {{.Source}}
+                {{end}}
+            </a>
+        </li>
+        {{end}}
+    </ul>
+    {{end}}
+</div>

embed/reply/detail.html

@@ -0,0 +1,60 @@
+<div class="h-entry">
+    <hgroup>
+        <h1 class="p-name">{{.Title}}</h1>
+        <small>
+            <a class="u-url" href="{{.Post.FullUrl}}">#</a>
+            Published:
+            <time class="dt-published" datetime="{{.Post.Meta.Date}}">
+                {{.Post.Meta.FormattedDate}}
+            </time>
+            {{ if .Post.User.Config.AuthorName }}
+            by
+            <a class="p-author h-card" href="{{.Post.User.FullUrl}}">
+                {{ if .Post.User.AvatarUrl }}
+                <img class="u-photo u-logo" style="height: 1em;" src="{{ .Post.User.AvatarUrl }}"
+                    alt="{{ .Post.User.Config.Title }}" />
+                {{ end }}
+                {{.Post.User.Config.AuthorName}}
+            </a>
+            {{ end }}
+        </small>
+    </hgroup>
+    <hr>
+    <br>
+
+    {{ if .Post.Meta.Reply.Url }}
+    <p style="font-style: italic;filter: opacity(80%);">
+        In reply to: <a class="u-in-reply-to h-cite" rel="in-reply-to" href="{{.Post.Meta.Reply.Url}}">
+            {{ if .Post.Meta.Reply.Text }}
+            {{.Post.Meta.Reply.Text}}
+            {{ else }}
+            {{.Post.Meta.Reply.Url}}
+            {{ end }}
+        </a>
+    </p>
+    {{ end }}
+
+    <div class="e-content">
+        {{.Content}}
+    </div>
+
+    <hr>
+    {{if .Post.ApprovedIncomingWebmentions}}
+    <h3>
+        Webmentions
+    </h3>
+    <ul>
+        {{range .Post.ApprovedIncomingWebmentions}}
+        <li>
+            <a href="{{.Source}}">
+                {{if .Title}}
+                {{.Title}}
+                {{else}}
+                {{.Source}}
+                {{end}}
+            </a>
+        </li>
+        {{end}}
+    </ul>
+    {{end}}
+</div>

embed/untyped/detail.html

@@ -0,0 +1,72 @@
+<div class="h-entry">
+    <hgroup>
+        <h1 class="p-name">{{.Title}}</h1>
+        <small>
+            <a class="u-url" href="{{.Post.FullUrl}}">#</a>
+            Published:
+            <time class="dt-published" datetime="{{.Post.Meta.Date}}">
+                {{.Post.Meta.FormattedDate}}
+            </time>
+            {{ if .Post.User.Config.AuthorName }}
+            by
+            <a class="p-author h-card" href="{{.Post.User.FullUrl}}">
+                {{ if .Post.User.AvatarUrl }}
+                <img class="u-photo u-logo" style="height: 1em;" src="{{ .Post.User.AvatarUrl }}"
+                    alt="{{ .Post.User.Config.Title }}" />
+                {{ end }}
+                {{.Post.User.Config.AuthorName}}
+            </a>
+            {{ end }}
+        </small>
+    </hgroup>
+    <hr>
+    <br>
+
+    {{ if .Post.Meta.Reply.Url }}
+    <p style="font-style: italic;filter: opacity(80%);">
+        In reply to: <a class="u-in-reply-to h-cite" rel="in-reply-to" href="{{.Post.Meta.Reply.Url}}">
+            {{ if .Post.Meta.Reply.Text }}
+            {{.Post.Meta.Reply.Text}}
+            {{ else }}
+            {{.Post.Meta.Reply.Url}}
+            {{ end }}
+        </a>
+    </p>
+    {{ end }}
+
+    {{ if .Post.Meta.Bookmark.Url }}
+    <p style="font-style: italic;filter: opacity(80%);">
+        Bookmark: <a class="u-bookmark-of h-cite" href="{{.Post.Meta.Bookmark.Url}}">
+            {{ if .Post.Meta.Bookmark.Text }}
+            {{.Post.Meta.Bookmark.Text}}
+            {{ else }}
+            {{.Post.Meta.Bookmark.Url}}
+            {{ end }}
+        </a>
+    </p>
+    {{ end }}
+
+    <div class="e-content">
+        {{.Content}}
+    </div>
+
+    <hr>
+    {{if .Post.ApprovedIncomingWebmentions}}
+    <h3>
+        Webmentions
+    </h3>
+    <ul>
+        {{range .Post.ApprovedIncomingWebmentions}}
+        <li>
+            <a href="{{.Source}}">
+                {{if .Title}}
+                {{.Title}}
+                {{else}}
+                {{.Source}}
+                {{end}}
+            </a>
+        </li>
+        {{end}}
+    </ul>
+    {{end}}
+</div>

post.go

@@ -17,7 +17,7 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
-type Post struct {
+type GenericPost struct {
 	user       *User
 	id         string
 	metaLoaded bool
@@ -25,24 +25,62 @@ type Post struct {
 	wmLock     sync.Mutex
 }
 
-type Reply struct {
+func (post *GenericPost) TemplateDir() string {
+	return post.Meta().Type
+}
+
+type Post interface {
+	TemplateDir() string
+
+	// Actual Data
+	User() *User
+	Id() string
+	Title() string
+	Meta() PostMeta
+	Content() []byte
+	RenderedContent() string
+	Aliases() []string
+
+	// Filesystem
+	Dir() string
+	MediaDir() string
+	ContentFile() string
+
+	// Urls
+	UrlPath() string
+	FullUrl() string
+	UrlMediaPath(filename string) string
+
+	// Webmentions Support
+	IncomingWebmentions() []WebmentionIn
+	OutgoingWebmentions() []WebmentionOut
+	PersistIncomingWebmention(webmention WebmentionIn) error
+	PersistOutgoingWebmention(webmention *WebmentionOut) error
+	AddIncomingWebmention(source string) error
+	EnrichWebmention(webmention WebmentionIn) error
+	ApprovedIncomingWebmentions() []WebmentionIn
+	ScanForLinks() error
+	SendWebmention(webmention WebmentionOut) error
+}
+
+type ReplyData struct {
 	Url  string `yaml:"url"`
 	Text string `yaml:"text"`
 }
-type Bookmark struct {
+type BookmarkData struct {
 	Url  string `yaml:"url"`
 	Text string `yaml:"text"`
 }
 
 type PostMeta struct {
-	Type        string    `yaml:"type"`
-	Title       string    `yaml:"title"`
-	Description string    `yaml:"description"`
-	Aliases     []string  `yaml:"aliases"`
-	Date        time.Time `yaml:"date"`
-	Draft       bool      `yaml:"draft"`
-	Reply       Reply     `yaml:"reply"`
-	Bookmark    Bookmark  `yaml:"bookmark"`
+	Type        string       `yaml:"type"`
+	Title       string       `yaml:"title"`
+	Description string       `yaml:"description"`
+	Aliases     []string     `yaml:"aliases"`
+	Date        time.Time    `yaml:"date"`
+	Draft       bool         `yaml:"draft"`
+	Reply       ReplyData    `yaml:"reply"`
+	Bookmark    BookmarkData `yaml:"bookmark"`
 }
 
 func (pm PostMeta) FormattedDate() string {
@@ -51,13 +89,13 @@ func (pm PostMeta) FormattedDate() string {
 
 func (pm *PostMeta) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	type T struct {
-		Type        string   `yaml:"type"`
-		Title       string   `yaml:"title"`
-		Description string   `yaml:"description"`
-		Aliases     []string `yaml:"aliases"`
-		Draft       bool     `yaml:"draft"`
-		Reply       Reply    `yaml:"reply"`
-		Bookmark    Bookmark `yaml:"bookmark"`
+		Type        string       `yaml:"type"`
+		Title       string       `yaml:"title"`
+		Description string       `yaml:"description"`
+		Aliases     []string     `yaml:"aliases"`
+		Draft       bool         `yaml:"draft"`
+		Reply       ReplyData    `yaml:"reply"`
+		Bookmark    BookmarkData `yaml:"bookmark"`
 	}
 	type S struct {
 		Date string `yaml:"date"`
@@ -117,64 +155,64 @@ type PostWebmetions struct {
 	Outgoing []WebmentionOut `ymal:"outgoing"`
 }
 
-func (post *Post) Id() string {
+func (post *GenericPost) Id() string {
 	return post.id
 }
 
-func (post *Post) User() *User {
+func (post *GenericPost) User() *User {
 	return post.user
 }
 
-func (post *Post) Dir() string {
+func (post *GenericPost) Dir() string {
 	return path.Join(post.user.Dir(), "public", post.id)
 }
 
-func (post *Post) IncomingWebmentionsFile() string {
+func (post *GenericPost) IncomingWebmentionsFile() string {
 	return path.Join(post.Dir(), "incoming_webmentions.yml")
 }
 
-func (post *Post) OutgoingWebmentionsFile() string {
+func (post *GenericPost) OutgoingWebmentionsFile() string {
 	return path.Join(post.Dir(), "outgoing_webmentions.yml")
 }
 
-func (post *Post) MediaDir() string {
+func (post *GenericPost) MediaDir() string {
 	return path.Join(post.Dir(), "media")
 }
 
-func (post *Post) UrlPath() string {
+func (post *GenericPost) UrlPath() string {
 	return post.user.UrlPath() + "posts/" + post.id + "/"
 }
 
-func (post *Post) FullUrl() string {
+func (post *GenericPost) FullUrl() string {
 	return post.user.FullUrl() + "posts/" + post.id + "/"
 }
 
-func (post *Post) UrlMediaPath(filename string) string {
+func (post *GenericPost) UrlMediaPath(filename string) string {
 	return post.UrlPath() + "media/" + filename
 }
 
-func (post *Post) Title() string {
+func (post *GenericPost) Title() string {
 	return post.Meta().Title
 }
 
-func (post *Post) ContentFile() string {
+func (post *GenericPost) ContentFile() string {
 	return path.Join(post.Dir(), "index.md")
 }
 
-func (post *Post) Meta() PostMeta {
+func (post *GenericPost) Meta() PostMeta {
 	if !post.metaLoaded {
 		post.LoadMeta()
 	}
 	return post.meta
 }
 
-func (post *Post) Content() []byte {
+func (post *GenericPost) Content() []byte {
 	// read file
 	data, _ := os.ReadFile(post.ContentFile())
 	return data
 }
 
-func (post *Post) RenderedContent() string {
+func (post *GenericPost) RenderedContent() string {
 	data := post.Content()
 
 	// trim yaml block
@@ -216,16 +254,18 @@ func (post *Post) RenderedContent() string {
 
 }
 
-func (post *Post) Aliases() []string {
+func (post *GenericPost) Aliases() []string {
 	return post.Meta().Aliases
 }
 
-func (post *Post) LoadMeta() error {
+func (post *GenericPost) LoadMeta() error {
 	data := post.Content()
 
 	// get yaml metadata block
 	meta := PostMeta{}
 	trimmedData := bytes.TrimSpace(data)
+	// ensure that data ends with a newline
+	trimmedData = append(trimmedData, []byte("\n")...)
 	// check first line is ---
 	if string(trimmedData[0:4]) == "---\n" {
 		trimmedData = trimmedData[4:]
@@ -244,7 +284,7 @@ func (post *Post) LoadMeta() error {
 	return nil
 }
 
-func (post *Post) IncomingWebmentions() []WebmentionIn {
+func (post *GenericPost) IncomingWebmentions() []WebmentionIn {
 	// return parsed webmentions
 	fileName := post.IncomingWebmentionsFile()
 	if !fileExists(fileName) {
@@ -257,7 +297,7 @@ func (post *Post) IncomingWebmentions() []WebmentionIn {
 	return webmentions
 }
 
-func (post *Post) OutgoingWebmentions() []WebmentionOut {
+func (post *GenericPost) OutgoingWebmentions() []WebmentionOut {
 	// return parsed webmentions
 	fileName := post.OutgoingWebmentionsFile()
 	if !fileExists(fileName) {
@@ -271,7 +311,7 @@ func (post *Post) OutgoingWebmentions() []WebmentionOut {
 }
 
 // PersistWebmentionOutgoing persists incoming webmention
-func (post *Post) PersistIncomingWebmention(webmention WebmentionIn) error {
+func (post *GenericPost) PersistIncomingWebmention(webmention WebmentionIn) error {
 	post.wmLock.Lock()
 	defer post.wmLock.Unlock()
 
@@ -300,7 +340,7 @@ func (post *Post) PersistIncomingWebmention(webmention WebmentionIn) error {
 }
 
 // PersistOutgoingWebmention persists a webmention to the webmention file.
-func (post *Post) PersistOutgoingWebmention(webmention *WebmentionOut) error {
+func (post *GenericPost) PersistOutgoingWebmention(webmention *WebmentionOut) error {
 	post.wmLock.Lock()
 	defer post.wmLock.Unlock()
 
@@ -328,7 +368,7 @@ func (post *Post) PersistOutgoingWebmention(webmention *WebmentionOut) error {
 	return nil
 }
 
-func (post *Post) AddIncomingWebmention(source string) error {
+func (post *GenericPost) AddIncomingWebmention(source string) error {
 	// Check if file already exists
 	wm := WebmentionIn{
 		Source: source,
@@ -340,7 +380,7 @@ func (post *Post) AddIncomingWebmention(source string) error {
 	return post.PersistIncomingWebmention(wm)
 }
 
-func (post *Post) EnrichWebmention(webmention WebmentionIn) error {
+func (post *GenericPost) EnrichWebmention(webmention WebmentionIn) error {
 	resp, err := post.user.repo.HttpClient.Get(webmention.Source)
 	if err == nil {
 		entry, err := post.user.repo.Parser.ParseHEntry(resp)
@@ -352,7 +392,7 @@ func (post *Post) EnrichWebmention(webmention WebmentionIn) error {
 	return err
 }
 
-func (post *Post) ApprovedIncomingWebmentions() []WebmentionIn {
+func (post *GenericPost) ApprovedIncomingWebmentions() []WebmentionIn {
 	webmentions := post.IncomingWebmentions()
 	approved := []WebmentionIn{}
 	for _, webmention := range webmentions {
@@ -370,7 +410,7 @@ func (post *Post) ApprovedIncomingWebmentions() []WebmentionIn {
 
 // ScanForLinks scans the post content for links and adds them to the
 // `status.yml` file for the post. The links are not scanned by this function.
-func (post *Post) ScanForLinks() error {
+func (post *GenericPost) ScanForLinks() error {
 	// this could be done in markdown parsing, but I don't want to
 	// rely on goldmark for this (yet)
 	postHtml := post.RenderedContent()
@@ -387,7 +427,7 @@ func (post *Post) ScanForLinks() error {
 	return nil
 }
 
-func (post *Post) SendWebmention(webmention WebmentionOut) error {
+func (post *GenericPost) SendWebmention(webmention WebmentionOut) error {
 	defer post.PersistOutgoingWebmention(&webmention)
 
 	// if last scan is less than 7 days ago, don't send webmention

post_test.go

@@ -14,49 +14,49 @@ import (
 
 func TestCanGetPostTitle(t *testing.T) {
 	user := getTestUser()
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	result := post.Title()
 	assertions.AssertEqual(t, result, "testpost")
 }
 
 func TestMediaDir(t *testing.T) {
 	user := getTestUser()
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	result := post.MediaDir()
 	assertions.AssertEqual(t, result, path.Join(post.Dir(), "media"))
 }
 
 func TestPostUrlPath(t *testing.T) {
 	user := getTestUser()
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	expected := "/user/" + user.Name() + "/posts/" + post.Id() + "/"
 	assertions.AssertEqual(t, post.UrlPath(), expected)
 }
 
 func TestPostFullUrl(t *testing.T) {
 	user := getTestUser()
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	expected := "http://localhost:8080/user/" + user.Name() + "/posts/" + post.Id() + "/"
 	assertions.AssertEqual(t, post.FullUrl(), expected)
 }
 
 func TestPostUrlMediaPath(t *testing.T) {
 	user := getTestUser()
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	expected := "/user/" + user.Name() + "/posts/" + post.Id() + "/media/data.png"
 	assertions.AssertEqual(t, post.UrlMediaPath("data.png"), expected)
 }
 
 func TestPostUrlMediaPathWithSubDir(t *testing.T) {
 	user := getTestUser()
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	expected := "/user/" + user.Name() + "/posts/" + post.Id() + "/media/foo/data.png"
 	assertions.AssertEqual(t, post.UrlMediaPath("foo/data.png"), expected)
 }
 
 func TestDraftInMetaData(t *testing.T) {
 	user := getTestUser()
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	content := "---\n"
 	content += "title: test\n"
 	content += "draft: true\n"
@@ -71,7 +71,7 @@ func TestDraftInMetaData(t *testing.T) {
 func TestNoRawHTMLIfDisallowedByRepo(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("testuser")
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	content := "---\n"
 	content += "title: test\n"
 	content += "draft: true\n"
@@ -86,7 +86,7 @@ func TestNoRawHTMLIfDisallowedByRepo(t *testing.T) {
 func TestRawHTMLIfAllowedByRepo(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{AllowRawHtml: true})
 	user, _ := repo.CreateUser("testuser")
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	content := "---\n"
 	content += "title: test\n"
 	content += "draft: true\n"
@@ -98,10 +98,10 @@ func TestRawHTMLIfAllowedByRepo(t *testing.T) {
 	assertions.AssertContains(t, html, "<script>")
 }
 
-func TestLoadMeta(t *testing.T) {
+func TestMeta(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{AllowRawHtml: true})
 	user, _ := repo.CreateUser("testuser")
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 
 	content := "---\n"
 	content += "title: test\n"
@@ -114,10 +114,6 @@ func TestLoadMeta(t *testing.T) {
 	content += "<script>alert('foo')</script>\n"
 	os.WriteFile(post.ContentFile(), []byte(content), 0644)
 
-	err := post.LoadMeta()
-
-	assertions.AssertNoError(t, err, "Error loading meta")
-
 	assertions.AssertEqual(t, post.Meta().Title, "test")
 	assertions.AssertLen(t, post.Meta().Aliases, 1)
 	assertions.AssertEqual(t, post.Meta().Draft, true)
@@ -132,7 +128,7 @@ func TestLoadMeta(t *testing.T) {
 func TestPersistIncomingWebmention(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("testuser")
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	webmention := owl.WebmentionIn{
 		Source: "http://example.com/source",
 	}
@@ -148,7 +144,7 @@ func TestAddIncomingWebmentionCreatesFile(t *testing.T) {
 	repo.HttpClient = &mocks.MockHttpClient{}
 	repo.Parser = &mocks.MockHtmlParser{}
 	user, _ := repo.CreateUser("testuser")
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 
 	err := post.AddIncomingWebmention("https://example.com")
 	assertions.AssertNoError(t, err, "Error adding webmention")
@@ -162,7 +158,7 @@ func TestAddIncomingWebmentionNotOverwritingWebmention(t *testing.T) {
 	repo.HttpClient = &mocks.MockHttpClient{}
 	repo.Parser = &mocks.MockHtmlParser{}
 	user, _ := repo.CreateUser("testuser")
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 
 	post.PersistIncomingWebmention(owl.WebmentionIn{
 		Source:         "https://example.com",
@@ -182,7 +178,7 @@ func TestEnrichAddsTitle(t *testing.T) {
 	repo.HttpClient = &mocks.MockHttpClient{}
 	repo.Parser = &mocks.MockHtmlParser{}
 	user, _ := repo.CreateUser("testuser")
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 
 	post.AddIncomingWebmention("https://example.com")
 	post.EnrichWebmention(owl.WebmentionIn{Source: "https://example.com"})
@@ -195,7 +191,7 @@ func TestEnrichAddsTitle(t *testing.T) {
 func TestApprovedIncomingWebmentions(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("testuser")
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	webmention := owl.WebmentionIn{
 		Source:         "http://example.com/source",
 		ApprovalStatus: "approved",
@@ -232,7 +228,7 @@ func TestApprovedIncomingWebmentions(t *testing.T) {
 func TestScanningForLinks(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("testuser")
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 
 	content := "---\n"
 	content += "title: test\n"
@@ -251,7 +247,7 @@ func TestScanningForLinks(t *testing.T) {
 func TestScanningForLinksDoesNotAddDuplicates(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("testuser")
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 
 	content := "---\n"
 	content += "title: test\n"
@@ -273,7 +269,7 @@ func TestScanningForLinksDoesNotAddDuplicates(t *testing.T) {
 func TestScanningForLinksDoesAddReplyUrl(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("testuser")
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 
 	content := "---\n"
 	content += "title: test\n"
@@ -296,7 +292,7 @@ func TestCanSendWebmention(t *testing.T) {
 	repo.HttpClient = &mocks.MockHttpClient{}
 	repo.Parser = &mocks.MockHtmlParser{}
 	user, _ := repo.CreateUser("testuser")
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 
 	webmention := owl.WebmentionOut{
 		Target: "http://example.com",
@@ -317,7 +313,7 @@ func TestSendWebmentionOnlyScansOncePerWeek(t *testing.T) {
 	repo.HttpClient = &mocks.MockHttpClient{}
 	repo.Parser = &mocks.MockHtmlParser{}
 	user, _ := repo.CreateUser("testuser")
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 
 	webmention := owl.WebmentionOut{
 		Target:    "http://example.com",
@@ -342,7 +338,7 @@ func TestSendingMultipleWebmentions(t *testing.T) {
 	repo.HttpClient = &mocks.MockHttpClient{}
 	repo.Parser = &mocks.MockHtmlParser{}
 	user, _ := repo.CreateUser("testuser")
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 
 	wg := sync.WaitGroup{}
 	wg.Add(20)
@@ -369,7 +365,7 @@ func TestReceivingMultipleWebmentions(t *testing.T) {
 	repo.HttpClient = &mocks.MockHttpClient{}
 	repo.Parser = &mocks.MockHtmlParser{}
 	user, _ := repo.CreateUser("testuser")
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 
 	wg := sync.WaitGroup{}
 	wg.Add(20)
@@ -394,7 +390,7 @@ func TestSendingAndReceivingMultipleWebmentions(t *testing.T) {
 	repo.HttpClient = &mocks.MockHttpClient{}
 	repo.Parser = &mocks.MockHtmlParser{}
 	user, _ := repo.CreateUser("testuser")
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 
 	wg := sync.WaitGroup{}
 	wg.Add(40)
@@ -433,7 +429,7 @@ func TestComplexParallelWebmentions(t *testing.T) {
 		},
 	}
 	user, _ := repo.CreateUser("testuser")
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 
 	wg := sync.WaitGroup{}
 	wg.Add(60)
@@ -468,7 +464,7 @@ func TestComplexParallelWebmentions(t *testing.T) {
 func TestPostWithoutContent(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser("testuser")
-	post, _ := user.CreateNewPostFull(owl.PostMeta{}, "")
+	post, _ := user.CreateNewPost(owl.PostMeta{}, "")
 
 	result := post.RenderedContent()
 	assertions.AssertEqual(t, result, "")
@@ -486,7 +482,7 @@ func TestPostWithoutContent(t *testing.T) {
 // 		},
 // 	}
 // 	user, _ := repo.CreateUser("testuser")
-// 	post, _ := user.CreateNewPost("testpost", false)
+// 	post, _ := user.CreateNewPostFull(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 
 // 	wg := sync.WaitGroup{}
 // 	wg.Add(40)

renderer.go

@@ -3,6 +3,7 @@ package owl
 import (
 	"bytes"
 	_ "embed"
+	"fmt"
 	"html/template"
 	"strings"
 )
@@ -17,7 +18,7 @@ type PageContent struct {
 
 type PostRenderData struct {
 	Title   string
-	Post    *Post
+	Post    Post
 	Content template.HTML
 }
 
@@ -118,23 +119,26 @@ func renderIntoBaseTemplate(user User, data PageContent) (string, error) {
 	return html.String(), err
 }
 
-func renderPostContent(post *Post) (string, error) {
+func renderPostContent(post Post) (string, error) {
 	buf := post.RenderedContent()
-	postHtml, err := renderEmbedTemplate("embed/post.html", PostRenderData{
-		Title:   post.Title(),
-		Post:    post,
-		Content: template.HTML(buf),
-	})
+	postHtml, err := renderEmbedTemplate(
+		fmt.Sprintf("embed/%s/detail.html", post.TemplateDir()),
+		PostRenderData{
+			Title:   post.Title(),
+			Post:    post,
+			Content: template.HTML(buf),
+		},
+	)
 	return postHtml, err
 }
 
-func RenderPost(post *Post) (string, error) {
+func RenderPost(post Post) (string, error) {
 	postHtml, err := renderPostContent(post)
 	if err != nil {
 		return "", err
 	}
 
-	return renderIntoBaseTemplate(*post.user, PageContent{
+	return renderIntoBaseTemplate(*post.User(), PageContent{
 		Title:       post.Title(),
 		Description: post.Meta().Description,
 		Content:     template.HTML(postHtml),

renderer_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestCanRenderPost(t *testing.T) {
 	user := getTestUser()
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	result, err := owl.RenderPost(post)
 
 	assertions.AssertNoError(t, err, "Error rendering post")
@@ -28,7 +28,7 @@ func TestRenderOneMe(t *testing.T) {
 	})
 
 	user.SetConfig(config)
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	result, err := owl.RenderPost(post)
 
 	assertions.AssertNoError(t, err, "Error rendering post")
@@ -49,7 +49,7 @@ func TestRenderTwoMe(t *testing.T) {
 	})
 
 	user.SetConfig(config)
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	result, err := owl.RenderPost(post)
 
 	assertions.AssertNoError(t, err, "Error rendering post")
@@ -60,7 +60,7 @@ func TestRenderTwoMe(t *testing.T) {
 
 func TestRenderPostHEntry(t *testing.T) {
 	user := getTestUser()
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	result, _ := owl.RenderPost(post)
 	assertions.AssertContains(t, result, "class=\"h-entry\"")
 	assertions.AssertContains(t, result, "class=\"p-name\"")
@@ -70,7 +70,7 @@ func TestRenderPostHEntry(t *testing.T) {
 
 func TestRendererUsesBaseTemplate(t *testing.T) {
 	user := getTestUser()
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	result, err := owl.RenderPost(post)
 
 	assertions.AssertNoError(t, err, "Error rendering post")
@@ -79,8 +79,8 @@ func TestRendererUsesBaseTemplate(t *testing.T) {
 
 func TestCanRenderPostList(t *testing.T) {
 	user := getTestUser()
-	user.CreateNewPost("testpost1", false)
-	user.CreateNewPost("testpost2", false)
+	user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost1"}, "")
+	user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost2"}, "")
 	result, err := owl.RenderPostList(user, &owl.PostList{
 		Id:    "testlist",
 		Title: "Test List",
@@ -95,8 +95,8 @@ func TestCanRenderPostList(t *testing.T) {
 
 func TestCanRenderPostListNotIncludeOther(t *testing.T) {
 	user := getTestUser()
-	user.CreateNewPostFull(owl.PostMeta{Title: "testpost1", Type: "article"}, "testpost1")
-	user.CreateNewPostFull(owl.PostMeta{Title: "testpost2", Type: "note"}, "testpost2")
+	user.CreateNewPost(owl.PostMeta{Title: "testpost1", Type: "article"}, "testpost1")
+	user.CreateNewPost(owl.PostMeta{Title: "testpost2", Type: "note"}, "testpost2")
 	result, _ := owl.RenderPostList(user, &owl.PostList{
 		Id:    "testlist",
 		Title: "Test List",
@@ -110,9 +110,9 @@ func TestCanRenderPostListNotIncludeOther(t *testing.T) {
 
 func TestCanRenderPostListNotIncludeMultiple(t *testing.T) {
 	user := getTestUser()
-	user.CreateNewPostFull(owl.PostMeta{Title: "testpost1", Type: "article"}, "testpost1")
-	user.CreateNewPostFull(owl.PostMeta{Title: "testpost2", Type: "note"}, "testpost2")
-	user.CreateNewPostFull(owl.PostMeta{Title: "testpost3", Type: "recipe"}, "testpost3")
+	user.CreateNewPost(owl.PostMeta{Title: "testpost1", Type: "article"}, "testpost1")
+	user.CreateNewPost(owl.PostMeta{Title: "testpost2", Type: "note"}, "testpost2")
+	user.CreateNewPost(owl.PostMeta{Title: "testpost3", Type: "recipe"}, "testpost3")
 	result, _ := owl.RenderPostList(user, &owl.PostList{
 		Id:    "testlist",
 		Title: "Test List",
@@ -127,8 +127,8 @@ func TestCanRenderPostListNotIncludeMultiple(t *testing.T) {
 
 func TestCanRenderIndexPage(t *testing.T) {
 	user := getTestUser()
-	user.CreateNewPost("testpost1", false)
-	user.CreateNewPost("testpost2", false)
+	user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost1"}, "")
+	user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost2"}, "")
 	result, _ := owl.RenderIndexPage(user)
 	assertions.AssertContains(t, result, "testpost1")
 	assertions.AssertContains(t, result, "testpost2")
@@ -136,14 +136,14 @@ func TestCanRenderIndexPage(t *testing.T) {
 
 func TestCanRenderIndexPageNoTitle(t *testing.T) {
 	user := getTestUser()
-	post, _ := user.CreateNewPostFull(owl.PostMeta{}, "hi")
+	post, _ := user.CreateNewPost(owl.PostMeta{}, "hi")
 	result, _ := owl.RenderIndexPage(user)
 	assertions.AssertContains(t, result, post.Id())
 }
 
 func TestRenderNoteAsFullContent(t *testing.T) {
 	user := getTestUser()
-	user.CreateNewPostFull(owl.PostMeta{Type: "note"}, "This is a note")
+	user.CreateNewPost(owl.PostMeta{Type: "note"}, "This is a note")
 	result, _ := owl.RenderPostList(user, &owl.PostList{
 		Include: []string{"note"},
 	})
@@ -153,7 +153,7 @@ func TestRenderNoteAsFullContent(t *testing.T) {
 
 func TestIndexPageContainsHFeedContainer(t *testing.T) {
 	user := getTestUser()
-	user.CreateNewPost("testpost1", false)
+	user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost1"}, "")
 
 	result, _ := owl.RenderIndexPage(user)
 	assertions.AssertContains(t, result, "<div class=\"h-feed\">")
@@ -161,7 +161,7 @@ func TestIndexPageContainsHFeedContainer(t *testing.T) {
 
 func TestIndexPageContainsHEntryAndUUrl(t *testing.T) {
 	user := getTestUser()
-	user.CreateNewPost("testpost1", false)
+	user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost1"}, "")
 
 	result, _ := owl.RenderIndexPage(user)
 	assertions.AssertContains(t, result, "class=\"h-entry\"")
@@ -171,7 +171,7 @@ func TestIndexPageContainsHEntryAndUUrl(t *testing.T) {
 
 func TestIndexPageDoesNotContainsArticle(t *testing.T) {
 	user := getTestUser()
-	user.CreateNewPostFull(owl.PostMeta{Type: "article"}, "hi")
+	user.CreateNewPost(owl.PostMeta{Type: "article"}, "hi")
 
 	result, _ := owl.RenderIndexPage(user)
 	assertions.AssertContains(t, result, "class=\"h-entry\"")
@@ -180,7 +180,7 @@ func TestIndexPageDoesNotContainsArticle(t *testing.T) {
 
 func TestIndexPageDoesNotContainsReply(t *testing.T) {
 	user := getTestUser()
-	user.CreateNewPostFull(owl.PostMeta{Type: "reply", Reply: owl.Reply{Url: "https://example.com/post"}}, "hi")
+	user.CreateNewPost(owl.PostMeta{Type: "reply", Reply: owl.ReplyData{Url: "https://example.com/post"}}, "hi")
 
 	result, _ := owl.RenderIndexPage(user)
 	assertions.AssertContains(t, result, "class=\"h-entry\"")
@@ -189,8 +189,8 @@ func TestIndexPageDoesNotContainsReply(t *testing.T) {
 
 func TestRenderIndexPageWithBrokenBaseTemplate(t *testing.T) {
 	user := getTestUser()
-	user.CreateNewPost("testpost1", false)
-	user.CreateNewPost("testpost2", false)
+	user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost1"}, "")
+	user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost2"}, "")
 
 	os.WriteFile(path.Join(user.Dir(), "meta/base.html"), []byte("{{content}}"), 0644)
 
@@ -216,7 +216,7 @@ func TestRendersHeaderTitle(t *testing.T) {
 		SubTitle:    "Test SubTitle",
 		HeaderColor: "#ff1337",
 	})
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 
 	result, _ := owl.RenderPost(post)
 	assertions.AssertContains(t, result, "Test Title")
@@ -226,7 +226,7 @@ func TestRendersHeaderTitle(t *testing.T) {
 
 func TestRenderPostIncludesRelToWebMention(t *testing.T) {
 	user := getTestUser()
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 
 	result, _ := owl.RenderPost(post)
 	assertions.AssertContains(t, result, "rel=\"webmention\"")
@@ -236,7 +236,7 @@ func TestRenderPostIncludesRelToWebMention(t *testing.T) {
 
 func TestRenderPostAddsLinksToApprovedWebmention(t *testing.T) {
 	user := getTestUser()
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	webmention := owl.WebmentionIn{
 		Source:         "http://example.com/source3",
 		Title:          "Test Title",
@@ -260,7 +260,7 @@ func TestRenderPostAddsLinksToApprovedWebmention(t *testing.T) {
 
 func TestRenderPostNotMentioningWebmentionsIfNoAvail(t *testing.T) {
 	user := getTestUser()
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	result, _ := owl.RenderPost(post)
 
 	assertions.AssertNotContains(t, result, "Webmention")
@@ -269,7 +269,7 @@ func TestRenderPostNotMentioningWebmentionsIfNoAvail(t *testing.T) {
 
 func TestRenderIncludesFullUrl(t *testing.T) {
 	user := getTestUser()
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	result, _ := owl.RenderPost(post)
 
 	assertions.AssertContains(t, result, "class=\"u-url\"")
@@ -292,7 +292,7 @@ func TestAuthorNameInPost(t *testing.T) {
 		HeaderColor: "#ff1337",
 		AuthorName:  "Test Author",
 	})
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 
 	result, _ := owl.RenderPost(post)
 	assertions.AssertContains(t, result, "Test Author")
@@ -301,17 +301,12 @@ func TestAuthorNameInPost(t *testing.T) {
 func TestRenderReplyWithoutText(t *testing.T) {
 
 	user := getTestUser()
-	post, _ := user.CreateNewPost("testpost", false)
-
-	content := "---\n"
-	content += "title: test\n"
-	content += "date: Wed, 17 Aug 2022 10:50:02 +0000\n"
-	content += "reply: \n"
-	content += "  url: https://example.com/post\n"
-	content += "---\n"
-	content += "\n"
-	content += "Hi \n"
-	os.WriteFile(post.ContentFile(), []byte(content), 0644)
+	post, _ := user.CreateNewPost(owl.PostMeta{
+		Type: "reply",
+		Reply: owl.ReplyData{
+			Url: "https://example.com/post",
+		},
+	}, "Hi ")
 
 	result, _ := owl.RenderPost(post)
 	assertions.AssertContains(t, result, "https://example.com/post")
@@ -320,17 +315,13 @@ func TestRenderReplyWithoutText(t *testing.T) {
 func TestRenderReplyWithText(t *testing.T) {
 
 	user := getTestUser()
-	post, _ := user.CreateNewPost("testpost", false)
-
-	content := "---\n"
-	content += "title: test\n"
-	content += "date: Wed, 17 Aug 2022 10:50:02 +0000\n"
-	content += "reply: \n"
-	content += "  url: https://example.com/post\n"
-	content += "  text: \"This is a reply\"\n"
-	content += "---\n"
-	content += "Hi \n"
-	os.WriteFile(post.ContentFile(), []byte(content), 0644)
+	post, _ := user.CreateNewPost(owl.PostMeta{
+		Type: "reply",
+		Reply: owl.ReplyData{
+			Url:  "https://example.com/post",
+			Text: "This is a reply",
+		},
+	}, "Hi ")
 
 	result, _ := owl.RenderPost(post)
 	assertions.AssertContains(t, result, "https://example.com/post")
@@ -340,7 +331,7 @@ func TestRenderReplyWithText(t *testing.T) {
 
 func TestRengerPostContainsBookmark(t *testing.T) {
 	user := getTestUser()
-	post, _ := user.CreateNewPostFull(owl.PostMeta{Type: "bookmark", Bookmark: owl.Bookmark{Url: "https://example.com/post"}}, "hi")
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "bookmark", Bookmark: owl.BookmarkData{Url: "https://example.com/post"}}, "hi")
 
 	result, _ := owl.RenderPost(post)
 	assertions.AssertContains(t, result, "https://example.com/post")
@@ -348,7 +339,7 @@ func TestRengerPostContainsBookmark(t *testing.T) {
 
 func TestOpenGraphTags(t *testing.T) {
 	user := getTestUser()
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 
 	content := "---\n"
 	content += "title: The Rock\n"
@@ -439,7 +430,7 @@ func TestRenderHeaderMenuUrlItem(t *testing.T) {
 
 func TestRenderHeaderMenuPost(t *testing.T) {
 	user := getTestUser()
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	user.AddHeaderMenuItem(owl.MenuItem{
 		Title: "Test Entry",
 		Post:  post.Id(),
@@ -473,7 +464,7 @@ func TestRenderFooterMenuUrlItem(t *testing.T) {
 
 func TestRenderFooterMenuPost(t *testing.T) {
 	user := getTestUser()
-	post, _ := user.CreateNewPostFull(owl.PostMeta{
+	post, _ := user.CreateNewPost(owl.PostMeta{
 		Type: "private",
 	}, "")
 	result, _ := owl.RenderIndexPage(user)

repository.go

@@ -158,12 +158,12 @@ func (repo Repository) GetUser(name string) (User, error) {
 	return user, nil
 }
 
-func (repo Repository) PostAliases() (map[string]*Post, error) {
+func (repo Repository) PostAliases() (map[string]Post, error) {
 	users, err := repo.Users()
 	if err != nil {
 		return nil, err
 	}
-	aliases := make(map[string]*Post)
+	aliases := make(map[string]Post)
 	for _, user := range users {
 		user_aliases, err := user.PostAliases()
 		if err != nil {

repository_test.go

@@ -199,7 +199,7 @@ func TestSingleUserRepoUserUrlPathIsSimple(t *testing.T) {
 func TestCanGetMapWithAllPostAliases(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser(randomUserName())
-	post, _ := user.CreateNewPost("test-1", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Title: "test-1"}, "")
 
 	content := "---\n"
 	content += "title: Test\n"
@@ -213,7 +213,7 @@ func TestCanGetMapWithAllPostAliases(t *testing.T) {
 	posts, _ := user.PublishedPosts()
 	assertions.AssertLen(t, posts, 1)
 
-	var aliases map[string]*owl.Post
+	var aliases map[string]owl.Post
 	aliases, err := repo.PostAliases()
 	assertions.AssertNoError(t, err, "Error getting post aliases: ")
 	assertions.AssertMapLen(t, aliases, 2)
@@ -225,8 +225,8 @@ func TestCanGetMapWithAllPostAliases(t *testing.T) {
 func TestAliasesHaveCorrectPost(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser(randomUserName())
-	post1, _ := user.CreateNewPost("test-1", false)
-	post2, _ := user.CreateNewPost("test-2", false)
+	post1, _ := user.CreateNewPost(owl.PostMeta{Title: "test-1"}, "")
+	post2, _ := user.CreateNewPost(owl.PostMeta{Title: "test-2"}, "")
 
 	content := "---\n"
 	content += "title: Test\n"
@@ -247,7 +247,7 @@ func TestAliasesHaveCorrectPost(t *testing.T) {
 	posts, _ := user.PublishedPosts()
 	assertions.AssertLen(t, posts, 2)
 
-	var aliases map[string]*owl.Post
+	var aliases map[string]owl.Post
 	aliases, err := repo.PostAliases()
 	assertions.AssertNoError(t, err, "Error getting post aliases: ")
 	assertions.AssertMapLen(t, aliases, 2)

rss_test.go

@@ -35,7 +35,7 @@ func TestRenderRSSFeedUserData(t *testing.T) {
 
 func TestRenderRSSFeedPostData(t *testing.T) {
 	user := getTestUser()
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Title: "testpost"}, "")
 
 	content := "---\n"
 	content += "title: Test Post\n"
@@ -53,7 +53,7 @@ func TestRenderRSSFeedPostData(t *testing.T) {
 
 func TestRenderRSSFeedPostDataWithoutDate(t *testing.T) {
 	user := getTestUser()
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Title: "testpost"}, "")
 
 	content := "---\n"
 	content += "title: Test Post\n"

user.go

@@ -197,9 +197,9 @@ func (user User) FaviconUrl() string {
 	return ""
 }
 
-func (user User) AllPosts() ([]*Post, error) {
+func (user User) AllPosts() ([]Post, error) {
 	postFiles := listDir(path.Join(user.Dir(), "public"))
-	posts := make([]*Post, 0)
+	posts := make([]Post, 0)
 	for _, id := range postFiles {
 		// if is a directory and has index.md, add to posts
 		if dirExists(path.Join(user.Dir(), "public", id)) {
@@ -211,7 +211,7 @@ func (user User) AllPosts() ([]*Post, error) {
 	}
 
 	type PostWithDate struct {
-		post *Post
+		post Post
 		date time.Time
 	}
 
@@ -233,7 +233,7 @@ func (user User) AllPosts() ([]*Post, error) {
 	return posts, nil
 }
 
-func (user User) PublishedPosts() ([]*Post, error) {
+func (user User) PublishedPosts() ([]Post, error) {
 	posts, _ := user.AllPosts()
 
 	// remove drafts
@@ -249,7 +249,7 @@ func (user User) PublishedPosts() ([]*Post, error) {
 	return posts, nil
 }
 
-func (user User) PrimaryFeedPosts() ([]*Post, error) {
+func (user User) PrimaryFeedPosts() ([]Post, error) {
 	config := user.Config()
 	include := config.PrimaryListInclude
 	if len(include) == 0 {
@@ -262,7 +262,7 @@ func (user User) PrimaryFeedPosts() ([]*Post, error) {
 	})
 }
 
-func (user User) GetPostsOfList(list PostList) ([]*Post, error) {
+func (user User) GetPostsOfList(list PostList) ([]Post, error) {
 	posts, _ := user.PublishedPosts()
 
 	// remove posts not included
@@ -278,17 +278,17 @@ func (user User) GetPostsOfList(list PostList) ([]*Post, error) {
 	return posts, nil
 }
 
-func (user User) GetPost(id string) (*Post, error) {
+func (user User) GetPost(id string) (Post, error) {
 	// check if posts index.md exists
 	if !fileExists(path.Join(user.Dir(), "public", id, "index.md")) {
-		return &Post{}, fmt.Errorf("post %s does not exist", id)
+		return &GenericPost{}, fmt.Errorf("post %s does not exist", id)
 	}
 
-	post := Post{user: &user, id: id}
+	post := GenericPost{user: &user, id: id}
 	return &post, nil
 }
 
-func (user User) CreateNewPostFull(meta PostMeta, content string) (*Post, error) {
+func (user User) CreateNewPost(meta PostMeta, content string) (Post, error) {
 	slugHint := meta.Title
 	if slugHint == "" {
 		slugHint = "note"
@@ -307,14 +307,19 @@ func (user User) CreateNewPostFull(meta PostMeta, content string) (*Post, error)
 			break
 		}
 	}
-	post := Post{user: &user, id: folder_name}
+	post := GenericPost{user: &user, id: folder_name}
+
+	// if date is not set, set it to now
+	if meta.Date.IsZero() {
+		meta.Date = time.Now()
+	}
 
 	initial_content := ""
 	initial_content += "---\n"
 	// write meta
-	meta_bytes, err := yaml.Marshal(meta)
+	meta_bytes, err := yaml.Marshal(meta) // TODO: this should be down by the Post
 	if err != nil {
-		return &Post{}, err
+		return &GenericPost{}, err
 	}
 	initial_content += string(meta_bytes)
 	initial_content += "---\n"
@@ -326,17 +331,7 @@ func (user User) CreateNewPostFull(meta PostMeta, content string) (*Post, error)
 	os.WriteFile(post.ContentFile(), []byte(initial_content), 0644)
 	// create media dir
 	os.Mkdir(post.MediaDir(), 0755)
-	return &post, nil
-}
-
-func (user User) CreateNewPost(title string, draft bool) (*Post, error) {
-	meta := PostMeta{
-		Title:   title,
-		Date:    time.Now(),
-		Aliases: []string{},
-		Draft:   draft,
-	}
-	return user.CreateNewPostFull(meta, title)
+	return user.GetPost(post.Id())
 }
 
 func (user User) Template() (string, error) {
@@ -359,8 +354,8 @@ func (user User) SetConfig(new_config UserConfig) error {
 	return saveToYaml(user.ConfigFile(), new_config)
 }
 
-func (user User) PostAliases() (map[string]*Post, error) {
-	post_aliases := make(map[string]*Post)
+func (user User) PostAliases() (map[string]Post, error) {
+	post_aliases := make(map[string]Post)
 	posts, err := user.PublishedPosts()
 	if err != nil {
 		return post_aliases, err

user_test.go

@@ -14,7 +14,7 @@ func TestCreateNewPostCreatesEntryInPublic(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser(randomUserName())
 	// Create a new post
-	user.CreateNewPost("testpost", false)
+	user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	files, err := os.ReadDir(path.Join(user.Dir(), "public"))
 	assertions.AssertNoError(t, err, "Error reading directory")
 	assertions.AssertLen(t, files, 1)
@@ -25,7 +25,7 @@ func TestCreateNewPostCreatesMediaDir(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser(randomUserName())
 	// Create a new post
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	_, err := os.Stat(post.MediaDir())
 	assertions.AssertNot(t, os.IsNotExist(err), "Media directory not created")
 }
@@ -33,7 +33,7 @@ func TestCreateNewPostCreatesMediaDir(t *testing.T) {
 func TestCreateNewPostAddsDateToMetaBlock(t *testing.T) {
 	user := getTestUser()
 	// Create a new post
-	user.CreateNewPost("testpost", false)
+	user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	posts, _ := user.PublishedPosts()
 	post, _ := user.GetPost(posts[0].Id())
 	meta := post.Meta()
@@ -45,9 +45,9 @@ func TestCreateNewPostMultipleCalls(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser(randomUserName())
 	// Create a new post
-	user.CreateNewPost("testpost", false)
-	user.CreateNewPost("testpost", false)
-	user.CreateNewPost("testpost", false)
+	user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
+	user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
+	user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	files, err := os.ReadDir(path.Join(user.Dir(), "public"))
 	assertions.AssertNoError(t, err, "Error reading directory")
 	assertions.AssertEqual(t, len(files), 3)
@@ -58,9 +58,9 @@ func TestCanListUserPosts(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser(randomUserName())
 	// Create a new post
-	user.CreateNewPost("testpost", false)
-	user.CreateNewPost("testpost", false)
-	user.CreateNewPost("testpost", false)
+	user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
+	user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
+	user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	posts, err := user.PublishedPosts()
 	assertions.AssertNoError(t, err, "Error reading posts")
 	assertions.AssertLen(t, posts, 3)
@@ -71,7 +71,7 @@ func TestCannotListUserPostsInSubdirectories(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser(randomUserName())
 	// Create a new post
-	user.CreateNewPost("testpost", false)
+	user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	os.Mkdir(path.Join(user.PostDir(), "foo"), 0755)
 	os.Mkdir(path.Join(user.PostDir(), "foo/bar"), 0755)
 	content := ""
@@ -108,7 +108,7 @@ func TestCannotListUserPostsWithoutIndexMd(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser(randomUserName())
 	// Create a new post
-	user.CreateNewPost("testpost", false)
+	user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	os.Mkdir(path.Join(user.PostDir(), "foo"), 0755)
 	os.Mkdir(path.Join(user.PostDir(), "foo/bar"), 0755)
 	content := ""
@@ -137,7 +137,7 @@ func TestListUserPostsDoesNotIncludeDrafts(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser(randomUserName())
 	// Create a new post
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	content := ""
 	content += "---\n"
 	content += "title: test\n"
@@ -156,7 +156,7 @@ func TestListUsersDraftsExcludedRealWorld(t *testing.T) {
 	repo := getTestRepo(owl.RepoConfig{})
 	user, _ := repo.CreateUser(randomUserName())
 	// Create a new post
-	post, _ := user.CreateNewPost("testpost", false)
+	post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 	content := ""
 	content += "---\n"
 	content += "title: Articles September 2019\n"
@@ -180,7 +180,7 @@ func TestListUsersDraftsExcludedRealWorld(t *testing.T) {
 func TestCanLoadPost(t *testing.T) {
 	user := getTestUser()
 	// Create a new post
-	user.CreateNewPost("testpost", false)
+	user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 
 	posts, _ := user.PublishedPosts()
 	post, _ := user.GetPost(posts[0].Id())
@@ -200,8 +200,8 @@ func TestUserFullUrl(t *testing.T) {
 func TestPostsSortedByPublishingDateLatestFirst(t *testing.T) {
 	user := getTestUser()
 	// Create a new post
-	post1, _ := user.CreateNewPost("testpost", false)
-	post2, _ := user.CreateNewPost("testpost2", false)
+	post1, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
+	post2, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost2"}, "")
 
 	content := "---\n"
 	content += "title: Test Post\n"
@@ -225,9 +225,9 @@ func TestPostsSortedByPublishingDateLatestFirst(t *testing.T) {
 func TestPostsSortedByPublishingDateLatestFirst2(t *testing.T) {
 	user := getTestUser()
 	// Create a new post
-	posts := []*owl.Post{}
+	posts := []owl.Post{}
 	for i := 59; i >= 0; i-- {
-		post, _ := user.CreateNewPost("testpost", false)
+		post, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
 		content := "---\n"
 		content += "title: Test Post\n"
 		content += fmt.Sprintf("date: Wed, 17 Aug 2022 10:%02d:02 +0000\n", i)
@@ -246,8 +246,8 @@ func TestPostsSortedByPublishingDateLatestFirst2(t *testing.T) {
 func TestPostsSortedByPublishingDateBrokenAtBottom(t *testing.T) {
 	user := getTestUser()
 	// Create a new post
-	post1, _ := user.CreateNewPost("testpost", false)
-	post2, _ := user.CreateNewPost("testpost2", false)
+	post1, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost"}, "")
+	post2, _ := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost2"}, "")
 
 	content := "---\n"
 	content += "title: Test Post\n"
@@ -281,7 +281,7 @@ func TestAvatarSetIfFileExist(t *testing.T) {
 
 func TestPostNameIllegalFileName(t *testing.T) {
 	user := getTestUser()
-	_, err := user.CreateNewPost("testpost?///", false)
+	_, err := user.CreateNewPost(owl.PostMeta{Type: "article", Title: "testpost?///"}, "")
 	assertions.AssertNoError(t, err, "Should not have failed")
 }