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: resource v1 definition
Stevene703b4f70d57
diff --git a/server/route/api/v1/resource.go b/server/route/api/v1/resource.goindex edbe943da..eb1eeb4be 100644--- a/server/route/api/v1/resource.go+++ b/server/route/api/v1/resource.go@@ -26,6 +26,7 @@ import (type Resource struct {ID int32 `json:"id"`Name string `json:"name"`+ UID string `json:"uid"`// Standard fieldsCreatorID int32 `json:"creatorId"`@@ -371,7 +372,8 @@ func replacePathTemplate(path, filename string) string {func convertResourceFromStore(resource *store.Resource) *Resource {return &Resource{ID: resource.ID,- Name: resource.UID,+ Name: fmt.Sprintf("resources/%d", resource.ID),+ UID: resource.UID,CreatorID: resource.CreatorID,CreatedTs: resource.CreatedTs,UpdatedTs: resource.UpdatedTs,diff --git a/server/route/api/v2/memo_resource_service.go b/server/route/api/v2/memo_resource_service.goindex 42ab0a4b4..fd7b518c4 100644--- a/server/route/api/v2/memo_resource_service.go+++ b/server/route/api/v2/memo_resource_service.go@@ -46,7 +46,7 @@ func (s *APIV2Service) SetMemoResources(ctx context.Context, request *apiv2pb.Seslices.Reverse(request.Resources)// Update resources' memo_id in the request.for index, resource := range request.Resources {- id, err := ExtractMemoIDFromName(resource.Name)+ id, err := ExtractResourceIDFromName(resource.Name)if err != nil {return nil, status.Errorf(codes.InvalidArgument, "invalid resource name: %v", err)}diff --git a/server/route/api/v2/resource_service.go b/server/route/api/v2/resource_service.goindex f27f72124..1187f2f39 100644--- a/server/route/api/v2/resource_service.go+++ b/server/route/api/v2/resource_service.go@@ -105,7 +105,7 @@ func (s *APIV2Service) SearchResources(ctx context.Context, request *apiv2pb.Seafunc (s *APIV2Service) GetResource(ctx context.Context, request *apiv2pb.GetResourceRequest) (*apiv2pb.GetResourceResponse, error) {id, err := ExtractResourceIDFromName(request.Name)if err != nil {- return nil, status.Errorf(codes.InvalidArgument, "invalid resource name: %v", err)+ return nil, status.Errorf(codes.InvalidArgument, "invalid resource id: %v", err)}resource, err := s.Store.GetResource(ctx, &store.FindResource{ID: &id,@@ -125,7 +125,7 @@ func (s *APIV2Service) GetResource(ctx context.Context, request *apiv2pb.GetResofunc (s *APIV2Service) UpdateResource(ctx context.Context, request *apiv2pb.UpdateResourceRequest) (*apiv2pb.UpdateResourceResponse, error) {id, err := ExtractResourceIDFromName(request.Resource.Name)if err != nil {- return nil, status.Errorf(codes.InvalidArgument, "invalid resource name: %v", err)+ return nil, status.Errorf(codes.InvalidArgument, "invalid resource id: %v", err)}if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 {return nil, status.Errorf(codes.InvalidArgument, "update mask is required")@@ -156,7 +156,7 @@ func (s *APIV2Service) UpdateResource(ctx context.Context, request *apiv2pb.Updafunc (s *APIV2Service) DeleteResource(ctx context.Context, request *apiv2pb.DeleteResourceRequest) (*apiv2pb.DeleteResourceResponse, error) {id, err := ExtractResourceIDFromName(request.Name)if err != nil {- return nil, status.Errorf(codes.InvalidArgument, "invalid resource name: %v", err)+ return nil, status.Errorf(codes.InvalidArgument, "invalid resource id: %v", err)}user, err := getCurrentUser(ctx, s.Store)if err != nil {