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.

chore: format server code

email3874523e6100
diff --git a/api/memo.go b/api/memo.go
index 3b2495ee5..c86323d7f 100644
--- a/api/memo.go
+++ b/api/memo.go
@@ -11,8 +11,9 @@ type Memo struct {
}
type MemoCreate struct {
- Content string `json:"content"`
CreatorId int
+
+ Content string `json:"content"`
}
type MemoPatch struct {
@@ -29,8 +30,7 @@ type MemoFind struct {
}
type MemoDelete struct {
- Id *int `json:"id"`
- CreatorId *int
+ Id *int `json:"id"`
}
type MemoService interface {
diff --git a/bin/server/cmd/profile.go b/bin/server/cmd/profile.go
index b176bb0cb..5b3dd1221 100644
--- a/bin/server/cmd/profile.go
+++ b/bin/server/cmd/profile.go
@@ -1,10 +1,10 @@
package cmd
import (
- "flag"
"fmt"
"os"
"path/filepath"
+ "strconv"
"strings"
)
@@ -40,22 +40,29 @@ func checkDSN(dataDir string) (string, error) {
// GetDevProfile will return a profile for dev.
func GetProfile() Profile {
- mode := flag.String("mode", "dev", "")
- port := flag.Int("port", 8080, "")
- data := flag.String("data", "", "")
- flag.Parse()
+ mode := os.Getenv("mode")
+ if mode != "dev" && mode != "release" {
+ mode = "dev"
+ }
+
+ port, err := strconv.Atoi(os.Getenv("port"))
+ if err != nil {
+ port = 8080
+ }
+
+ data := os.Getenv("data")
- dataDir, err := checkDSN(*data)
+ dataDir, err := checkDSN(data)
if err != nil {
fmt.Printf("Failed to check dsn: %s, err: %+v\n", dataDir, err)
os.Exit(1)
}
- dsn := fmt.Sprintf("file:%s/memos_%s.db", dataDir, *mode)
+ dsn := fmt.Sprintf("file:%s/memos_%s.db", dataDir, mode)
return Profile{
- mode: *mode,
- port: *port,
+ mode: mode,
+ port: port,
dsn: dsn,
}
}
diff --git a/server/auth.go b/server/auth.go
index 6c5dad163..466779bef 100644
--- a/server/auth.go
+++ b/server/auth.go
@@ -47,6 +47,7 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {
return nil
})
+
g.POST("/auth/logout", func(c echo.Context) error {
err := removeUserSession(c)
if err != nil {
@@ -56,6 +57,7 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {
c.Response().WriteHeader(http.StatusOK)
return nil
})
+
g.POST("/auth/signup", func(c echo.Context) error {
signup := &api.Signup{}
if err := json.NewDecoder(c.Request().Body).Decode(signup); err != nil {
diff --git a/server/memo.go b/server/memo.go
index 0f18e3841..b8d33aee4 100644
--- a/server/memo.go
+++ b/server/memo.go
@@ -33,6 +33,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
return nil
})
+
g.PATCH("/memo/:memoId", func(c echo.Context) error {
memoId, err := strconv.Atoi(c.Param("memoId"))
if err != nil {
@@ -58,6 +59,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
return nil
})
+
g.GET("/memo", func(c echo.Context) error {
userId := c.Get(getUserIdContextKey()).(int)
memoFind := &api.MemoFind{
@@ -86,6 +88,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
return nil
})
+
g.GET("/memo/:memoId", func(c echo.Context) error {
memoId, err := strconv.Atoi(c.Param("memoId"))
if err != nil {
@@ -111,6 +114,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
return nil
})
+
g.DELETE("/memo/:memoId", func(c echo.Context) error {
memoId, err := strconv.Atoi(c.Param("memoId"))
if err != nil {
diff --git a/server/resource.go b/server/resource.go
index 3672c42a9..36fea469c 100644
--- a/server/resource.go
+++ b/server/resource.go
@@ -59,6 +59,7 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {
return nil
})
+
g.GET("/resource", func(c echo.Context) error {
userId := c.Get(getUserIdContextKey()).(int)
resourceFind := &api.ResourceFind{
@@ -76,6 +77,7 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {
return nil
})
+
g.DELETE("/resource/:resourceId", func(c echo.Context) error {
resourceId, err := strconv.Atoi(c.Param("resourceId"))
if err != nil {
diff --git a/server/shortcut.go b/server/shortcut.go
index 27bfe16b5..d7c21f6b0 100644
--- a/server/shortcut.go
+++ b/server/shortcut.go
@@ -32,6 +32,7 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) {
return nil
})
+
g.PATCH("/shortcut/:shortcutId", func(c echo.Context) error {
shortcutId, err := strconv.Atoi(c.Param("shortcutId"))
if err != nil {
@@ -57,6 +58,7 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) {
return nil
})
+
g.GET("/shortcut", func(c echo.Context) error {
userId := c.Get(getUserIdContextKey()).(int)
shortcutFind := &api.ShortcutFind{
@@ -74,6 +76,7 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) {
return nil
})
+
g.GET("/shortcut/:shortcutId", func(c echo.Context) error {
shortcutId, err := strconv.Atoi(c.Param("shortcutId"))
if err != nil {
@@ -95,6 +98,7 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) {
return nil
})
+
g.DELETE("/shortcut/:shortcutId", func(c echo.Context) error {
shortcutId, err := strconv.Atoi(c.Param("shortcutId"))
if err != nil {
diff --git a/server/user.go b/server/user.go
index db57dfe42..d57b34f13 100644
--- a/server/user.go
+++ b/server/user.go
@@ -34,6 +34,7 @@ func (s *Server) registerUserRoutes(g *echo.Group) {
return nil
})
+
g.POST("/user/rename_check", func(c echo.Context) error {
userRenameCheck := &api.UserRenameCheck{}
if err := json.NewDecoder(c.Request().Body).Decode(userRenameCheck); err != nil {
@@ -64,6 +65,7 @@ func (s *Server) registerUserRoutes(g *echo.Group) {
return nil
})
+
g.POST("/user/password_check", func(c echo.Context) error {
userId := c.Get(getUserIdContextKey()).(int)
userPasswordCheck := &api.UserPasswordCheck{}
@@ -96,6 +98,7 @@ func (s *Server) registerUserRoutes(g *echo.Group) {
return nil
})
+
g.PATCH("/user/me", func(c echo.Context) error {
userId := c.Get(getUserIdContextKey()).(int)
userPatch := &api.UserPatch{
diff --git a/server/webhook.go b/server/webhook.go
index 5318668f9..72504385b 100644
--- a/server/webhook.go
+++ b/server/webhook.go
@@ -14,6 +14,7 @@ func (s *Server) registerWebhookRoutes(g *echo.Group) {
g.GET("/test", func(c echo.Context) error {
return c.HTML(http.StatusOK, "<strong>Hello, World!</strong>")
})
+
g.POST("/:openId/memo", func(c echo.Context) error {
openId := c.Param("openId")
@@ -47,6 +48,7 @@ func (s *Server) registerWebhookRoutes(g *echo.Group) {
return nil
})
+
g.GET("/:openId/memo", func(c echo.Context) error {
openId := c.Param("openId")