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: fix user setting key checks
Steven087f60ba7b85
diff --git a/store/user_setting.go b/store/user_setting.goindex 072ac24c0..c82e6a9de 100644--- a/store/user_setting.go+++ b/store/user_setting.go@@ -34,6 +34,9 @@ func (s *Store) UpsertUserSetting(ctx context.Context, upsert *storepb.UserSettiif 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}