YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove default visibility in workspace setting

Browse Source
This commit is contained in:
johnnyjoy
2025-02-08 11:40:31 +08:00
parent 9957f8e290
commit 13f6fa7b37
27 changed files with 100 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/router/api/v1/user_service.go
View File

@@ -254,15 +254,11 @@ func (s *APIV1Service) DeleteUser(ctx context.Context, request *v1pb.DeleteUserR
return &emptypb.Empty{}, nil
}
func getDefaultUserSetting(workspaceMemoRelatedSetting *storepb.WorkspaceMemoRelatedSetting) *v1pb.UserSetting {
defaultVisibility := "PRIVATE"
if workspaceMemoRelatedSetting.DefaultVisibility != "" {
defaultVisibility = workspaceMemoRelatedSetting.DefaultVisibility
}
func getDefaultUserSetting() *v1pb.UserSetting {
return &v1pb.UserSetting{
Locale: "en",
Appearance: "system",
MemoVisibility: defaultVisibility,
MemoVisibility: "PRIVATE",
}
}
@@ -272,19 +268,13 @@ func (s *APIV1Service) GetUserSetting(ctx context.Context, _ *v1pb.GetUserSettin
return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err)
}
workspaceMemoRelatedSetting, err := s.Store.GetWorkspaceMemoRelatedSetting(ctx)
if err != nil {
return nil, status.Errorf(codes.Internal, "failed to get workspace general setting: %v", err)
}
userSettings, err := s.Store.ListUserSettings(ctx, &store.FindUserSetting{
UserID: &user.ID,
})
if err != nil {
return nil, status.Errorf(codes.Internal, "failed to list user settings: %v", err)
}
// getDefaultUserSetting By workspaceSetting
userSettingMessage := getDefaultUserSetting(workspaceMemoRelatedSetting)
userSettingMessage := getDefaultUserSetting()
for _, setting := range userSettings {
if setting.Key == storepb.UserSettingKey_LOCALE {
userSettingMessage.Locale = setting.GetLocale()