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: update linter config
Johnny9107a941ca01
diff --git a/.golangci.yaml b/.golangci.yamlindex 726cd2fd7..959eda28e 100644--- a/.golangci.yaml+++ b/.golangci.yaml@@ -71,6 +71,8 @@ linters-settings:disabled: true- name: max-control-nestingdisabled: true+ - name: redefines-builtin-id+ disabled: truegocritic:disabled-checks:- ifElseChaindiff --git a/internal/util/util.go b/internal/util/util.goindex 8df06223c..6a2e84c9e 100644--- a/internal/util/util.go+++ b/internal/util/util.go@@ -63,10 +63,10 @@ func RandomString(n int) (string, error) {}// ReplaceString replaces all occurrences of old in slice with new.-func ReplaceString(slice []string, old, newStr string) []string {+func ReplaceString(slice []string, old, new string) []string {for i, s := range slice {if s == old {- slice[i] = newStr+ slice[i] = new}}return slicediff --git a/plugin/cron/parser.go b/plugin/cron/parser.goindex d63641be5..e1607a116 100644--- a/plugin/cron/parser.go+++ b/plugin/cron/parser.go@@ -173,24 +173,24 @@ func normalizeFields(fields []string, options ParseOption) ([]string, error) {}// Figure out how many fields we need- maximumValue := 0+ max := 0for _, place := range places {if options&place > 0 {- maximumValue+++ max++}}- minimumValue := maximumValue - optionals+ min := max - optionals// Validate number of fields- if count := len(fields); count < minimumValue || count > maximumValue {- if minimumValue == maximumValue {+ if count := len(fields); count < min || count > max {+ if min == max {return nil, errors.New("incorrect number of fields")}- return nil, errors.New("incorrect number of fields, expected " + strconv.Itoa(minimumValue) + "-" + strconv.Itoa(maximumValue))+ return nil, errors.New("incorrect number of fields, expected " + strconv.Itoa(min) + "-" + strconv.Itoa(max))}// Populate the optional field if not provided- if minimumValue < maximumValue && len(fields) == minimumValue {+ if min < max && len(fields) == min {switch {case options&DowOptional > 0:fields = append(fields, defaults[5]) // TODO: improve access to defaultdiff --git a/store/idp.go b/store/idp.goindex 996e47d5e..6aed4bbf4 100644--- a/store/idp.go+++ b/store/idp.go@@ -131,13 +131,13 @@ func (s *Store) UpdateIdentityProvider(ctx context.Context, update *UpdateIdentireturn identityProvider, nil}-func (s *Store) DeleteIdentityProvider(ctx context.Context, deleteIdp *DeleteIdentityProvider) error {- err := s.driver.DeleteIdentityProvider(ctx, deleteIdp)+func (s *Store) DeleteIdentityProvider(ctx context.Context, delete *DeleteIdentityProvider) error {+ err := s.driver.DeleteIdentityProvider(ctx, delete)if err != nil {return err}- s.idpCache.Delete(deleteIdp.ID)+ s.idpCache.Delete(delete.ID)return nil}diff --git a/store/memo_relation.go b/store/memo_relation.goindex 3072248ad..3d68049df 100644--- a/store/memo_relation.go+++ b/store/memo_relation.go@@ -39,6 +39,6 @@ func (s *Store) ListMemoRelations(ctx context.Context, find *FindMemoRelation) (return s.driver.ListMemoRelations(ctx, find)}-func (s *Store) DeleteMemoRelation(ctx context.Context, deleteMR *DeleteMemoRelation) error {- return s.driver.DeleteMemoRelation(ctx, deleteMR)+func (s *Store) DeleteMemoRelation(ctx context.Context, delete *DeleteMemoRelation) error {+ return s.driver.DeleteMemoRelation(ctx, delete)}diff --git a/store/resource.go b/store/resource.goindex 4d7843499..71aec1db7 100644--- a/store/resource.go+++ b/store/resource.go@@ -97,8 +97,8 @@ func (s *Store) UpdateResource(ctx context.Context, update *UpdateResource) erroreturn s.driver.UpdateResource(ctx, update)}-func (s *Store) DeleteResource(ctx context.Context, deleteResource *DeleteResource) error {- resource, err := s.GetResource(ctx, &FindResource{ID: &deleteResource.ID})+func (s *Store) DeleteResource(ctx context.Context, delete *DeleteResource) error {+ resource, err := s.GetResource(ctx, &FindResource{ID: &delete.ID})if err != nil {return errors.Wrap(err, "failed to get resource")}@@ -151,5 +151,5 @@ func (s *Store) DeleteResource(ctx context.Context, deleteResource *DeleteResour}}- return s.driver.DeleteResource(ctx, deleteResource)+ return s.driver.DeleteResource(ctx, delete)}