add optional author field

reddec · Jun 8, 2023 · a62749c · a62749c
1 parent cc88ceb
commit a62749c
Show file tree

Hide file tree

Showing 9 changed files with 227 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ Differences in docker version
 
 Create note
 
-    curl -v -F title=hello -F text=world -F attachment=@somefile.pdf http://127.0.0.1:8080/notes?token=deadbeaf
+    curl -v -F author=reddec -F title=hello -F text=world -F attachment=@somefile.pdf http://127.0.0.1:8080/notes?token=deadbeaf
 
 
 ## Sample note

diff --git a/api/client/oas_request_encoders_gen.go b/api/client/oas_request_encoders_gen.go
diff --git a/api/client/oas_schemas_gen.go b/api/client/oas_schemas_gen.go
diff --git a/internal/render/render.go b/internal/render/render.go
@@ -50,13 +50,14 @@ type Renderer struct {
 	engine goldmark.Markdown
 }
 
-func (r *Renderer) Render(title, content string, attachments []string) ([]byte, error) {
+func (r *Renderer) Render(title, content string, author string, attachments []string) ([]byte, error) {
 	var out bytes.Buffer
 	if err := r.engine.Convert([]byte(content), &out); err != nil {
 		return nil, fmt.Errorf("render: %w", err)
 	}
 	vd := &viewData{
 		Title:       title,
+		Author:      author,
 		Style:       template.CSS(style),
 		HTML:        template.HTML(out.String()),
 		Attachments: attachments,
@@ -71,6 +72,7 @@ func (r *Renderer) Render(title, content string, attachments []string) ([]byte,
 
 type viewData struct {
 	Title       string
+	Author      string
 	Attachments []string
 	Style       template.CSS
 	HTML        template.HTML

diff --git a/internal/render/template.gohtml b/internal/render/template.gohtml
@@ -23,7 +23,12 @@
         </article>
     {{- end}}
     <footer>
-        <p>{{now.UTC.Format "02 Jan 2006 15:04:05"}} UTC</p>
+        <p>
+            {{now.UTC.Format "02 Jan 2006 15:04:05"}} UTC
+            {{- with .Author}}
+                &copy; {{.}}
+            {{- end}}
+        </p>
     </footer>
 </main>
 </body>

diff --git a/internal/server/api/oas_request_decoders_gen.go b/internal/server/api/oas_request_decoders_gen.go
diff --git a/internal/server/api/oas_schemas_gen.go b/internal/server/api/oas_schemas_gen.go
diff --git a/internal/server/impl/handler.go b/internal/server/impl/handler.go
@@ -39,7 +39,7 @@ func (srv *Server) storeNote(ctx context.Context, req *api.DraftMultipart, id st
 			attachments = append(attachments, name.Name)
 		}
 	}
-	html, err := srv.Renderer.Render(req.Title, req.Text, attachments)
+	html, err := srv.Renderer.Render(req.Title, req.Text, req.Author.Value, attachments)
 	if err != nil {
 		return fmt.Errorf("render HTML: %w", err)
 	}

diff --git a/openapi.yaml b/openapi.yaml
@@ -94,6 +94,10 @@ components:
           type: string
           description: Note body
           example: This is long text
+        author:
+          type: string
+          description: Optional (and not verifiable) author of note
+          example: RedDec
         hide_attachments:
           type: boolean
           default: false