Skip to content

armgit / memos

Public Imported from GitHub
0

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.

fix: response type

boojack85ce72282b7e
diff --git a/server/memo.go b/server/memo.go
index a99dadd7e..c7bc71fd4 100644
--- a/server/memo.go
+++ b/server/memo.go
@@ -199,7 +199,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
}
c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
- if err := json.NewEncoder(c.Response().Writer).Encode(len(memoList)); err != nil {
+ if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(len(memoList))); err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to encode memo amount").SetInternal(err)
}
diff --git a/server/tag.go b/server/tag.go
index 4cc90af57..319af37e4 100644
--- a/server/tag.go
+++ b/server/tag.go
@@ -42,7 +42,7 @@ func (s *Server) registerTagRoutes(g *echo.Group) {
}
c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
- if err := json.NewEncoder(c.Response().Writer).Encode(tagList); err != nil {
+ if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(tagList)); err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to encode tags response").SetInternal(err)
}
diff --git a/store/memo.go b/store/memo.go
index cc5009871..e99120c53 100644
--- a/store/memo.go
+++ b/store/memo.go
@@ -221,8 +221,6 @@ func findMemoRawList(db *sql.DB, find *api.MemoFind) ([]*memoRaw, error) {
}
}
- println(pagination)
-
rows, err := db.Query(`
SELECT
id,