refactor of topic handling and image serving

This commit is contained in:
2026-01-18 22:29:20 -07:00
parent 0c596d65da
commit 567a774282
4 changed files with 38 additions and 35 deletions
+22
View File
@@ -12,8 +12,10 @@ package ui
import (
"errors"
"fmt"
"net/http"
"net/url"
"strconv"
"git.erbosoft.com/amy/amsterdam/config"
"git.erbosoft.com/amy/amsterdam/database"
@@ -119,6 +121,7 @@ func ValidateConference(next echo.HandlerFunc) echo.HandlerFunc {
}
}
// SetConference is middleware that sets the conference context based on the URL.
func SetConference(next echo.HandlerFunc) echo.HandlerFunc {
return func(c echo.Context) error {
ctxt := AmContextFromEchoContext(c)
@@ -140,3 +143,22 @@ func SetConference(next echo.HandlerFunc) echo.HandlerFunc {
return next(c)
}
}
// SetTopic is middleware that sets the topic context based on the URL.
func SetTopic(next echo.HandlerFunc) echo.HandlerFunc {
return func(c echo.Context) error {
ctxt := AmContextFromEchoContext(c)
conf := ctxt.GetScratch("currentConference").(*database.Conference)
var topic *database.Topic = nil
if rawTopic, err := strconv.ParseInt(ctxt.URLParam("topic"), 10, 16); err == nil {
topic, err = database.AmGetTopicByNumber(ctxt.Ctx(), conf, int16(rawTopic))
}
if topic == nil {
ctxt.SetRC(http.StatusNotFound)
return middlewareErrorPage(c, ctxt, fmt.Errorf("topic not found: %s", ctxt.URLParam("topic")))
}
ctxt.SetScratch("currentTopic", topic)
return next(c)
}
}