From 198c4ff749ed0d1c81c3862a3dac692958e2a96b Mon Sep 17 00:00:00 2001
From: Caleb Gardner <calebq23@gmail.com>
Date: Wed, 25 Dec 2024 16:51:58 -0600
Subject: [PATCH] Remove bbConvert usage. Minor fixes

---
 editor.go             | 14 +++++++-------
 internal/blog/blog.go |  7 ++++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/editor.go b/editor.go
index 192fb4c..302ca17 100644
--- a/editor.go
+++ b/editor.go
@@ -38,8 +38,7 @@ const (
 	{{end}}
 	</select>
 </p>
-<div id="editor" hx-on::after-settle="blogEditorResize()">{{.Editor}}</div>
-`
+<div id="editor" hx-on::after-settle="blogEditorResize()">{{.Editor}}</div>`
 	editorForm = `
 <form id="editorForm" hx-post="/editor/post" hx-target="#formResult" hx-confirm="Save changes, overwritting previous values??">
 	<input name="id" type="hidden" value="{{.Blog.ID}}"></input>
@@ -81,11 +80,12 @@ func trueLoginRequest(w http.ResponseWriter, r *http.Request) {
 	}
 	u, err := back.TryLogin(r.Context(), r.FormValue("username"), r.FormValue("password"))
 	if err != nil {
-		if err == backend.ErrLoginTimeout {
-			sendContent(w, r, fmt.Sprint("<p>Timed out for", time.Unix(u.Timeout, 0).Sub(time.Now()), "</p>"), "", "")
-		} else if err == backend.ErrLoginIncorrect {
+		switch err {
+		case backend.ErrLoginTimeout:
+			sendContent(w, r, fmt.Sprint("<p>Timed out for", time.Until(time.Unix(u.Timeout, 0)), "</p>"), "", "")
+		case backend.ErrLoginIncorrect:
 			sendContent(w, r, "<p>Username or password invalid</p>", "", "")
-		} else {
+		default:
 			log.Println("error trying to login:", err)
 			sendContent(w, r, "<p>Server error</p>", "", "")
 		}
@@ -211,7 +211,7 @@ func editorPost(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	if newBlog.ID == "" {
-		newBlog.ID = strings.TrimSpace(strings.ToLower(strings.ReplaceAll(newBlog.ID, " ", "-")))
+		newBlog.ID = strings.TrimSpace(strings.ToLower(strings.ReplaceAll(newBlog.Title, " ", "-")))
 		if blogApp.Contains(r.Context(), newBlog.ID) {
 			sendContent(w, r, "<p>Title is not unique!</p>", "", "")
 			return
diff --git a/internal/blog/blog.go b/internal/blog/blog.go
index 6bd8e04..1e6e8d9 100644
--- a/internal/blog/blog.go
+++ b/internal/blog/blog.go
@@ -61,9 +61,10 @@ func (b *Blog) HTMX(blogApp *BlogApp, ctx context.Context) string {
 }
 
 func (b *BlogApp) ConvertBlog(blog *Blog) {
-	if !blog.StaticPage {
-		blog.HTMLBlog = b.conv.HTMLConvert(blog.RawBlog)
-	}
+	//TODO: fix bbConvert
+	// if !blog.StaticPage {
+	// 	blog.HTMLBlog = b.conv.HTMLConvert(blog.RawBlog)
+	// }
 }
 
 func (b *BlogApp) GetAuthor(ctx context.Context, blog *Blog) (*Author, error) {