Make threads openable from catalog

This commit is contained in:
Dominic Ferrando
2025-04-18 11:21:47 -04:00
parent e53a65d437
commit a809b3c403
8 changed files with 134 additions and 68 deletions
+164
View File
@@ -0,0 +1,164 @@
package main
import (
"database/sql"
"fmt"
"log"
"net/http"
"strconv"
"github.com/dominicf2001/comfychan/internal/database"
"github.com/dominicf2001/comfychan/web/views"
"github.com/go-chi/chi/v5"
"github.com/go-chi/chi/v5/middleware"
_ "github.com/mattn/go-sqlite3"
)
var dev = true
func disableCacheInDevMode(next http.Handler) http.Handler {
if !dev {
return next
}
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Cache-Control", "no-store")
next.ServeHTTP(w, r)
})
}
func main() {
// -----------------
// SETUP
// -----------------
db, err := sql.Open("sqlite3", "internal/database/comfychan.db")
if err != nil {
log.Fatal(err)
}
defer db.Close()
r := chi.NewRouter()
r.Use(middleware.Logger)
r.Handle("/static/*",
disableCacheInDevMode(
http.StripPrefix("/static",
http.FileServer(http.Dir("web/static")))))
// -----------------
// -----------------
// MAIN ROUTES
// -----------------
r.Get("/", func(w http.ResponseWriter, r *http.Request) {
views.Index().Render(r.Context(), w)
})
r.Get("/{slug}", func(w http.ResponseWriter, r *http.Request) {
slug := chi.URLParam(r, "slug")
board, err := database.GetBoard(db, slug)
if err != nil {
http.NotFound(w, r)
log.Printf("Board %q not found: %v", slug, err)
return
}
views.Board(board).Render(r.Context(), w)
})
r.Get("/{slug}/threads/{threadId}", func(w http.ResponseWriter, r *http.Request) {
slug := chi.URLParam(r, "slug")
// TODO: use relative thread_nums (see issue #1)
threadIdStr := chi.URLParam(r, "threadId")
threadId, err := strconv.Atoi(threadIdStr)
if err != nil {
http.Error(w, "Invalid thread id", http.StatusBadRequest)
return
}
board, err := database.GetBoard(db, slug)
if err != nil {
http.NotFound(w, r)
log.Printf("Board %q not found: %v", slug, err)
return
}
thread, err := database.GetThread(db, threadId)
if err != nil {
http.Error(w, "Failed to get thread", http.StatusInternalServerError)
log.Printf("Failed to get thread %q: %v", threadIdStr, err)
return
}
posts, err := database.GetThreadPosts(db, threadId)
if err != nil {
http.Error(w, "Failed to get thread posts", http.StatusInternalServerError)
log.Printf("Failed to get thread %q posts: %v", threadIdStr, err)
return
}
views.Thread(board, thread, posts).Render(r.Context(), w)
})
r.Post("/{slug}/threads", func(w http.ResponseWriter, r *http.Request) {
slug := chi.URLParam(r, "slug")
if err := r.ParseForm(); err != nil {
http.Error(w, "Bad form data", http.StatusBadRequest)
return
}
subject := r.FormValue("subject")
body := r.FormValue("body")
database.PutBoardThread(db, slug, subject, body)
})
// -----------------
// -----------------
// PARTIALS
// -----------------
r.Get("/hx/{slug}/catalog", func(w http.ResponseWriter, r *http.Request) {
slug := chi.URLParam(r, "slug")
threads, err := database.GetThreads(db, slug)
if err != nil {
http.Error(w, "Failed to get board threads", http.StatusInternalServerError)
log.Printf("GetThreads: %v", err)
return
}
previews := make([]views.CatalogThreadPreview, 0, len(threads))
for _, thread := range threads {
posts, err := database.GetThreadPosts(db, thread.Id)
if err != nil {
http.Error(w, "Error getting thread posts", http.StatusBadRequest)
log.Printf("GetThreadPosts: %v", err)
return
}
if len(posts) == 0 {
http.Error(w, "Malformed thread", http.StatusInternalServerError)
log.Printf("GetThreadPosts: %v", err)
return
}
previews = append(previews, views.CatalogThreadPreview{
Subject: thread.Subject,
Body: posts[0].Body,
ThreadURL: fmt.Sprintf("/%s/threads/%d", slug, thread.Id),
})
}
views.ThreadsCatalog(previews).Render(r.Context(), w)
})
// -----------------
fmt.Println("Listening on :8080")
http.ListenAndServe(":8080", r)
}
-7
View File
@@ -1,7 +0,0 @@
package views
import "github.com/dominicf2001/comfychan/internal/database"
templ Post(board database.Board) {
BoardHeader(board)
}
-19
View File
@@ -1,19 +0,0 @@
package views
import "github.com/dominicf2001/comfychan/internal/database"
type ThreadGridBoxViewModel struct {
Thread database.Thread
Posts []database.Post
}
templ PostsCatalog(vms []ThreadGridBoxViewModel) {
<div id="catalog">
for _, vm := range vms {
<div class="catalog-post">
<h1><a class="catalog-post-link">{ vm.Thread.Subject }</a></h1>
<p>{ vm.Posts[0].Body }</p>
</div>
}
</div>
}
+12
View File
@@ -0,0 +1,12 @@
package views
import (
"github.com/dominicf2001/comfychan/internal/database"
"github.com/dominicf2001/comfychan/web/views/shared"
)
templ Thread(board database.Board, thread database.Thread, posts []database.Post) {
@shared.Layout() {
@BoardHeader(board)
}
}
+18
View File
@@ -0,0 +1,18 @@
package views
type CatalogThreadPreview struct {
Subject string
Body string
ThreadURL string
}
templ ThreadsCatalog(previews []CatalogThreadPreview) {
<div id="catalog">
for _, preview := range previews {
<div class="catalog-post">
<h1><a href={ templ.SafeURL(preview.ThreadURL) } class="catalog-post-link">{ preview.Subject }</a></h1>
<p>{ preview.Body }</p>
</div>
}
</div>
}