From 938d10c3a6770c78125af56a55fdaab921e9bbb2 Mon Sep 17 00:00:00 2001
From: tapiron <tapiron@monitoring@riou.xyz>
Date: Sat, 13 Sep 2025 19:10:50 +0200
Subject: [PATCH 1/2] fix: remove double rendering and test error (#26)

Remove double template rendering and test error for non password protected note

Co-authored-by: Thibault Piron <thibault.a.piron@gmail.com>
Reviewed-on: https://git.riou.xyz/jriou/coller/pulls/26
Reviewed-by: Julien Riou <jriou@monitoring@riou.xyz>
Co-authored-by: tapiron <tapiron@monitoring@riou.xyz>
Co-committed-by: tapiron <tapiron@monitoring@riou.xyz>
---
 src/server/server.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/server/server.go b/src/server/server.go
index 224c46e..28bd435 100644
--- a/src/server/server.go
+++ b/src/server/server.go
@@ -345,9 +345,6 @@ func (h *GetWebNoteHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	h.PageData.Err = fmt.Errorf("jriou")
-	h.Templates.ExecuteTemplate(w, templateName, h.PageData)
-
 	h.PageData.Note = note
 
 	h.logger.Debug("rendering note web page")

From 33628331f4330712781e2b3170236b16b24d9bc2 Mon Sep 17 00:00:00 2001
From: tapiron <tapiron@monitoring@riou.xyz>
Date: Mon, 15 Sep 2025 06:51:16 +0200
Subject: [PATCH 2/2] feat: set default expiration in select (#28)

No default value in select could be interpreted as ever lasting note.
Default value in the select makes that clearer.

Co-authored-by: Thibault Piron <thibault.a.piron@gmail.com>
Reviewed-on: https://git.riou.xyz/jriou/coller/pulls/28
Reviewed-by: Julien Riou <jriou@monitoring@riou.xyz>
Co-authored-by: tapiron <tapiron@monitoring@riou.xyz>
Co-committed-by: tapiron <tapiron@monitoring@riou.xyz>
---
 src/server/server.go            | 2 ++
 src/server/templates/index.html | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/server/server.go b/src/server/server.go
index 28bd435..92dc217 100644
--- a/src/server/server.go
+++ b/src/server/server.go
@@ -189,6 +189,7 @@ type PageData struct {
 	Title       string
 	Version     string
 	Expirations []int
+	Expiration  int
 	Languages   []string
 	Err         error
 	URL         string
@@ -423,6 +424,7 @@ func (s *Server) Start() error {
 	p := PageData{
 		Title:       s.config.Title,
 		Expirations: s.config.Expirations,
+		Expiration:  s.config.Expiration,
 		Languages:   s.config.Languages,
 	}
 
diff --git a/src/server/templates/index.html b/src/server/templates/index.html
index 42faef1..0cf1d6d 100644
--- a/src/server/templates/index.html
+++ b/src/server/templates/index.html
@@ -36,9 +36,9 @@
                 </div>
                 <div class="col">
                     <select class="form-select" aria-label="Expiration" id="expiration" name="expiration">
-                        <option selected="selected" disabled>Expiration</option>
-                        {{range .Expirations}}
-                        <option value="{{.}}">{{HumanDuration .}}</option>
+                        <option disabled>Expiration</option>
+                        {{range $exp := .Expirations}}
+                        <option {{ if eq $exp $.Expiration }}selected="selected"{{end}} value="{{$exp}}">{{HumanDuration $exp}}</option>
                         {{end}}
                     </select>
                 </div>