Skip to content

C
canifa_note
Commit d31d9eb7 authored by Steven's avatar Steven
Browse files
Options

chore: remove unused nil checks

parent f28b6540
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
api/v2/memo_service.go
View file @ d31d9eb7
...@@ -595,11 +595,8 @@ func (s *APIV2Service) getMemoDisplayWithUpdatedTsSettingValue(ctx context.Conte ...@@ -595,11 +595,8 @@ func (s *APIV2Service) getMemoDisplayWithUpdatedTsSettingValue(ctx context.Conte
} }
memoDisplayWithUpdatedTs := false memoDisplayWithUpdatedTs := false
if memoDisplayWithUpdatedTsSetting != nil { if err := json.Unmarshal([]byte(memoDisplayWithUpdatedTsSetting.Value), &memoDisplayWithUpdatedTs); err != nil {
err = json.Unmarshal([]byte(memoDisplayWithUpdatedTsSetting.Value), &memoDisplayWithUpdatedTs) return false, errors.Wrap(err, "failed to unmarshal system setting value")
if err != nil {
return false, errors.Wrap(err, "failed to unmarshal system setting value")
}
} }
return memoDisplayWithUpdatedTs, nil return memoDisplayWithUpdatedTs, nil
} }
...@@ -616,8 +613,7 @@ func (s *APIV2Service) getDisablePublicMemosSystemSettingValue(ctx context.Conte ...@@ -616,8 +613,7 @@ func (s *APIV2Service) getDisablePublicMemosSystemSettingValue(ctx context.Conte
} }
disablePublicMemos := false disablePublicMemos := false
err = json.Unmarshal([]byte(disablePublicMemosSystemSetting.Value), &disablePublicMemos) if err := json.Unmarshal([]byte(disablePublicMemosSystemSetting.Value), &disablePublicMemos); err != nil {
if err != nil {
return false, errors.Wrap(err, "failed to unmarshal system setting value") return false, errors.Wrap(err, "failed to unmarshal system setting value")
} }
return disablePublicMemos, nil return disablePublicMemos, nil
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment