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: update linter config

Browse Source
This commit is contained in:
Johnny
2025-02-24 22:21:07 +08:00
parent f98c519834
commit 9107a941ca
6 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.golangci.yaml
View File

@@ -71,6 +71,8 @@ linters-settings:
disabled: true
- name: max-control-nesting
disabled: true
- name: redefines-builtin-id
disabled: true
gocritic:
disabled-checks:
- ifElseChain

4
internal/util/util.go
View File

@@ -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 slice

14
plugin/cron/parser.go
View File

@@ -173,24 +173,24 @@ func normalizeFields(fields []string, options ParseOption) ([]string, error) {
}
// Figure out how many fields we need
maximumValue := 0
max := 0
for _, 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 default

6
store/idp.go
View File

@@ -131,13 +131,13 @@ func (s *Store) UpdateIdentityProvider(ctx context.Context, update *UpdateIdenti
return 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
}

4
store/memo_relation.go
View File

@@ -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)
}

6
store/resource.go
View File

@@ -97,8 +97,8 @@ func (s *Store) UpdateResource(ctx context.Context, update *UpdateResource) erro
return 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)
}