Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
feat: compose response data
emaild609f2741de5
diff --git a/api/user.go b/api/user.goindex 4ba9169c7..45839538f 100644--- a/api/user.go+++ b/api/user.go@@ -7,7 +7,7 @@ type User struct {OpenId string `json:"openId"`Name string `json:"name"`- Password string+ Password string `json:"-"`}type UserCreate struct {diff --git a/server/auth.go b/server/auth.goindex 85f8bf501..abe2ded3e 100644--- a/server/auth.go+++ b/server/auth.go@@ -40,7 +40,7 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {}c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)- if err := json.NewEncoder(c.Response().Writer).Encode(user); err != nil {+ if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(user)); err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal create user response").SetInternal(err)}@@ -88,7 +88,7 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {}c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)- if err := json.NewEncoder(c.Response().Writer).Encode(user); err != nil {+ if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(user)); err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal create user response").SetInternal(err)}diff --git a/server/common.go b/server/common.gonew file mode 100644index 000000000..033bc5d61--- /dev/null+++ b/server/common.go@@ -0,0 +1,11 @@+package server++func composeResponse(data interface{}) interface{} {+ type R struct {+ Data interface{} `json:"data"`+ }++ return R{+ Data: data,+ }+}diff --git a/server/memo.go b/server/memo.goindex 41bd7046c..133df923f 100644--- a/server/memo.go+++ b/server/memo.go@@ -27,7 +27,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {}c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)- if err := json.NewEncoder(c.Response().Writer).Encode(memo); err != nil {+ if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(memo)); err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal memo response").SetInternal(err)}@@ -52,7 +52,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {}c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)- if err := json.NewEncoder(c.Response().Writer).Encode(memo); err != nil {+ if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(memo)); err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal memo response").SetInternal(err)}@@ -69,7 +69,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {}c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)- if err := json.NewEncoder(c.Response().Writer).Encode(list); err != nil {+ if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(list)); err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal memo list response").SetInternal(err)}@@ -93,7 +93,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {}c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)- if err := json.NewEncoder(c.Response().Writer).Encode(memo); err != nil {+ if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(memo)); err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal memo response").SetInternal(err)}diff --git a/server/resource.go b/server/resource.goindex e1dd4c0a5..b4d05d4b5 100644--- a/server/resource.go+++ b/server/resource.go@@ -53,7 +53,7 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {}c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)- if err := json.NewEncoder(c.Response().Writer).Encode(resource); err != nil {+ if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(resource)); err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal shortcut response").SetInternal(err)}@@ -70,7 +70,7 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {}c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)- if err := json.NewEncoder(c.Response().Writer).Encode(list); err != nil {+ if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(list)); err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal resource list response").SetInternal(err)}diff --git a/server/shortcut.go b/server/shortcut.goindex c6afcbba7..5d2063e9c 100644--- a/server/shortcut.go+++ b/server/shortcut.go@@ -26,7 +26,7 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) {}c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)- if err := json.NewEncoder(c.Response().Writer).Encode(shortcut); err != nil {+ if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(shortcut)); err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal shortcut response").SetInternal(err)}@@ -51,7 +51,7 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) {}c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)- if err := json.NewEncoder(c.Response().Writer).Encode(shortcut); err != nil {+ if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(shortcut)); err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal shortcut response").SetInternal(err)}@@ -68,7 +68,7 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) {}c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)- if err := json.NewEncoder(c.Response().Writer).Encode(list); err != nil {+ if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(list)); err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal shortcut list response").SetInternal(err)}@@ -89,7 +89,7 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) {}c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)- if err := json.NewEncoder(c.Response().Writer).Encode(shortcut); err != nil {+ if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(shortcut)); err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal shortcut response").SetInternal(err)}diff --git a/server/user.go b/server/user.goindex b1ac50fea..907fa9217 100644--- a/server/user.go+++ b/server/user.go@@ -21,7 +21,7 @@ func (s *Server) registerUserRoutes(g *echo.Group) {}c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)- if err := json.NewEncoder(c.Response().Writer).Encode(user); err != nil {+ if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(user)); err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal user response").SetInternal(err)}@@ -46,7 +46,7 @@ func (s *Server) registerUserRoutes(g *echo.Group) {}c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)- if err := json.NewEncoder(c.Response().Writer).Encode(user); err != nil {+ if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(user)); err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal user response").SetInternal(err)}@@ -72,7 +72,7 @@ func (s *Server) registerUserRoutes(g *echo.Group) {}c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)- if err := json.NewEncoder(c.Response().Writer).Encode(user); err != nil {+ if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(user)); err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal user response").SetInternal(err)}diff --git a/server/webhook.go b/server/webhook.goindex b98216e1b..097e2cc3d 100644--- a/server/webhook.go+++ b/server/webhook.go@@ -41,7 +41,7 @@ func (s *Server) registerWebhookRoutes(g *echo.Group) {}c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)- if err := json.NewEncoder(c.Response().Writer).Encode(memo); err != nil {+ if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(memo)); err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal memo response").SetInternal(err)}