From 087f60ba7b85e40fee1c909274232aa4e108037b Mon Sep 17 00:00:00 2001 From: Steven Date: Sat, 11 May 2024 21:14:21 +0800 Subject: [PATCH] chore: fix user setting key checks --- store/user_setting.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/store/user_setting.go b/store/user_setting.go index 072ac24c..c82e6a9d 100644 --- a/store/user_setting.go +++ b/store/user_setting.go @@ -34,6 +34,9 @@ func (s *Store) UpsertUserSetting(ctx context.Context, upsert *storepb.UserSetti if err != nil { return nil, err } + if userSetting == nil { + return nil, errors.New("unexpected nil user setting") + } s.userSettingCache.Store(getUserSettingCacheKey(userSetting.UserId, userSetting.Key.String()), userSetting) return userSetting, nil } @@ -50,6 +53,9 @@ func (s *Store) ListUserSettings(ctx context.Context, find *FindUserSetting) ([] if err != nil { return nil, err } + if userSetting == nil { + continue + } s.userSettingCache.Store(getUserSettingCacheKey(userSetting.UserId, userSetting.Key.String()), userSetting) userSettings = append(userSettings, userSetting) } @@ -143,7 +149,7 @@ func convertUserSettingFromRaw(raw *UserSetting) (*storepb.UserSetting, error) { case storepb.UserSettingKey_USER_SETTING_MEMO_VISIBILITY: userSetting.Value = &storepb.UserSetting_MemoVisibility{MemoVisibility: raw.Value} default: - return nil, errors.Errorf("unsupported user setting key: %v", raw.Key) + return nil, nil } return userSetting, nil }