From 4cc69ff2572cb1b764adbab832ec0b0ae88cf06a Mon Sep 17 00:00:00 2001
From: Niko Abeler <niko@rerere.org>
Date: Fri, 7 Oct 2022 19:51:13 +0200
Subject: [PATCH] added author name. Resolves #21

---
 embed/initial/base.html | 18 +++++++++---------
 embed/post.html         |  4 ++++
 post.go                 |  4 ++++
 renderer.go             |  9 +++------
 renderer_test.go        | 16 ++++++++++++++++
 user.go                 |  1 +
 6 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/embed/initial/base.html b/embed/initial/base.html
index 261cdfd..f61a0be 100644
--- a/embed/initial/base.html
+++ b/embed/initial/base.html
@@ -5,12 +5,12 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>{{ .Title }} - {{ .UserConfig.Title }}</title>
+    <title>{{ .Title }} - {{ .User.Config.Title }}</title>
     <link rel="stylesheet" href="/static/pico.min.css">
     <link rel="webmention" href="{{ .User.WebmentionUrl }}">
     <style>
         header {
-            background-color: {{.UserConfig.HeaderColor}};
+            background-color: {{.User.Config.HeaderColor}};
         }
 
         footer {
@@ -47,21 +47,21 @@
     <header>
         <div class="container header h-card">
             <hgroup class="header-title">
-                <h2><a class="p-name u-url" href="{{ .User.UrlPath }}">{{ .UserConfig.Title }}</a></h2>
-                <h3 class="p-note">{{ .UserConfig.SubTitle }}</h3>
+                <h2><a class="p-name u-url" href="{{ .User.UrlPath }}">{{ .User.Config.Title }}</a></h2>
+                <h3 class="p-note">{{ .User.Config.SubTitle }}</h3>
             </hgroup>
 
             <div class="header-profile">
                 {{ if .User.AvatarUrl }}
-                    <img class="u-logo avatar" src="{{ .User.AvatarUrl }}" alt="{{ .UserConfig.Title }}" width="100" height="100" />
+                    <img class="u-logo avatar" src="{{ .User.AvatarUrl }}" alt="{{ .User.Config.Title }}" width="100" height="100" />
                 {{ end }}
                 <div style="float: right; list-style: none;">
-                    {{ if .UserConfig.TwitterHandle}}
-                    <li><a href="https://twitter.com/{{.UserConfig.TwitterHandle}}" rel="me">@{{.UserConfig.TwitterHandle}} on Twitter</a>
+                    {{ if .User.Config.TwitterHandle}}
+                    <li><a href="https://twitter.com/{{.User.Config.TwitterHandle}}" rel="me">@{{.User.Config.TwitterHandle}} on Twitter</a>
                     </li>
                     {{ end }}
-                    {{ if .UserConfig.GitHubHandle}}
-                    <li><a href="https://github.com/{{.UserConfig.GitHubHandle}}" rel="me">@{{.UserConfig.GitHubHandle}} on GitHub</a>
+                    {{ if .User.Config.GitHubHandle}}
+                    <li><a href="https://github.com/{{.User.Config.GitHubHandle}}" rel="me">@{{.User.Config.GitHubHandle}} on GitHub</a>
                     </li>
                     {{ end }}
                 </div>
diff --git a/embed/post.html b/embed/post.html
index 8e0e5fe..b87c1a1 100644
--- a/embed/post.html
+++ b/embed/post.html
@@ -6,6 +6,10 @@
             <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}}">{{.Post.User.Config.AuthorName}}</a>
+            {{ end }}
             <a class="u-url" href="{{.Post.FullUrl}}">#</a>
         </small> 
     </hgroup>
diff --git a/post.go b/post.go
index 2b4a651..f731be1 100644
--- a/post.go
+++ b/post.go
@@ -99,6 +99,10 @@ func (post *Post) Id() string {
 	return post.id
 }
 
+func (post *Post) User() *User {
+	return post.user
+}
+
 func (post *Post) Dir() string {
 	return path.Join(post.user.Dir(), "public", post.id)
 }
diff --git a/renderer.go b/renderer.go
index 7781ce3..9d4ef59 100644
--- a/renderer.go
+++ b/renderer.go
@@ -45,19 +45,16 @@ func renderIntoBaseTemplate(user User, data PageContent) (string, error) {
 		return "", err
 	}
 
-	user_config, _ := user.Config()
 	full_data := struct {
 		Title        string
 		Content      template.HTML
 		User         User
-		UserConfig   UserConfig
 		UserSubtitle string
 		HeaderColor  string
 	}{
-		Title:      data.Title,
-		Content:    data.Content,
-		User:       user,
-		UserConfig: user_config,
+		Title:   data.Title,
+		Content: data.Content,
+		User:    user,
 	}
 
 	var html bytes.Buffer
diff --git a/renderer_test.go b/renderer_test.go
index 892bfa9..d98f6a1 100644
--- a/renderer_test.go
+++ b/renderer_test.go
@@ -261,3 +261,19 @@ func TestAddAvatarIfExist(t *testing.T) {
 		t.Error("Avatar not rendered. Got: " + result)
 	}
 }
+
+func TestAuthorNameInPost(t *testing.T) {
+	user := getTestUser()
+	user.SetConfig(owl.UserConfig{
+		Title:       "Test Title",
+		SubTitle:    "Test SubTitle",
+		HeaderColor: "#ff1337",
+		AuthorName:  "Test Author",
+	})
+	post, _ := user.CreateNewPost("testpost")
+
+	result, _ := owl.RenderPost(&post)
+	if !strings.Contains(result, "Test Author") {
+		t.Error("Author Name not included. Got: " + result)
+	}
+}
diff --git a/user.go b/user.go
index 8bb5ce7..39497a8 100644
--- a/user.go
+++ b/user.go
@@ -23,6 +23,7 @@ type UserConfig struct {
 	HeaderColor   string `yaml:"header_color"`
 	TwitterHandle string `yaml:"twitter_handle"`
 	GitHubHandle  string `yaml:"github_handle"`
+	AuthorName    string `yaml:"author_name"`
 }
 
 func (user User) Dir() string {