return Server.Error()

main.go

@@ -30,13 +30,11 @@ func main() {
 			Password string `json:"password"`
 		}
 		if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
-			srv.Error(w, "empty body", err, 400)
-			return nil
+			return srv.Error("empty body", err, 400)
 		}
 
 		if body.Email == "" || body.Password == "" {
-			srv.Error(w, "email or password missing", nil, 400)
-			return nil
+			return srv.Error("email or password missing", nil, 400)
 		}
 
 		hash, err := bcrypt.GenerateFromPassword([]byte(body.Password), 10)
@@ -50,8 +48,7 @@ func main() {
 		}
 
 		if err := user.Create(db); err != nil {
-			srv.Error(w, "failed to create user", err, 400)
-			return nil
+			return srv.Error("failed to create user", err, 400)
 		}
 
 		if err := user.FindByID(db); err != nil {
@@ -74,24 +71,20 @@ func main() {
 			Password string `json:"password"`
 		}
 		if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
-			srv.Error(w, "empty body", err, 400)
-			return nil
+			return srv.Error("empty body", err, 400)
 		}
 
 		if body.Email == "" || body.Password == "" {
-			srv.Error(w, "email or password missing", nil, 400)
-			return nil
+			return srv.Error("email or password missing", nil, 400)
 		}
 
 		user := &model.User{Email: body.Email}
 		if err := user.FindByEmail(db); err != nil {
-			srv.Error(w, "user not found", err, 404)
-			return nil
+			return srv.Error("user not found", err, 404)
 		}
 
 		if err := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(body.Password)); err != nil {
-			srv.Error(w, "invalid password", nil, 400)
-			return nil
+			return srv.Error("invalid password", nil, 400)
 		}
 
 		expiryTime := time.Now().Add(time.Hour * 24 * 30)
@@ -107,14 +100,12 @@ func main() {
 	srv.Handle("POST /api/images", func(w http.ResponseWriter, r *http.Request) error {
 		userId, err := auth.GetUserIdFromRequest(r)
 		if err != nil {
-			srv.Error(w, "unauthorized", err, 401)
-			return nil
+			return srv.Error("unauthorized", err, 401)
 		}
 
 		user := &model.User{Model: model.Model{ID: userId}}
 		if err := user.FindByID(db); err != nil {
-			srv.Error(w, "user not found", nil, 401)
-			return nil
+			return srv.Error("user not found", nil, 401)
 		}
 
 		data, err := io.ReadAll(r.Body)
@@ -128,8 +119,7 @@ func main() {
 			ContentType: r.Header.Get("Content-Type"),
 		}
 		if err := img.Create(db); err != nil {
-			srv.Error(w, "failed to save image to database: %v", err, 400)
-			return nil
+			return srv.Error("failed to save image to database: %v", err, 400)
 		}
 
 		return srv.JSON(w, img, 201)
@@ -138,14 +128,12 @@ func main() {
 	srv.Handle("GET /api/images", func(w http.ResponseWriter, r *http.Request) error {
 		userId, err := auth.GetUserIdFromRequest(r)
 		if err != nil {
-			srv.Error(w, "unauthorized", err, 401)
-			return nil
+			return srv.Error("unauthorized", err, 401)
 		}
 
 		rows, err := db.Queryx("SELECT * FROM images WHERE user_id = ?", userId)
 		if err != nil {
-			srv.Error(w, "images not found", err, 400)
-			return nil
+			return srv.Error("images not found", err, 400)
 		}
 
 		images := []model.Image{}
@@ -164,8 +152,7 @@ func main() {
 	srv.Handle("GET /images/{id}", func(w http.ResponseWriter, r *http.Request) error {
 		img := &model.Image{ID: r.PathValue("id")}
 		if err := img.FindByID(db); err != nil {
-			srv.Error(w, "image not found", nil, 404)
-			return nil
+			return srv.Error("image not found", nil, 404)
 		}
 
 		w.Header().Set("Content-Type", img.ContentType)
@@ -177,13 +164,11 @@ func main() {
 	srv.Handle("DELETE /api/images/{id}", func(w http.ResponseWriter, r *http.Request) error {
 		img := &model.Image{ID: r.PathValue("id")}
 		if err := img.FindByID(db); err != nil {
-			srv.Error(w, "image not found", nil, 404)
-			return nil
+			return srv.Error("image not found", nil, 404)
 		}
 
 		if err := img.DeleteByID(db); err != nil {
-			srv.Error(w, "failed to delete image: %v", err, 500)
-			return nil
+			return srv.Error("failed to delete image: %v", err, 500)
 		}
 
 		return srv.JSON(w, struct {