Set error codes
This commit is contained in:
parent
9cfa568eff
commit
6c2de8880a
@ -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})
|
||||
|
10
web/main.go
10
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)
|
||||
|
@ -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
|
||||
|
@ -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{
|
||||
|
Loading…
Reference in New Issue
Block a user