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: update user setting names
Steven1c7fb77e0501
diff --git a/api/v1/auth.go b/api/v1/auth.goindex 625873ea0..24cbdcd82 100644--- a/api/v1/auth.go+++ b/api/v1/auth.go@@ -359,7 +359,7 @@ func (s *APIV1Service) UpsertAccessTokenToStore(ctx context.Context, user *storeDescription: "Account sign in",}userAccessTokens = append(userAccessTokens, &userAccessToken)- if _, err := s.Store.UpsertUserSettingV1(ctx, &storepb.UserSetting{+ if _, err := s.Store.UpsertUserSetting(ctx, &storepb.UserSetting{UserId: user.ID,Key: storepb.UserSettingKey_USER_SETTING_ACCESS_TOKENS,Value: &storepb.UserSetting_AccessTokens{diff --git a/api/v1/memo.go b/api/v1/memo.goindex 96c3ed071..f107924d5 100644--- a/api/v1/memo.go+++ b/api/v1/memo.go@@ -265,7 +265,7 @@ func (s *APIV1Service) CreateMemo(c echo.Context) error {}if createMemoRequest.Visibility == "" {- userMemoVisibilitySetting, err := s.Store.GetUserSettingV1(ctx, &store.FindUserSetting{+ userMemoVisibilitySetting, err := s.Store.GetUserSetting(ctx, &store.FindUserSetting{UserID: &userID,Key: storepb.UserSettingKey_USER_SETTING_MEMO_VISIBILITY,})@@ -389,7 +389,7 @@ func (s *APIV1Service) CreateMemo(c echo.Context) error {// Send notification to telegram if memo is not private.if memoResponse.Visibility != Private {// fetch all telegram UserID- userSettings, err := s.Store.ListUserSettingsV1(ctx, &store.FindUserSetting{Key: storepb.UserSettingKey_USER_SETTING_TELEGRAM_USER_ID})+ userSettings, err := s.Store.ListUserSettings(ctx, &store.FindUserSetting{Key: storepb.UserSettingKey_USER_SETTING_TELEGRAM_USER_ID})if err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to ListUserSettings").SetInternal(err)}diff --git a/api/v2/user_service.go b/api/v2/user_service.goindex 250c1c136..bc625125e 100644--- a/api/v2/user_service.go+++ b/api/v2/user_service.go@@ -201,7 +201,7 @@ func (s *APIV2Service) GetUserSetting(ctx context.Context, _ *apiv2pb.GetUserSetreturn nil, status.Errorf(codes.Internal, "failed to get current user: %v", err)}- userSettings, err := s.Store.ListUserSettingsV1(ctx, &store.FindUserSetting{+ userSettings, err := s.Store.ListUserSettings(ctx, &store.FindUserSetting{UserID: &user.ID,})if err != nil {@@ -236,7 +236,7 @@ func (s *APIV2Service) UpdateUserSetting(ctx context.Context, request *apiv2pb.Ufor _, field := range request.UpdateMask.Paths {if field == "locale" {- if _, err := s.Store.UpsertUserSettingV1(ctx, &storepb.UserSetting{+ if _, err := s.Store.UpsertUserSetting(ctx, &storepb.UserSetting{UserId: user.ID,Key: storepb.UserSettingKey_USER_SETTING_LOCALE,Value: &storepb.UserSetting_Locale{@@ -246,7 +246,7 @@ func (s *APIV2Service) UpdateUserSetting(ctx context.Context, request *apiv2pb.Ureturn nil, status.Errorf(codes.Internal, "failed to upsert user setting: %v", err)}} else if field == "appearance" {- if _, err := s.Store.UpsertUserSettingV1(ctx, &storepb.UserSetting{+ if _, err := s.Store.UpsertUserSetting(ctx, &storepb.UserSetting{UserId: user.ID,Key: storepb.UserSettingKey_USER_SETTING_APPEARANCE,Value: &storepb.UserSetting_Appearance{@@ -256,7 +256,7 @@ func (s *APIV2Service) UpdateUserSetting(ctx context.Context, request *apiv2pb.Ureturn nil, status.Errorf(codes.Internal, "failed to upsert user setting: %v", err)}} else if field == "memo_visibility" {- if _, err := s.Store.UpsertUserSettingV1(ctx, &storepb.UserSetting{+ if _, err := s.Store.UpsertUserSetting(ctx, &storepb.UserSetting{UserId: user.ID,Key: storepb.UserSettingKey_USER_SETTING_MEMO_VISIBILITY,Value: &storepb.UserSetting_MemoVisibility{@@ -266,7 +266,7 @@ func (s *APIV2Service) UpdateUserSetting(ctx context.Context, request *apiv2pb.Ureturn nil, status.Errorf(codes.Internal, "failed to upsert user setting: %v", err)}} else if field == "telegram_user_id" {- if _, err := s.Store.UpsertUserSettingV1(ctx, &storepb.UserSetting{+ if _, err := s.Store.UpsertUserSetting(ctx, &storepb.UserSetting{UserId: user.ID,Key: storepb.UserSettingKey_USER_SETTING_TELEGRAM_USER_ID,Value: &storepb.UserSetting_TelegramUserId{@@ -431,7 +431,7 @@ func (s *APIV2Service) DeleteUserAccessToken(ctx context.Context, request *apiv2}updatedUserAccessTokens = append(updatedUserAccessTokens, userAccessToken)}- if _, err := s.Store.UpsertUserSettingV1(ctx, &storepb.UserSetting{+ if _, err := s.Store.UpsertUserSetting(ctx, &storepb.UserSetting{UserId: user.ID,Key: storepb.UserSettingKey_USER_SETTING_ACCESS_TOKENS,Value: &storepb.UserSetting_AccessTokens{@@ -456,7 +456,7 @@ func (s *APIV2Service) UpsertAccessTokenToStore(ctx context.Context, user *storeDescription: description,}userAccessTokens = append(userAccessTokens, &userAccessToken)- if _, err := s.Store.UpsertUserSettingV1(ctx, &storepb.UserSetting{+ if _, err := s.Store.UpsertUserSetting(ctx, &storepb.UserSetting{UserId: user.ID,Key: storepb.UserSettingKey_USER_SETTING_ACCESS_TOKENS,Value: &storepb.UserSetting_AccessTokens{diff --git a/server/integration/telegram.go b/server/integration/telegram.goindex 4f036ccf9..142df9643 100644--- a/server/integration/telegram.go+++ b/server/integration/telegram.go@@ -39,7 +39,7 @@ func (t *TelegramHandler) MessageHandle(ctx context.Context, bot *telegram.Bot,}var creatorID int32- userSettingList, err := t.store.ListUserSettingsV1(ctx, &store.FindUserSetting{+ userSettingList, err := t.store.ListUserSettings(ctx, &store.FindUserSetting{Key: storepb.UserSettingKey_USER_SETTING_TELEGRAM_USER_ID,})if err != nil {diff --git a/store/user_setting.go b/store/user_setting.goindex 530f8500f..d8e85bf50 100644--- a/store/user_setting.go+++ b/store/user_setting.go@@ -11,7 +11,7 @@ type FindUserSetting struct {Key storepb.UserSettingKey}-func (s *Store) UpsertUserSettingV1(ctx context.Context, upsert *storepb.UserSetting) (*storepb.UserSetting, error) {+func (s *Store) UpsertUserSetting(ctx context.Context, upsert *storepb.UserSetting) (*storepb.UserSetting, error) {userSettingMessage, err := s.driver.UpsertUserSetting(ctx, upsert)if err != nil {return nil, err@@ -21,7 +21,7 @@ func (s *Store) UpsertUserSettingV1(ctx context.Context, upsert *storepb.UserSetreturn userSettingMessage, nil}-func (s *Store) ListUserSettingsV1(ctx context.Context, find *FindUserSetting) ([]*storepb.UserSetting, error) {+func (s *Store) ListUserSettings(ctx context.Context, find *FindUserSetting) ([]*storepb.UserSetting, error) {userSettingList, err := s.driver.ListUserSettings(ctx, find)if err != nil {return nil, err@@ -33,14 +33,14 @@ func (s *Store) ListUserSettingsV1(ctx context.Context, find *FindUserSetting) (return userSettingList, nil}-func (s *Store) GetUserSettingV1(ctx context.Context, find *FindUserSetting) (*storepb.UserSetting, error) {+func (s *Store) GetUserSetting(ctx context.Context, find *FindUserSetting) (*storepb.UserSetting, error) {if find.UserID != nil {if cache, ok := s.userSettingCache.Load(getUserSettingV1CacheKey(*find.UserID, find.Key.String())); ok {return cache.(*storepb.UserSetting), nil}}- list, err := s.ListUserSettingsV1(ctx, find)+ list, err := s.ListUserSettings(ctx, find)if err != nil {return nil, err}@@ -56,7 +56,7 @@ func (s *Store) GetUserSettingV1(ctx context.Context, find *FindUserSetting) (*s// GetUserAccessTokens returns the access tokens of the user.func (s *Store) GetUserAccessTokens(ctx context.Context, userID int32) ([]*storepb.AccessTokensUserSetting_AccessToken, error) {- userSetting, err := s.GetUserSettingV1(ctx, &FindUserSetting{+ userSetting, err := s.GetUserSetting(ctx, &FindUserSetting{UserID: &userID,Key: storepb.UserSettingKey_USER_SETTING_ACCESS_TOKENS,})@@ -85,7 +85,7 @@ func (s *Store) RemoveUserAccessToken(ctx context.Context, userID int32, token s}}- _, err = s.UpsertUserSettingV1(ctx, &storepb.UserSetting{+ _, err = s.UpsertUserSetting(ctx, &storepb.UserSetting{UserId: userID,Key: storepb.UserSettingKey_USER_SETTING_ACCESS_TOKENS,Value: &storepb.UserSetting_AccessTokens{diff --git a/test/store/user_setting_test.go b/test/store/user_setting_test.goindex b06dc3fb3..31fd68e7f 100644--- a/test/store/user_setting_test.go+++ b/test/store/user_setting_test.go@@ -15,13 +15,13 @@ func TestUserSettingStore(t *testing.T) {ts := NewTestingStore(ctx, t)user, err := createTestingHostUser(ctx, ts)require.NoError(t, err)- _, err = ts.UpsertUserSettingV1(ctx, &storepb.UserSetting{+ _, err = ts.UpsertUserSetting(ctx, &storepb.UserSetting{UserId: user.ID,Key: storepb.UserSettingKey_USER_SETTING_LOCALE,Value: &storepb.UserSetting_Locale{Locale: "en"},})require.NoError(t, err)- list, err := ts.ListUserSettingsV1(ctx, &store.FindUserSetting{})+ list, err := ts.ListUserSettings(ctx, &store.FindUserSetting{})require.NoError(t, err)require.Equal(t, 1, len(list))}