From 404e0dffdf4f4406d33164348f3374b48f8a1d14 Mon Sep 17 00:00:00 2001
From: RandomChars <random@chars.jp>
Date: Sun, 3 Oct 2021 23:31:14 +0900
Subject: [PATCH] fix error returns on API, fix form file upload
---
api.go | 6 +++---
client/image.go | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/api.go b/api.go
index 3134acf..05d4d74 100644
--- a/api.go
+++ b/api.go
@@ -300,19 +300,19 @@ func registerAPI() {
payload, err := context.FormFile("image")
if err != nil {
- context.JSON(http.StatusInternalServerError, err)
+ context.JSON(http.StatusInternalServerError, api.Error{Error: err.Error()})
return
}
file, err := payload.Open()
if err != nil {
log.Errorf("Error while opening uploaded file %s, %s", payload.Filename, err)
- context.JSON(http.StatusInternalServerError, err)
+ context.JSON(http.StatusInternalServerError, api.Error{Error: err.Error()})
return
}
data, err := ioutil.ReadAll(file)
if err != nil {
log.Errorf("Error while reading uploaded file %s, %s", payload.Filename, err)
- context.JSON(http.StatusInternalServerError, err)
+ context.JSON(http.StatusInternalServerError, api.Error{Error: err.Error()})
return
}
image := instance.ImageAdd(data, info.Snowflake)
diff --git a/client/image.go b/client/image.go
index 51f70d6..6fcd8ed 100644
--- a/client/image.go
+++ b/client/image.go
@@ -30,7 +30,7 @@ func (r *Remote) ImageAdd(reader io.Reader) (store.Image, error) {
buf := &bytes.Buffer{}
w := multipart.NewWriter(buf)
- if f, err := w.CreateFormField("image"); err != nil {
+ if f, err := w.CreateFormFile("image", "image"); err != nil {
return store.Image{}, err
} else {
if _, err = io.Copy(f, reader); err != nil {
--
GitLab