Commit f28b6540 authored by Steven's avatar Steven

chore: fix setting nil checks

parent 8738b68a
...@@ -590,6 +590,10 @@ func (s *APIV2Service) getMemoDisplayWithUpdatedTsSettingValue(ctx context.Conte ...@@ -590,6 +590,10 @@ func (s *APIV2Service) getMemoDisplayWithUpdatedTsSettingValue(ctx context.Conte
if err != nil { if err != nil {
return false, errors.Wrap(err, "failed to find system setting") return false, errors.Wrap(err, "failed to find system setting")
} }
if memoDisplayWithUpdatedTsSetting == nil {
return false, nil
}
memoDisplayWithUpdatedTs := false memoDisplayWithUpdatedTs := false
if memoDisplayWithUpdatedTsSetting != nil { if memoDisplayWithUpdatedTsSetting != nil {
err = json.Unmarshal([]byte(memoDisplayWithUpdatedTsSetting.Value), &memoDisplayWithUpdatedTs) err = json.Unmarshal([]byte(memoDisplayWithUpdatedTsSetting.Value), &memoDisplayWithUpdatedTs)
...@@ -607,6 +611,10 @@ func (s *APIV2Service) getDisablePublicMemosSystemSettingValue(ctx context.Conte ...@@ -607,6 +611,10 @@ func (s *APIV2Service) getDisablePublicMemosSystemSettingValue(ctx context.Conte
if err != nil { if err != nil {
return false, errors.Wrap(err, "failed to find system setting") return false, errors.Wrap(err, "failed to find system setting")
} }
if disablePublicMemosSystemSetting == nil {
return false, nil
}
disablePublicMemos := false disablePublicMemos := false
err = json.Unmarshal([]byte(disablePublicMemosSystemSetting.Value), &disablePublicMemos) err = json.Unmarshal([]byte(disablePublicMemosSystemSetting.Value), &disablePublicMemos)
if err != nil { if err != 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