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
chore: fix memo resources position
Steven8b9455d784df
diff --git a/api/v2/memo_resource_service.go b/api/v2/memo_resource_service.goindex 5c64efc0d..6d0937a4c 100644--- a/api/v2/memo_resource_service.go+++ b/api/v2/memo_resource_service.go@@ -2,6 +2,8 @@ package v2import ("context"+ "slices"+ "time""google.golang.org/grpc/codes""google.golang.org/grpc/status"@@ -11,7 +13,9 @@ import ()func (s *APIV2Service) SetMemoResources(ctx context.Context, request *apiv2pb.SetMemoResourcesRequest) (*apiv2pb.SetMemoResourcesResponse, error) {- resources, err := s.Store.ListResources(ctx, &store.FindResource{MemoID: &request.Id})+ resources, err := s.Store.ListResources(ctx, &store.FindResource{+ MemoID: &request.Id,+ })if err != nil {return nil, status.Errorf(codes.Internal, "failed to list resources")}@@ -35,11 +39,14 @@ func (s *APIV2Service) SetMemoResources(ctx context.Context, request *apiv2pb.Se}}+ slices.Reverse(request.Resources)// Update resources' memo_id in the request.- for _, resource := range request.Resources {+ for index, resource := range request.Resources {+ updatedTs := time.Now().Unix() + int64(index)if _, err := s.Store.UpdateResource(ctx, &store.UpdateResource{- ID: resource.Id,- MemoID: &request.Id,+ ID: resource.Id,+ MemoID: &request.Id,+ UpdatedTs: &updatedTs,}); err != nil {return nil, status.Errorf(codes.Internal, "failed to update resource")}diff --git a/store/db/mysql/resource.go b/store/db/mysql/resource.goindex ec1c1f63a..d277cf469 100644--- a/store/db/mysql/resource.go+++ b/store/db/mysql/resource.go@@ -63,7 +63,7 @@ func (d *DB) ListResources(ctx context.Context, find *store.FindResource) ([]*stfields = append(fields, "`blob`")}- query := fmt.Sprintf("SELECT %s FROM `resource` WHERE %s GROUP BY `id` ORDER BY `created_ts` DESC", strings.Join(fields, ", "), strings.Join(where, " AND "))+ query := fmt.Sprintf("SELECT %s FROM `resource` WHERE %s ORDER BY `updated_ts` DESC, `created_ts` DESC", strings.Join(fields, ", "), strings.Join(where, " AND "))if find.Limit != nil {query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit)if find.Offset != nil {diff --git a/store/db/postgres/resource.go b/store/db/postgres/resource.goindex b344dbf0a..235f56bf4 100644--- a/store/db/postgres/resource.go+++ b/store/db/postgres/resource.go@@ -49,8 +49,7 @@ func (d *DB) ListResources(ctx context.Context, find *store.FindResource) ([]*st%sFROM resourceWHERE %s- GROUP BY id- ORDER BY created_ts DESC+ ORDER BY updated_ts DESC, created_ts DESC`, strings.Join(fields, ", "), strings.Join(where, " AND "))if find.Limit != nil {query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit)diff --git a/store/db/sqlite/resource.go b/store/db/sqlite/resource.goindex 12a34fcd0..2c7fde732 100644--- a/store/db/sqlite/resource.go+++ b/store/db/sqlite/resource.go@@ -51,8 +51,7 @@ func (d *DB) ListResources(ctx context.Context, find *store.FindResource) ([]*st%sFROM resourceWHERE %s- GROUP BY id- ORDER BY created_ts DESC+ ORDER BY updated_ts DESC, created_ts DESC`, strings.Join(fields, ", "), strings.Join(where, " AND "))if find.Limit != nil {query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit)