From 6c2de8880ac5c661056f7d9e9d295d94452d810a Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Thu, 30 Jan 2025 16:55:02 -0800 Subject: [PATCH] Set error codes --- web/item.go | 6 +++--- web/main.go | 10 +++++----- web/root.go | 2 +- web/source.go | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/web/item.go b/web/item.go index 4a18698..a05efd3 100644 --- a/web/item.go +++ b/web/item.go @@ -16,7 +16,7 @@ func (env *Env) getItem(writer http.ResponseWriter, req *http.Request) { item, err := core.GetItem(env.db, source, id) if err != nil { - writer.Write([]byte(err.Error())) + http.Error(writer, err.Error(), 500) return } html.Item(writer, html.ItemData{Item: item}) @@ -28,12 +28,12 @@ func (env *Env) deleteItem(writer http.ResponseWriter, req *http.Request) { _, err := core.DeactivateItem(env.db, source, id) if err != nil { - writer.Write([]byte(err.Error())) + http.Error(writer, err.Error(), 500) return } item, err := core.GetItem(env.db, source, id) if err != nil { - writer.Write([]byte(err.Error())) + http.Error(writer, err.Error(), 500) return } html.Item(writer, html.ItemData{Item: item}) diff --git a/web/main.go b/web/main.go index cf5cd2f..675e9dd 100644 --- a/web/main.go +++ b/web/main.go @@ -27,11 +27,11 @@ func RunServer(db *core.DB, addr string, port string) { env := &Env{db} bind := net.JoinHostPort(addr, port) - handleFunc("GET /", env.getRoot) - handleFunc("GET /style.css", env.getStyle) - handleFunc("GET /htmx.org@2.0.4.js", env.getScript) - handleFunc("GET /source/{source}", env.getSource) - handleFunc("GET /item/{source}/{id}", env.getItem) + handleFunc("GET /", env.getRoot) + handleFunc("GET /style.css", env.getStyle) + handleFunc("GET /htmx.org@2.0.4.js", env.getScript) + handleFunc("GET /source/{source}", env.getSource) + handleFunc("GET /item/{source}/{id}", env.getItem) handleFunc("DELETE /item/{source}/{id}", env.deleteItem) handleFunc("POST /item/{source}/{id}/action/{action}", env.doAction) handleFunc("POST /mass-deactivate", env.massDeactivate) diff --git a/web/root.go b/web/root.go index 51c727a..487cc7c 100644 --- a/web/root.go +++ b/web/root.go @@ -15,7 +15,7 @@ func (env *Env) getRoot(writer http.ResponseWriter, req *http.Request) { names, err := core.GetSources(env.db) if err != nil { - writer.Write([]byte(err.Error())) + http.Error(writer, err.Error(), 500) } var sources []html.SourceData diff --git a/web/source.go b/web/source.go index e576c15..627f52b 100644 --- a/web/source.go +++ b/web/source.go @@ -17,7 +17,7 @@ func (env *Env) getSource(writer http.ResponseWriter, req *http.Request) { // TODO this needs to properly error if the source doesn't exist instead of just returning [] items, err := core.GetAllItemsForSource(env.db, source) if err != nil { - http.NotFound(writer, req) + http.Error(writer, err.Error(), 500) return } data := html.FeedData{