YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: code clean (#516)

Browse Source
This commit is contained in:
boojack
2022-11-21 23:23:05 +08:00
committed by GitHub
parent 0d0f893b93
commit 013ded1e04
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/acl.go
View File

@@ -105,7 +105,7 @@ func aclMiddleware(s *Server, next echo.HandlerFunc) echo.HandlerFunc {
return next(c) return next(c)
} }
if common.HasPrefixes(path, "/api/memo", "/api/tag", "/api/shortcut", "/api/memo/stats") && c.Request().Method == http.MethodGet { if common.HasPrefixes(path, "/api/memo", "/api/tag", "/api/shortcut") && c.Request().Method == http.MethodGet {
if _, err := strconv.Atoi(c.QueryParam("creatorId")); err == nil { if _, err := strconv.Atoi(c.QueryParam("creatorId")); err == nil {
return next(c) return next(c)
} }

6
server/http_getter.go
View File

@@ -11,7 +11,7 @@ import (
metric "github.com/usememos/memos/plugin/metrics" metric "github.com/usememos/memos/plugin/metrics"
) )
func (s *Server) registerCrawlerPublicRoutes(g *echo.Group) { func (s *Server) registerGetterPublicRoutes(g *echo.Group) {
g.GET("/get/httpmeta", func(c echo.Context) error { g.GET("/get/httpmeta", func(c echo.Context) error {
ctx := c.Request().Context() ctx := c.Request().Context()
urlStr := c.QueryParam("url") urlStr := c.QueryParam("url")
@@ -39,6 +39,7 @@ func (s *Server) registerCrawlerPublicRoutes(g *echo.Group) {
} }
return nil return nil
}) })
g.GET("/get/image", func(c echo.Context) error { g.GET("/get/image", func(c echo.Context) error {
ctx := c.Request().Context() ctx := c.Request().Context()
urlStr := c.QueryParam("url") urlStr := c.QueryParam("url")
@@ -51,7 +52,7 @@ func (s *Server) registerCrawlerPublicRoutes(g *echo.Group) {
image, err := getter.GetImage(urlStr) image, err := getter.GetImage(urlStr)
if err != nil { if err != nil {
return echo.NewHTTPError(http.StatusNotAcceptable, fmt.Sprintf("Failed to get image url: %s", urlStr)).SetInternal(err) return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Failed to get image url: %s", urlStr)).SetInternal(err)
} }
s.Collector.Collect(ctx, &metric.Metric{ s.Collector.Collect(ctx, &metric.Metric{
Name: "getter used", Name: "getter used",
@@ -62,6 +63,7 @@ func (s *Server) registerCrawlerPublicRoutes(g *echo.Group) {
c.Response().Writer.WriteHeader(http.StatusOK) c.Response().Writer.WriteHeader(http.StatusOK)
c.Response().Writer.Header().Set("Content-Type", image.Mediatype) c.Response().Writer.Header().Set("Content-Type", image.Mediatype)
c.Response().Writer.Header().Set(echo.HeaderCacheControl, "max-age=31536000, immutable")
if _, err := c.Response().Writer.Write(image.Blob); err != nil { if _, err := c.Response().Writer.Write(image.Blob); err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to write image blob").SetInternal(err) return echo.NewHTTPError(http.StatusInternalServerError, "Failed to write image blob").SetInternal(err)
} }

3
server/resource.go
View File

@@ -262,11 +262,10 @@ func (s *Server) registerResourcePublicRoutes(g *echo.Group) {
c.Response().Writer.WriteHeader(http.StatusOK) c.Response().Writer.WriteHeader(http.StatusOK)
c.Response().Writer.Header().Set("Content-Type", resource.Type) c.Response().Writer.Header().Set("Content-Type", resource.Type)
c.Response().Header().Set(echo.HeaderCacheControl, "max-age=31536000, immutable") c.Response().Writer.Header().Set(echo.HeaderCacheControl, "max-age=31536000, immutable")
if _, err := c.Response().Writer.Write(resource.Blob); err != nil { if _, err := c.Response().Writer.Write(resource.Blob); err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to write response").SetInternal(err) return echo.NewHTTPError(http.StatusInternalServerError, "Failed to write response").SetInternal(err)
} }
return nil return nil
}) })
} }

2
server/server.go
View File

@@ -66,7 +66,7 @@ func NewServer(profile *profile.Profile) *Server {
publicGroup := e.Group("/o") publicGroup := e.Group("/o")
s.registerResourcePublicRoutes(publicGroup) s.registerResourcePublicRoutes(publicGroup)
s.registerCrawlerPublicRoutes(publicGroup) s.registerGetterPublicRoutes(publicGroup)
apiGroup := e.Group("/api") apiGroup := e.Group("/api")
apiGroup.Use(func(next echo.HandlerFunc) echo.HandlerFunc { apiGroup.Use(func(next echo.HandlerFunc) echo.HandlerFunc {