mirror of
https://github.com/usememos/memos.git
synced 2025-06-05 22:09:59 +02:00
chore: tweak naming
This commit is contained in:
@@ -92,7 +92,7 @@ func (s *Store) GetUserSetting(ctx context.Context, find *FindUserSetting) (*sto
|
||||
func (s *Store) GetUserAccessTokens(ctx context.Context, userID int32) ([]*storepb.AccessTokensUserSetting_AccessToken, error) {
|
||||
userSetting, err := s.GetUserSetting(ctx, &FindUserSetting{
|
||||
UserID: &userID,
|
||||
Key: storepb.UserSettingKey_USER_SETTING_ACCESS_TOKENS,
|
||||
Key: storepb.UserSettingKey_ACCESS_TOKENS,
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -121,7 +121,7 @@ func (s *Store) RemoveUserAccessToken(ctx context.Context, userID int32, token s
|
||||
|
||||
_, err = s.UpsertUserSetting(ctx, &storepb.UserSetting{
|
||||
UserId: userID,
|
||||
Key: storepb.UserSettingKey_USER_SETTING_ACCESS_TOKENS,
|
||||
Key: storepb.UserSettingKey_ACCESS_TOKENS,
|
||||
Value: &storepb.UserSetting_AccessTokens{
|
||||
AccessTokens: &storepb.AccessTokensUserSetting{
|
||||
AccessTokens: newAccessTokens,
|
||||
@@ -139,17 +139,17 @@ func convertUserSettingFromRaw(raw *UserSetting) (*storepb.UserSetting, error) {
|
||||
}
|
||||
|
||||
switch raw.Key {
|
||||
case storepb.UserSettingKey_USER_SETTING_ACCESS_TOKENS:
|
||||
case storepb.UserSettingKey_ACCESS_TOKENS:
|
||||
accessTokensUserSetting := &storepb.AccessTokensUserSetting{}
|
||||
if err := protojsonUnmarshaler.Unmarshal([]byte(raw.Value), accessTokensUserSetting); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
userSetting.Value = &storepb.UserSetting_AccessTokens{AccessTokens: accessTokensUserSetting}
|
||||
case storepb.UserSettingKey_USER_SETTING_LOCALE:
|
||||
case storepb.UserSettingKey_LOCALE:
|
||||
userSetting.Value = &storepb.UserSetting_Locale{Locale: raw.Value}
|
||||
case storepb.UserSettingKey_USER_SETTING_APPEARANCE:
|
||||
case storepb.UserSettingKey_APPEARANCE:
|
||||
userSetting.Value = &storepb.UserSetting_Appearance{Appearance: raw.Value}
|
||||
case storepb.UserSettingKey_USER_SETTING_MEMO_VISIBILITY:
|
||||
case storepb.UserSettingKey_MEMO_VISIBILITY:
|
||||
userSetting.Value = &storepb.UserSetting_MemoVisibility{MemoVisibility: raw.Value}
|
||||
default:
|
||||
return nil, nil
|
||||
@@ -164,18 +164,18 @@ func convertUserSettingToRaw(userSetting *storepb.UserSetting) (*UserSetting, er
|
||||
}
|
||||
|
||||
switch userSetting.Key {
|
||||
case storepb.UserSettingKey_USER_SETTING_ACCESS_TOKENS:
|
||||
case storepb.UserSettingKey_ACCESS_TOKENS:
|
||||
accessTokensUserSetting := userSetting.GetAccessTokens()
|
||||
value, err := protojson.Marshal(accessTokensUserSetting)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
raw.Value = string(value)
|
||||
case storepb.UserSettingKey_USER_SETTING_LOCALE:
|
||||
case storepb.UserSettingKey_LOCALE:
|
||||
raw.Value = userSetting.GetLocale()
|
||||
case storepb.UserSettingKey_USER_SETTING_APPEARANCE:
|
||||
case storepb.UserSettingKey_APPEARANCE:
|
||||
raw.Value = userSetting.GetAppearance()
|
||||
case storepb.UserSettingKey_USER_SETTING_MEMO_VISIBILITY:
|
||||
case storepb.UserSettingKey_MEMO_VISIBILITY:
|
||||
raw.Value = userSetting.GetMemoVisibility()
|
||||
default:
|
||||
return nil, errors.Errorf("unsupported user setting key: %v", userSetting.Key)
|
||||
|
Reference in New Issue
Block a user