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
fix: replace echo.NewHTTPError with status.Errorf
Johnnyd9dc5be20085
diff --git a/server/router/api/v1/memo_relation_service.go b/server/router/api/v1/memo_relation_service.goindex b70088b2a..25d97f24a 100644--- a/server/router/api/v1/memo_relation_service.go+++ b/server/router/api/v1/memo_relation_service.go@@ -100,7 +100,7 @@ func (s *APIV1Service) ListMemoRelations(ctx context.Context, request *v1pb.ListMemoFilter: &memoFilter,})if err != nil {- return nil, err+ return nil, status.Errorf(codes.Internal, "failed to list memo relations: %v", err)}for _, raw := range tempList {relation, err := s.convertMemoRelationFromStore(ctx, raw)@@ -114,7 +114,7 @@ func (s *APIV1Service) ListMemoRelations(ctx context.Context, request *v1pb.ListMemoFilter: &memoFilter,})if err != nil {- return nil, err+ return nil, status.Errorf(codes.Internal, "failed to list related memo relations: %v", err)}for _, raw := range tempList {relation, err := s.convertMemoRelationFromStore(ctx, raw)@@ -133,7 +133,7 @@ func (s *APIV1Service) ListMemoRelations(ctx context.Context, request *v1pb.Listfunc (s *APIV1Service) convertMemoRelationFromStore(ctx context.Context, memoRelation *store.MemoRelation) (*v1pb.MemoRelation, error) {memo, err := s.Store.GetMemo(ctx, &store.FindMemo{ID: &memoRelation.MemoID})if err != nil {- return nil, err+ return nil, status.Errorf(codes.Internal, "failed to get memo: %v", err)}memoSnippet, err := s.getMemoContentSnippet(memo.Content)if err != nil {@@ -141,7 +141,7 @@ func (s *APIV1Service) convertMemoRelationFromStore(ctx context.Context, memoRel}relatedMemo, err := s.Store.GetMemo(ctx, &store.FindMemo{ID: &memoRelation.RelatedMemoID})if err != nil {- return nil, err+ return nil, status.Errorf(codes.Internal, "failed to get related memo: %v", err)}relatedMemoSnippet, err := s.getMemoContentSnippet(relatedMemo.Content)if err != nil {diff --git a/server/router/api/v1/memo_service.go b/server/router/api/v1/memo_service.goindex f5d250a16..954a665c5 100644--- a/server/router/api/v1/memo_service.go+++ b/server/router/api/v1/memo_service.go@@ -345,7 +345,7 @@ func (s *APIV1Service) UpdateMemo(ctx context.Context, request *v1pb.UpdateMemoRmemo, err := s.Store.GetMemo(ctx, &store.FindMemo{UID: &memoUID})if err != nil {- return nil, err+ return nil, status.Errorf(codes.Internal, "failed to get memo: %v", err)}if memo == nil {return nil, status.Errorf(codes.NotFound, "memo not found")diff --git a/server/router/api/v1/shortcut_service.go b/server/router/api/v1/shortcut_service.goindex b2057dbe8..aa2c4f6f7 100644--- a/server/router/api/v1/shortcut_service.go+++ b/server/router/api/v1/shortcut_service.go@@ -62,7 +62,7 @@ func (s *APIV1Service) ListShortcuts(ctx context.Context, request *v1pb.ListShorKey: storepb.UserSetting_SHORTCUTS,})if err != nil {- return nil, err+ return nil, status.Errorf(codes.Internal, "failed to get user setting: %v", err)}if userSetting == nil {return &v1pb.ListShortcutsResponse{@@ -186,7 +186,7 @@ func (s *APIV1Service) CreateShortcut(ctx context.Context, request *v1pb.CreateS_, err = s.Store.UpsertUserSetting(ctx, userSetting)if err != nil {- return nil, err+ return nil, status.Errorf(codes.Internal, "failed to upsert user setting: %v", err)}return &v1pb.Shortcut{@@ -313,7 +313,7 @@ func (s *APIV1Service) DeleteShortcut(ctx context.Context, request *v1pb.DeleteS}_, err = s.Store.UpsertUserSetting(ctx, userSetting)if err != nil {- return nil, err+ return nil, status.Errorf(codes.Internal, "failed to upsert user setting: %v", err)}return &emptypb.Empty{}, nildiff --git a/server/router/api/v1/user_service.go b/server/router/api/v1/user_service.goindex 794949cdd..0956000e3 100644--- a/server/router/api/v1/user_service.go+++ b/server/router/api/v1/user_service.go@@ -5,7 +5,6 @@ import ("crypto/rand""encoding/hex""fmt"- "net/http""regexp""strconv""strings"@@ -13,7 +12,6 @@ import ("github.com/google/cel-go/cel""github.com/google/cel-go/common/ast"- "github.com/labstack/echo/v4""github.com/pkg/errors""golang.org/x/crypto/bcrypt""google.golang.org/grpc/codes"@@ -163,7 +161,7 @@ func (s *APIV1Service) CreateUser(ctx context.Context, request *v1pb.CreateUserRpasswordHash, err := bcrypt.GenerateFromPassword([]byte(request.User.Password), bcrypt.DefaultCost)if err != nil {- return nil, echo.NewHTTPError(http.StatusInternalServerError, "failed to generate password hash").SetInternal(err)+ return nil, status.Errorf(codes.Internal, "failed to generate password hash: %v", err)}user, err := s.Store.CreateUser(ctx, &store.User{@@ -272,7 +270,7 @@ func (s *APIV1Service) UpdateUser(ctx context.Context, request *v1pb.UpdateUserRcase "password":passwordHash, err := bcrypt.GenerateFromPassword([]byte(request.User.Password), bcrypt.DefaultCost)if err != nil {- return nil, echo.NewHTTPError(http.StatusInternalServerError, "failed to generate password hash").SetInternal(err)+ return nil, status.Errorf(codes.Internal, "failed to generate password hash: %v", err)}passwordHashStr := string(passwordHash)update.PasswordHash = &passwordHashStr