diff --git a/proto/api/user_service.proto b/proto/api/user_service.proto index bd9d1ae04..5efde1117 100644 --- a/proto/api/user_service.proto +++ b/proto/api/user_service.proto @@ -486,6 +486,9 @@ message UserSetting { // The value of the TAGS setting. TagsSetting tags_setting = 4; + + // The value of the EDITOR setting. + EditorSetting editor_setting = 5; } // Key identifies a user setting. @@ -497,6 +500,8 @@ message UserSetting { WEBHOOKS = 2; // Per-user tag metadata. TAGS = 3; + // Memo editor preferences. + EDITOR = 4; } // GeneralSetting holds general user preferences. @@ -539,6 +544,14 @@ message UserSetting { // Optional. Whether memos with this tag have their content blurred. bool blur_content = 2 [(google.api.field_behavior) = OPTIONAL]; } + + // EditorSetting holds the user's memo editor preferences. + message EditorSetting { + // Optional. Whether the official client's memo editor uses source mode, + // which shows and edits memos as Markdown text instead of formatted text. + // The official client calls this "Markdown mode". + bool source_mode = 1 [(google.api.field_behavior) = OPTIONAL]; + } } // Request message for UserService.ListUserSettings. diff --git a/proto/gen/api/user_service.pb.go b/proto/gen/api/user_service.pb.go index a7d82b2c9..10e5214a4 100644 --- a/proto/gen/api/user_service.pb.go +++ b/proto/gen/api/user_service.pb.go @@ -90,6 +90,8 @@ const ( UserSetting_WEBHOOKS UserSetting_Key = 2 // Per-user tag metadata. UserSetting_TAGS UserSetting_Key = 3 + // Memo editor preferences. + UserSetting_EDITOR UserSetting_Key = 4 ) // Enum value maps for UserSetting_Key. @@ -99,12 +101,14 @@ var ( 1: "GENERAL", 2: "WEBHOOKS", 3: "TAGS", + 4: "EDITOR", } UserSetting_Key_value = map[string]int32{ "KEY_UNSPECIFIED": 0, "GENERAL": 1, "WEBHOOKS": 2, "TAGS": 3, + "EDITOR": 4, } ) @@ -989,6 +993,7 @@ type UserSetting struct { // *UserSetting_GeneralSetting_ // *UserSetting_WebhooksSetting_ // *UserSetting_TagsSetting_ + // *UserSetting_EditorSetting_ Value isUserSetting_Value `protobuf_oneof:"value"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache @@ -1065,6 +1070,15 @@ func (x *UserSetting) GetTagsSetting() *UserSetting_TagsSetting { return nil } +func (x *UserSetting) GetEditorSetting() *UserSetting_EditorSetting { + if x != nil { + if x, ok := x.Value.(*UserSetting_EditorSetting_); ok { + return x.EditorSetting + } + } + return nil +} + type isUserSetting_Value interface { isUserSetting_Value() } @@ -1084,12 +1098,19 @@ type UserSetting_TagsSetting_ struct { TagsSetting *UserSetting_TagsSetting `protobuf:"bytes,4,opt,name=tags_setting,json=tagsSetting,proto3,oneof"` } +type UserSetting_EditorSetting_ struct { + // The value of the EDITOR setting. + EditorSetting *UserSetting_EditorSetting `protobuf:"bytes,5,opt,name=editor_setting,json=editorSetting,proto3,oneof"` +} + func (*UserSetting_GeneralSetting_) isUserSetting_Value() {} func (*UserSetting_WebhooksSetting_) isUserSetting_Value() {} func (*UserSetting_TagsSetting_) isUserSetting_Value() {} +func (*UserSetting_EditorSetting_) isUserSetting_Value() {} + // Request message for UserService.ListUserSettings. type ListUserSettingsRequest struct { state protoimpl.MessageState `protogen:"open.v1"` @@ -4526,6 +4547,54 @@ func (x *UserSetting_TagMetadata) GetBlurContent() bool { return false } +// EditorSetting holds the user's memo editor preferences. +type UserSetting_EditorSetting struct { + state protoimpl.MessageState `protogen:"open.v1"` + // Optional. Whether the official client's memo editor uses source mode, + // which shows and edits memos as Markdown text instead of formatted text. + // The official client calls this "Markdown mode". + SourceMode bool `protobuf:"varint,1,opt,name=source_mode,json=sourceMode,proto3" json:"source_mode,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *UserSetting_EditorSetting) Reset() { + *x = UserSetting_EditorSetting{} + mi := &file_api_user_service_proto_msgTypes[63] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UserSetting_EditorSetting) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UserSetting_EditorSetting) ProtoMessage() {} + +func (x *UserSetting_EditorSetting) ProtoReflect() protoreflect.Message { + mi := &file_api_user_service_proto_msgTypes[63] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UserSetting_EditorSetting.ProtoReflect.Descriptor instead. +func (*UserSetting_EditorSetting) Descriptor() ([]byte, []int) { + return file_api_user_service_proto_rawDescGZIP(), []int{9, 4} +} + +func (x *UserSetting_EditorSetting) GetSourceMode() bool { + if x != nil { + return x.SourceMode + } + return false +} + // MemoTypeStats counts memos by the kind of content they contain. type UserStats_MemoTypeStats struct { state protoimpl.MessageState `protogen:"open.v1"` @@ -4543,7 +4612,7 @@ type UserStats_MemoTypeStats struct { func (x *UserStats_MemoTypeStats) Reset() { *x = UserStats_MemoTypeStats{} - mi := &file_api_user_service_proto_msgTypes[65] + mi := &file_api_user_service_proto_msgTypes[66] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4555,7 +4624,7 @@ func (x *UserStats_MemoTypeStats) String() string { func (*UserStats_MemoTypeStats) ProtoMessage() {} func (x *UserStats_MemoTypeStats) ProtoReflect() protoreflect.Message { - mi := &file_api_user_service_proto_msgTypes[65] + mi := &file_api_user_service_proto_msgTypes[66] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4616,7 +4685,7 @@ type UserUsage_Limits struct { func (x *UserUsage_Limits) Reset() { *x = UserUsage_Limits{} - mi := &file_api_user_service_proto_msgTypes[66] + mi := &file_api_user_service_proto_msgTypes[67] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4628,7 +4697,7 @@ func (x *UserUsage_Limits) String() string { func (*UserUsage_Limits) ProtoMessage() {} func (x *UserUsage_Limits) ProtoReflect() protoreflect.Message { - mi := &file_api_user_service_proto_msgTypes[66] + mi := &file_api_user_service_proto_msgTypes[67] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4688,7 +4757,7 @@ type MemoView_Icon struct { func (x *MemoView_Icon) Reset() { *x = MemoView_Icon{} - mi := &file_api_user_service_proto_msgTypes[67] + mi := &file_api_user_service_proto_msgTypes[68] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4700,7 +4769,7 @@ func (x *MemoView_Icon) String() string { func (*MemoView_Icon) ProtoMessage() {} func (x *MemoView_Icon) ProtoReflect() protoreflect.Message { - mi := &file_api_user_service_proto_msgTypes[67] + mi := &file_api_user_service_proto_msgTypes[68] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4778,7 +4847,7 @@ type UserNotification_MemoCommentPayload struct { func (x *UserNotification_MemoCommentPayload) Reset() { *x = UserNotification_MemoCommentPayload{} - mi := &file_api_user_service_proto_msgTypes[68] + mi := &file_api_user_service_proto_msgTypes[69] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4790,7 +4859,7 @@ func (x *UserNotification_MemoCommentPayload) String() string { func (*UserNotification_MemoCommentPayload) ProtoMessage() {} func (x *UserNotification_MemoCommentPayload) ProtoReflect() protoreflect.Message { - mi := &file_api_user_service_proto_msgTypes[68] + mi := &file_api_user_service_proto_msgTypes[69] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4853,7 +4922,7 @@ type UserNotification_MemoMentionPayload struct { func (x *UserNotification_MemoMentionPayload) Reset() { *x = UserNotification_MemoMentionPayload{} - mi := &file_api_user_service_proto_msgTypes[69] + mi := &file_api_user_service_proto_msgTypes[70] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4865,7 +4934,7 @@ func (x *UserNotification_MemoMentionPayload) String() string { func (*UserNotification_MemoMentionPayload) ProtoMessage() {} func (x *UserNotification_MemoMentionPayload) ProtoReflect() protoreflect.Message { - mi := &file_api_user_service_proto_msgTypes[69] + mi := &file_api_user_service_proto_msgTypes[70] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4928,7 +4997,7 @@ type UserNotification_SpaceInvitationPayload struct { func (x *UserNotification_SpaceInvitationPayload) Reset() { *x = UserNotification_SpaceInvitationPayload{} - mi := &file_api_user_service_proto_msgTypes[70] + mi := &file_api_user_service_proto_msgTypes[71] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4940,7 +5009,7 @@ func (x *UserNotification_SpaceInvitationPayload) String() string { func (*UserNotification_SpaceInvitationPayload) ProtoMessage() {} func (x *UserNotification_SpaceInvitationPayload) ProtoReflect() protoreflect.Message { - mi := &file_api_user_service_proto_msgTypes[70] + mi := &file_api_user_service_proto_msgTypes[71] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5042,12 +5111,13 @@ const file_api_user_service_proto_rawDesc = "" + "\x11DeleteUserRequest\x12*\n" + "\x04name\x18\x01 \x01(\tB\x16\xe0A\x02\xfaA\x10\n" + "\x0ememos.api/UserR\x04name\x12\x19\n" + - "\x05force\x18\x02 \x01(\bB\x03\xe0A\x01R\x05force\"\xdc\a\n" + + "\x05force\x18\x02 \x01(\bB\x03\xe0A\x01R\x05force\"\xee\b\n" + "\vUserSetting\x12\x17\n" + "\x04name\x18\x01 \x01(\tB\x03\xe0A\bR\x04name\x12P\n" + "\x0fgeneral_setting\x18\x02 \x01(\v2%.memos.api.UserSetting.GeneralSettingH\x00R\x0egeneralSetting\x12S\n" + "\x10webhooks_setting\x18\x03 \x01(\v2&.memos.api.UserSetting.WebhooksSettingH\x00R\x0fwebhooksSetting\x12G\n" + - "\ftags_setting\x18\x04 \x01(\v2\".memos.api.UserSetting.TagsSettingH\x00R\vtagsSetting\x1a\xab\x01\n" + + "\ftags_setting\x18\x04 \x01(\v2\".memos.api.UserSetting.TagsSettingH\x00R\vtagsSetting\x12M\n" + + "\x0eeditor_setting\x18\x05 \x01(\v2$.memos.api.UserSetting.EditorSettingH\x00R\reditorSetting\x1a\xab\x01\n" + "\x0eGeneralSetting\x12\x1b\n" + "\x06locale\x18\x01 \x01(\tB\x03\xe0A\x01R\x06locale\x12,\n" + "\x0fmemo_visibility\x18\x02 \x01(\tB\x03\xe0A\x01R\x0ememoVisibility\x12\x19\n" + @@ -5062,12 +5132,17 @@ const file_api_user_service_proto_rawDesc = "" + "\x05value\x18\x02 \x01(\v2\".memos.api.UserSetting.TagMetadataR\x05value:\x028\x01\x1ay\n" + "\vTagMetadata\x12B\n" + "\x10background_color\x18\x01 \x01(\v2\x12.google.type.ColorB\x03\xe0A\x01R\x0fbackgroundColor\x12&\n" + - "\fblur_content\x18\x02 \x01(\bB\x03\xe0A\x01R\vblurContent\"?\n" + + "\fblur_content\x18\x02 \x01(\bB\x03\xe0A\x01R\vblurContent\x1a5\n" + + "\rEditorSetting\x12$\n" + + "\vsource_mode\x18\x01 \x01(\bB\x03\xe0A\x01R\n" + + "sourceMode\"K\n" + "\x03Key\x12\x13\n" + "\x0fKEY_UNSPECIFIED\x10\x00\x12\v\n" + "\aGENERAL\x10\x01\x12\f\n" + "\bWEBHOOKS\x10\x02\x12\b\n" + - "\x04TAGS\x10\x03:V\xeaAS\n" + + "\x04TAGS\x10\x03\x12\n" + + "\n" + + "\x06EDITOR\x10\x04:V\xeaAS\n" + "\x15memos.api/UserSetting\x12\x1fusers/{user}/settings/{setting}*\fuserSettings2\vuserSettingB\a\n" + "\x05value\"\x8f\x01\n" + "\x17ListUserSettingsRequest\x12.\n" + @@ -5427,7 +5502,7 @@ func file_api_user_service_proto_rawDescGZIP() []byte { } var file_api_user_service_proto_enumTypes = make([]protoimpl.EnumInfo, 6) -var file_api_user_service_proto_msgTypes = make([]protoimpl.MessageInfo, 71) +var file_api_user_service_proto_msgTypes = make([]protoimpl.MessageInfo, 72) var file_api_user_service_proto_goTypes = []any{ (User_Role)(0), // 0: memos.api.User.Role (UserSetting_Key)(0), // 1: memos.api.UserSetting.Key @@ -5498,162 +5573,164 @@ var file_api_user_service_proto_goTypes = []any{ (*UserSetting_WebhooksSetting)(nil), // 66: memos.api.UserSetting.WebhooksSetting (*UserSetting_TagsSetting)(nil), // 67: memos.api.UserSetting.TagsSetting (*UserSetting_TagMetadata)(nil), // 68: memos.api.UserSetting.TagMetadata - nil, // 69: memos.api.UserSetting.TagsSetting.TagsEntry - nil, // 70: memos.api.UserStats.TagCountsEntry - (*UserStats_MemoTypeStats)(nil), // 71: memos.api.UserStats.MemoTypeStats - (*UserUsage_Limits)(nil), // 72: memos.api.UserUsage.Limits - (*MemoView_Icon)(nil), // 73: memos.api.MemoView.Icon - (*UserNotification_MemoCommentPayload)(nil), // 74: memos.api.UserNotification.MemoCommentPayload - (*UserNotification_MemoMentionPayload)(nil), // 75: memos.api.UserNotification.MemoMentionPayload - (*UserNotification_SpaceInvitationPayload)(nil), // 76: memos.api.UserNotification.SpaceInvitationPayload - (State)(0), // 77: memos.api.State - (*timestamppb.Timestamp)(nil), // 78: google.protobuf.Timestamp - (*fieldmaskpb.FieldMask)(nil), // 79: google.protobuf.FieldMask - (*color.Color)(nil), // 80: google.type.Color - (*Space)(nil), // 81: memos.api.Space - (SpaceMember_Role)(0), // 82: memos.api.SpaceMember.Role - (*emptypb.Empty)(nil), // 83: google.protobuf.Empty - (*httpbody.HttpBody)(nil), // 84: google.api.HttpBody + (*UserSetting_EditorSetting)(nil), // 69: memos.api.UserSetting.EditorSetting + nil, // 70: memos.api.UserSetting.TagsSetting.TagsEntry + nil, // 71: memos.api.UserStats.TagCountsEntry + (*UserStats_MemoTypeStats)(nil), // 72: memos.api.UserStats.MemoTypeStats + (*UserUsage_Limits)(nil), // 73: memos.api.UserUsage.Limits + (*MemoView_Icon)(nil), // 74: memos.api.MemoView.Icon + (*UserNotification_MemoCommentPayload)(nil), // 75: memos.api.UserNotification.MemoCommentPayload + (*UserNotification_MemoMentionPayload)(nil), // 76: memos.api.UserNotification.MemoMentionPayload + (*UserNotification_SpaceInvitationPayload)(nil), // 77: memos.api.UserNotification.SpaceInvitationPayload + (State)(0), // 78: memos.api.State + (*timestamppb.Timestamp)(nil), // 79: google.protobuf.Timestamp + (*fieldmaskpb.FieldMask)(nil), // 80: google.protobuf.FieldMask + (*color.Color)(nil), // 81: google.type.Color + (*Space)(nil), // 82: memos.api.Space + (SpaceMember_Role)(0), // 83: memos.api.SpaceMember.Role + (*emptypb.Empty)(nil), // 84: google.protobuf.Empty + (*httpbody.HttpBody)(nil), // 85: google.api.HttpBody } var file_api_user_service_proto_depIdxs = []int32{ - 0, // 0: memos.api.User.role:type_name -> memos.api.User.Role - 77, // 1: memos.api.User.state:type_name -> memos.api.State - 78, // 2: memos.api.User.create_time:type_name -> google.protobuf.Timestamp - 78, // 3: memos.api.User.update_time:type_name -> google.protobuf.Timestamp - 6, // 4: memos.api.ListUsersResponse.users:type_name -> memos.api.User - 79, // 5: memos.api.GetUserRequest.read_mask:type_name -> google.protobuf.FieldMask - 6, // 6: memos.api.BatchGetUsersResponse.users:type_name -> memos.api.User - 6, // 7: memos.api.CreateUserRequest.user:type_name -> memos.api.User - 6, // 8: memos.api.UpdateUserRequest.user:type_name -> memos.api.User - 79, // 9: memos.api.UpdateUserRequest.update_mask:type_name -> google.protobuf.FieldMask - 65, // 10: memos.api.UserSetting.general_setting:type_name -> memos.api.UserSetting.GeneralSetting - 66, // 11: memos.api.UserSetting.webhooks_setting:type_name -> memos.api.UserSetting.WebhooksSetting - 67, // 12: memos.api.UserSetting.tags_setting:type_name -> memos.api.UserSetting.TagsSetting - 15, // 13: memos.api.ListUserSettingsResponse.user_settings:type_name -> memos.api.UserSetting - 15, // 14: memos.api.UpdateUserSettingRequest.user_setting:type_name -> memos.api.UserSetting - 79, // 15: memos.api.UpdateUserSettingRequest.update_mask:type_name -> google.protobuf.FieldMask - 71, // 16: memos.api.UserStats.memo_type_stats:type_name -> memos.api.UserStats.MemoTypeStats - 70, // 17: memos.api.UserStats.tag_counts:type_name -> memos.api.UserStats.TagCountsEntry - 78, // 18: memos.api.UserStats.memo_created_timestamps:type_name -> google.protobuf.Timestamp - 78, // 19: memos.api.UserStats.memo_updated_timestamps:type_name -> google.protobuf.Timestamp - 77, // 20: memos.api.ListUserStatsRequest.state:type_name -> memos.api.State - 20, // 21: memos.api.ListUserStatsResponse.user_stats:type_name -> memos.api.UserStats - 72, // 22: memos.api.UserUsage.limits:type_name -> memos.api.UserUsage.Limits - 73, // 23: memos.api.MemoView.icon:type_name -> memos.api.MemoView.Icon - 26, // 24: memos.api.ListMemoViewsResponse.memo_views:type_name -> memos.api.MemoView - 26, // 25: memos.api.CreateMemoViewRequest.memo_view:type_name -> memos.api.MemoView - 26, // 26: memos.api.UpdateMemoViewRequest.memo_view:type_name -> memos.api.MemoView - 79, // 27: memos.api.UpdateMemoViewRequest.update_mask:type_name -> google.protobuf.FieldMask - 6, // 28: memos.api.UserNotification.sender_user:type_name -> memos.api.User - 3, // 29: memos.api.UserNotification.type:type_name -> memos.api.UserNotification.Type - 74, // 30: memos.api.UserNotification.memo_comment:type_name -> memos.api.UserNotification.MemoCommentPayload - 75, // 31: memos.api.UserNotification.memo_mention:type_name -> memos.api.UserNotification.MemoMentionPayload - 76, // 32: memos.api.UserNotification.space_invitation:type_name -> memos.api.UserNotification.SpaceInvitationPayload - 2, // 33: memos.api.UserNotification.status:type_name -> memos.api.UserNotification.Status - 78, // 34: memos.api.UserNotification.create_time:type_name -> google.protobuf.Timestamp - 33, // 35: memos.api.ListUserNotificationsResponse.notifications:type_name -> memos.api.UserNotification - 33, // 36: memos.api.UpdateUserNotificationRequest.notification:type_name -> memos.api.UserNotification - 79, // 37: memos.api.UpdateUserNotificationRequest.update_mask:type_name -> google.protobuf.FieldMask - 78, // 38: memos.api.UserWebhook.create_time:type_name -> google.protobuf.Timestamp - 78, // 39: memos.api.UserWebhook.update_time:type_name -> google.protobuf.Timestamp - 38, // 40: memos.api.ListUserWebhooksResponse.webhooks:type_name -> memos.api.UserWebhook - 38, // 41: memos.api.CreateUserWebhookRequest.webhook:type_name -> memos.api.UserWebhook - 38, // 42: memos.api.UpdateUserWebhookRequest.webhook:type_name -> memos.api.UserWebhook - 79, // 43: memos.api.UpdateUserWebhookRequest.update_mask:type_name -> google.protobuf.FieldMask - 46, // 44: memos.api.ListLinkedIdentitiesResponse.linked_identities:type_name -> memos.api.LinkedIdentity - 78, // 45: memos.api.PersonalAccessToken.create_time:type_name -> google.protobuf.Timestamp - 78, // 46: memos.api.PersonalAccessToken.expire_time:type_name -> google.protobuf.Timestamp - 78, // 47: memos.api.PersonalAccessToken.last_use_time:type_name -> google.protobuf.Timestamp - 52, // 48: memos.api.ListPersonalAccessTokensResponse.personal_access_tokens:type_name -> memos.api.PersonalAccessToken - 52, // 49: memos.api.CreatePersonalAccessTokenResponse.personal_access_token:type_name -> memos.api.PersonalAccessToken - 61, // 50: memos.api.ImportMemosRequest.spec:type_name -> memos.api.ImportMemosSpec - 5, // 51: memos.api.ImportMemosRequest.conflict_policy:type_name -> memos.api.ImportMemosRequest.ConflictPolicy - 62, // 52: memos.api.ImportMemosResponse.plan:type_name -> memos.api.ImportMemosPlan - 63, // 53: memos.api.ImportMemosResponse.report:type_name -> memos.api.ImportMemosReport - 78, // 54: memos.api.ImportMemosPlan.export_time:type_name -> google.protobuf.Timestamp - 64, // 55: memos.api.ImportMemosPlan.warnings:type_name -> memos.api.ImportMemosIssue - 64, // 56: memos.api.ImportMemosReport.warnings:type_name -> memos.api.ImportMemosIssue - 64, // 57: memos.api.ImportMemosReport.failures:type_name -> memos.api.ImportMemosIssue - 38, // 58: memos.api.UserSetting.WebhooksSetting.webhooks:type_name -> memos.api.UserWebhook - 69, // 59: memos.api.UserSetting.TagsSetting.tags:type_name -> memos.api.UserSetting.TagsSetting.TagsEntry - 80, // 60: memos.api.UserSetting.TagMetadata.background_color:type_name -> google.type.Color - 68, // 61: memos.api.UserSetting.TagsSetting.TagsEntry.value:type_name -> memos.api.UserSetting.TagMetadata - 81, // 62: memos.api.UserNotification.SpaceInvitationPayload.space:type_name -> memos.api.Space - 82, // 63: memos.api.UserNotification.SpaceInvitationPayload.role:type_name -> memos.api.SpaceMember.Role - 4, // 64: memos.api.UserNotification.SpaceInvitationPayload.state:type_name -> memos.api.UserNotification.SpaceInvitationPayload.InvitationState - 7, // 65: memos.api.UserService.ListUsers:input_type -> memos.api.ListUsersRequest - 9, // 66: memos.api.UserService.GetUser:input_type -> memos.api.GetUserRequest - 10, // 67: memos.api.UserService.BatchGetUsers:input_type -> memos.api.BatchGetUsersRequest - 12, // 68: memos.api.UserService.CreateUser:input_type -> memos.api.CreateUserRequest - 13, // 69: memos.api.UserService.UpdateUser:input_type -> memos.api.UpdateUserRequest - 14, // 70: memos.api.UserService.DeleteUser:input_type -> memos.api.DeleteUserRequest - 16, // 71: memos.api.UserService.ListUserSettings:input_type -> memos.api.ListUserSettingsRequest - 18, // 72: memos.api.UserService.GetUserSetting:input_type -> memos.api.GetUserSettingRequest - 19, // 73: memos.api.UserService.UpdateUserSetting:input_type -> memos.api.UpdateUserSettingRequest - 21, // 74: memos.api.UserService.ListUserStats:input_type -> memos.api.ListUserStatsRequest - 23, // 75: memos.api.UserService.GetUserStats:input_type -> memos.api.GetUserStatsRequest - 25, // 76: memos.api.UserService.GetUserUsage:input_type -> memos.api.GetUserUsageRequest - 27, // 77: memos.api.UserService.ListMemoViews:input_type -> memos.api.ListMemoViewsRequest - 29, // 78: memos.api.UserService.GetMemoView:input_type -> memos.api.GetMemoViewRequest - 30, // 79: memos.api.UserService.CreateMemoView:input_type -> memos.api.CreateMemoViewRequest - 31, // 80: memos.api.UserService.UpdateMemoView:input_type -> memos.api.UpdateMemoViewRequest - 32, // 81: memos.api.UserService.DeleteMemoView:input_type -> memos.api.DeleteMemoViewRequest - 34, // 82: memos.api.UserService.ListUserNotifications:input_type -> memos.api.ListUserNotificationsRequest - 36, // 83: memos.api.UserService.UpdateUserNotification:input_type -> memos.api.UpdateUserNotificationRequest - 37, // 84: memos.api.UserService.DeleteUserNotification:input_type -> memos.api.DeleteUserNotificationRequest - 39, // 85: memos.api.UserService.ListUserWebhooks:input_type -> memos.api.ListUserWebhooksRequest - 41, // 86: memos.api.UserService.CreateUserWebhook:input_type -> memos.api.CreateUserWebhookRequest - 42, // 87: memos.api.UserService.UpdateUserWebhook:input_type -> memos.api.UpdateUserWebhookRequest - 43, // 88: memos.api.UserService.DeleteUserWebhook:input_type -> memos.api.DeleteUserWebhookRequest - 44, // 89: memos.api.UserService.GetUserWebhookSigningSecret:input_type -> memos.api.GetUserWebhookSigningSecretRequest - 47, // 90: memos.api.UserService.ListLinkedIdentities:input_type -> memos.api.ListLinkedIdentitiesRequest - 49, // 91: memos.api.UserService.GetLinkedIdentity:input_type -> memos.api.GetLinkedIdentityRequest - 50, // 92: memos.api.UserService.CreateLinkedIdentity:input_type -> memos.api.CreateLinkedIdentityRequest - 51, // 93: memos.api.UserService.DeleteLinkedIdentity:input_type -> memos.api.DeleteLinkedIdentityRequest - 53, // 94: memos.api.UserService.ListPersonalAccessTokens:input_type -> memos.api.ListPersonalAccessTokensRequest - 55, // 95: memos.api.UserService.CreatePersonalAccessToken:input_type -> memos.api.CreatePersonalAccessTokenRequest - 57, // 96: memos.api.UserService.DeletePersonalAccessToken:input_type -> memos.api.DeletePersonalAccessTokenRequest - 58, // 97: memos.api.UserService.ExportMemos:input_type -> memos.api.ExportMemosRequest - 59, // 98: memos.api.UserService.ImportMemos:input_type -> memos.api.ImportMemosRequest - 8, // 99: memos.api.UserService.ListUsers:output_type -> memos.api.ListUsersResponse - 6, // 100: memos.api.UserService.GetUser:output_type -> memos.api.User - 11, // 101: memos.api.UserService.BatchGetUsers:output_type -> memos.api.BatchGetUsersResponse - 6, // 102: memos.api.UserService.CreateUser:output_type -> memos.api.User - 6, // 103: memos.api.UserService.UpdateUser:output_type -> memos.api.User - 83, // 104: memos.api.UserService.DeleteUser:output_type -> google.protobuf.Empty - 17, // 105: memos.api.UserService.ListUserSettings:output_type -> memos.api.ListUserSettingsResponse - 15, // 106: memos.api.UserService.GetUserSetting:output_type -> memos.api.UserSetting - 15, // 107: memos.api.UserService.UpdateUserSetting:output_type -> memos.api.UserSetting - 22, // 108: memos.api.UserService.ListUserStats:output_type -> memos.api.ListUserStatsResponse - 20, // 109: memos.api.UserService.GetUserStats:output_type -> memos.api.UserStats - 24, // 110: memos.api.UserService.GetUserUsage:output_type -> memos.api.UserUsage - 28, // 111: memos.api.UserService.ListMemoViews:output_type -> memos.api.ListMemoViewsResponse - 26, // 112: memos.api.UserService.GetMemoView:output_type -> memos.api.MemoView - 26, // 113: memos.api.UserService.CreateMemoView:output_type -> memos.api.MemoView - 26, // 114: memos.api.UserService.UpdateMemoView:output_type -> memos.api.MemoView - 83, // 115: memos.api.UserService.DeleteMemoView:output_type -> google.protobuf.Empty - 35, // 116: memos.api.UserService.ListUserNotifications:output_type -> memos.api.ListUserNotificationsResponse - 33, // 117: memos.api.UserService.UpdateUserNotification:output_type -> memos.api.UserNotification - 83, // 118: memos.api.UserService.DeleteUserNotification:output_type -> google.protobuf.Empty - 40, // 119: memos.api.UserService.ListUserWebhooks:output_type -> memos.api.ListUserWebhooksResponse - 38, // 120: memos.api.UserService.CreateUserWebhook:output_type -> memos.api.UserWebhook - 38, // 121: memos.api.UserService.UpdateUserWebhook:output_type -> memos.api.UserWebhook - 83, // 122: memos.api.UserService.DeleteUserWebhook:output_type -> google.protobuf.Empty - 45, // 123: memos.api.UserService.GetUserWebhookSigningSecret:output_type -> memos.api.GetUserWebhookSigningSecretResponse - 48, // 124: memos.api.UserService.ListLinkedIdentities:output_type -> memos.api.ListLinkedIdentitiesResponse - 46, // 125: memos.api.UserService.GetLinkedIdentity:output_type -> memos.api.LinkedIdentity - 46, // 126: memos.api.UserService.CreateLinkedIdentity:output_type -> memos.api.LinkedIdentity - 83, // 127: memos.api.UserService.DeleteLinkedIdentity:output_type -> google.protobuf.Empty - 54, // 128: memos.api.UserService.ListPersonalAccessTokens:output_type -> memos.api.ListPersonalAccessTokensResponse - 56, // 129: memos.api.UserService.CreatePersonalAccessToken:output_type -> memos.api.CreatePersonalAccessTokenResponse - 83, // 130: memos.api.UserService.DeletePersonalAccessToken:output_type -> google.protobuf.Empty - 84, // 131: memos.api.UserService.ExportMemos:output_type -> google.api.HttpBody - 60, // 132: memos.api.UserService.ImportMemos:output_type -> memos.api.ImportMemosResponse - 99, // [99:133] is the sub-list for method output_type - 65, // [65:99] is the sub-list for method input_type - 65, // [65:65] is the sub-list for extension type_name - 65, // [65:65] is the sub-list for extension extendee - 0, // [0:65] is the sub-list for field type_name + 0, // 0: memos.api.User.role:type_name -> memos.api.User.Role + 78, // 1: memos.api.User.state:type_name -> memos.api.State + 79, // 2: memos.api.User.create_time:type_name -> google.protobuf.Timestamp + 79, // 3: memos.api.User.update_time:type_name -> google.protobuf.Timestamp + 6, // 4: memos.api.ListUsersResponse.users:type_name -> memos.api.User + 80, // 5: memos.api.GetUserRequest.read_mask:type_name -> google.protobuf.FieldMask + 6, // 6: memos.api.BatchGetUsersResponse.users:type_name -> memos.api.User + 6, // 7: memos.api.CreateUserRequest.user:type_name -> memos.api.User + 6, // 8: memos.api.UpdateUserRequest.user:type_name -> memos.api.User + 80, // 9: memos.api.UpdateUserRequest.update_mask:type_name -> google.protobuf.FieldMask + 65, // 10: memos.api.UserSetting.general_setting:type_name -> memos.api.UserSetting.GeneralSetting + 66, // 11: memos.api.UserSetting.webhooks_setting:type_name -> memos.api.UserSetting.WebhooksSetting + 67, // 12: memos.api.UserSetting.tags_setting:type_name -> memos.api.UserSetting.TagsSetting + 69, // 13: memos.api.UserSetting.editor_setting:type_name -> memos.api.UserSetting.EditorSetting + 15, // 14: memos.api.ListUserSettingsResponse.user_settings:type_name -> memos.api.UserSetting + 15, // 15: memos.api.UpdateUserSettingRequest.user_setting:type_name -> memos.api.UserSetting + 80, // 16: memos.api.UpdateUserSettingRequest.update_mask:type_name -> google.protobuf.FieldMask + 72, // 17: memos.api.UserStats.memo_type_stats:type_name -> memos.api.UserStats.MemoTypeStats + 71, // 18: memos.api.UserStats.tag_counts:type_name -> memos.api.UserStats.TagCountsEntry + 79, // 19: memos.api.UserStats.memo_created_timestamps:type_name -> google.protobuf.Timestamp + 79, // 20: memos.api.UserStats.memo_updated_timestamps:type_name -> google.protobuf.Timestamp + 78, // 21: memos.api.ListUserStatsRequest.state:type_name -> memos.api.State + 20, // 22: memos.api.ListUserStatsResponse.user_stats:type_name -> memos.api.UserStats + 73, // 23: memos.api.UserUsage.limits:type_name -> memos.api.UserUsage.Limits + 74, // 24: memos.api.MemoView.icon:type_name -> memos.api.MemoView.Icon + 26, // 25: memos.api.ListMemoViewsResponse.memo_views:type_name -> memos.api.MemoView + 26, // 26: memos.api.CreateMemoViewRequest.memo_view:type_name -> memos.api.MemoView + 26, // 27: memos.api.UpdateMemoViewRequest.memo_view:type_name -> memos.api.MemoView + 80, // 28: memos.api.UpdateMemoViewRequest.update_mask:type_name -> google.protobuf.FieldMask + 6, // 29: memos.api.UserNotification.sender_user:type_name -> memos.api.User + 3, // 30: memos.api.UserNotification.type:type_name -> memos.api.UserNotification.Type + 75, // 31: memos.api.UserNotification.memo_comment:type_name -> memos.api.UserNotification.MemoCommentPayload + 76, // 32: memos.api.UserNotification.memo_mention:type_name -> memos.api.UserNotification.MemoMentionPayload + 77, // 33: memos.api.UserNotification.space_invitation:type_name -> memos.api.UserNotification.SpaceInvitationPayload + 2, // 34: memos.api.UserNotification.status:type_name -> memos.api.UserNotification.Status + 79, // 35: memos.api.UserNotification.create_time:type_name -> google.protobuf.Timestamp + 33, // 36: memos.api.ListUserNotificationsResponse.notifications:type_name -> memos.api.UserNotification + 33, // 37: memos.api.UpdateUserNotificationRequest.notification:type_name -> memos.api.UserNotification + 80, // 38: memos.api.UpdateUserNotificationRequest.update_mask:type_name -> google.protobuf.FieldMask + 79, // 39: memos.api.UserWebhook.create_time:type_name -> google.protobuf.Timestamp + 79, // 40: memos.api.UserWebhook.update_time:type_name -> google.protobuf.Timestamp + 38, // 41: memos.api.ListUserWebhooksResponse.webhooks:type_name -> memos.api.UserWebhook + 38, // 42: memos.api.CreateUserWebhookRequest.webhook:type_name -> memos.api.UserWebhook + 38, // 43: memos.api.UpdateUserWebhookRequest.webhook:type_name -> memos.api.UserWebhook + 80, // 44: memos.api.UpdateUserWebhookRequest.update_mask:type_name -> google.protobuf.FieldMask + 46, // 45: memos.api.ListLinkedIdentitiesResponse.linked_identities:type_name -> memos.api.LinkedIdentity + 79, // 46: memos.api.PersonalAccessToken.create_time:type_name -> google.protobuf.Timestamp + 79, // 47: memos.api.PersonalAccessToken.expire_time:type_name -> google.protobuf.Timestamp + 79, // 48: memos.api.PersonalAccessToken.last_use_time:type_name -> google.protobuf.Timestamp + 52, // 49: memos.api.ListPersonalAccessTokensResponse.personal_access_tokens:type_name -> memos.api.PersonalAccessToken + 52, // 50: memos.api.CreatePersonalAccessTokenResponse.personal_access_token:type_name -> memos.api.PersonalAccessToken + 61, // 51: memos.api.ImportMemosRequest.spec:type_name -> memos.api.ImportMemosSpec + 5, // 52: memos.api.ImportMemosRequest.conflict_policy:type_name -> memos.api.ImportMemosRequest.ConflictPolicy + 62, // 53: memos.api.ImportMemosResponse.plan:type_name -> memos.api.ImportMemosPlan + 63, // 54: memos.api.ImportMemosResponse.report:type_name -> memos.api.ImportMemosReport + 79, // 55: memos.api.ImportMemosPlan.export_time:type_name -> google.protobuf.Timestamp + 64, // 56: memos.api.ImportMemosPlan.warnings:type_name -> memos.api.ImportMemosIssue + 64, // 57: memos.api.ImportMemosReport.warnings:type_name -> memos.api.ImportMemosIssue + 64, // 58: memos.api.ImportMemosReport.failures:type_name -> memos.api.ImportMemosIssue + 38, // 59: memos.api.UserSetting.WebhooksSetting.webhooks:type_name -> memos.api.UserWebhook + 70, // 60: memos.api.UserSetting.TagsSetting.tags:type_name -> memos.api.UserSetting.TagsSetting.TagsEntry + 81, // 61: memos.api.UserSetting.TagMetadata.background_color:type_name -> google.type.Color + 68, // 62: memos.api.UserSetting.TagsSetting.TagsEntry.value:type_name -> memos.api.UserSetting.TagMetadata + 82, // 63: memos.api.UserNotification.SpaceInvitationPayload.space:type_name -> memos.api.Space + 83, // 64: memos.api.UserNotification.SpaceInvitationPayload.role:type_name -> memos.api.SpaceMember.Role + 4, // 65: memos.api.UserNotification.SpaceInvitationPayload.state:type_name -> memos.api.UserNotification.SpaceInvitationPayload.InvitationState + 7, // 66: memos.api.UserService.ListUsers:input_type -> memos.api.ListUsersRequest + 9, // 67: memos.api.UserService.GetUser:input_type -> memos.api.GetUserRequest + 10, // 68: memos.api.UserService.BatchGetUsers:input_type -> memos.api.BatchGetUsersRequest + 12, // 69: memos.api.UserService.CreateUser:input_type -> memos.api.CreateUserRequest + 13, // 70: memos.api.UserService.UpdateUser:input_type -> memos.api.UpdateUserRequest + 14, // 71: memos.api.UserService.DeleteUser:input_type -> memos.api.DeleteUserRequest + 16, // 72: memos.api.UserService.ListUserSettings:input_type -> memos.api.ListUserSettingsRequest + 18, // 73: memos.api.UserService.GetUserSetting:input_type -> memos.api.GetUserSettingRequest + 19, // 74: memos.api.UserService.UpdateUserSetting:input_type -> memos.api.UpdateUserSettingRequest + 21, // 75: memos.api.UserService.ListUserStats:input_type -> memos.api.ListUserStatsRequest + 23, // 76: memos.api.UserService.GetUserStats:input_type -> memos.api.GetUserStatsRequest + 25, // 77: memos.api.UserService.GetUserUsage:input_type -> memos.api.GetUserUsageRequest + 27, // 78: memos.api.UserService.ListMemoViews:input_type -> memos.api.ListMemoViewsRequest + 29, // 79: memos.api.UserService.GetMemoView:input_type -> memos.api.GetMemoViewRequest + 30, // 80: memos.api.UserService.CreateMemoView:input_type -> memos.api.CreateMemoViewRequest + 31, // 81: memos.api.UserService.UpdateMemoView:input_type -> memos.api.UpdateMemoViewRequest + 32, // 82: memos.api.UserService.DeleteMemoView:input_type -> memos.api.DeleteMemoViewRequest + 34, // 83: memos.api.UserService.ListUserNotifications:input_type -> memos.api.ListUserNotificationsRequest + 36, // 84: memos.api.UserService.UpdateUserNotification:input_type -> memos.api.UpdateUserNotificationRequest + 37, // 85: memos.api.UserService.DeleteUserNotification:input_type -> memos.api.DeleteUserNotificationRequest + 39, // 86: memos.api.UserService.ListUserWebhooks:input_type -> memos.api.ListUserWebhooksRequest + 41, // 87: memos.api.UserService.CreateUserWebhook:input_type -> memos.api.CreateUserWebhookRequest + 42, // 88: memos.api.UserService.UpdateUserWebhook:input_type -> memos.api.UpdateUserWebhookRequest + 43, // 89: memos.api.UserService.DeleteUserWebhook:input_type -> memos.api.DeleteUserWebhookRequest + 44, // 90: memos.api.UserService.GetUserWebhookSigningSecret:input_type -> memos.api.GetUserWebhookSigningSecretRequest + 47, // 91: memos.api.UserService.ListLinkedIdentities:input_type -> memos.api.ListLinkedIdentitiesRequest + 49, // 92: memos.api.UserService.GetLinkedIdentity:input_type -> memos.api.GetLinkedIdentityRequest + 50, // 93: memos.api.UserService.CreateLinkedIdentity:input_type -> memos.api.CreateLinkedIdentityRequest + 51, // 94: memos.api.UserService.DeleteLinkedIdentity:input_type -> memos.api.DeleteLinkedIdentityRequest + 53, // 95: memos.api.UserService.ListPersonalAccessTokens:input_type -> memos.api.ListPersonalAccessTokensRequest + 55, // 96: memos.api.UserService.CreatePersonalAccessToken:input_type -> memos.api.CreatePersonalAccessTokenRequest + 57, // 97: memos.api.UserService.DeletePersonalAccessToken:input_type -> memos.api.DeletePersonalAccessTokenRequest + 58, // 98: memos.api.UserService.ExportMemos:input_type -> memos.api.ExportMemosRequest + 59, // 99: memos.api.UserService.ImportMemos:input_type -> memos.api.ImportMemosRequest + 8, // 100: memos.api.UserService.ListUsers:output_type -> memos.api.ListUsersResponse + 6, // 101: memos.api.UserService.GetUser:output_type -> memos.api.User + 11, // 102: memos.api.UserService.BatchGetUsers:output_type -> memos.api.BatchGetUsersResponse + 6, // 103: memos.api.UserService.CreateUser:output_type -> memos.api.User + 6, // 104: memos.api.UserService.UpdateUser:output_type -> memos.api.User + 84, // 105: memos.api.UserService.DeleteUser:output_type -> google.protobuf.Empty + 17, // 106: memos.api.UserService.ListUserSettings:output_type -> memos.api.ListUserSettingsResponse + 15, // 107: memos.api.UserService.GetUserSetting:output_type -> memos.api.UserSetting + 15, // 108: memos.api.UserService.UpdateUserSetting:output_type -> memos.api.UserSetting + 22, // 109: memos.api.UserService.ListUserStats:output_type -> memos.api.ListUserStatsResponse + 20, // 110: memos.api.UserService.GetUserStats:output_type -> memos.api.UserStats + 24, // 111: memos.api.UserService.GetUserUsage:output_type -> memos.api.UserUsage + 28, // 112: memos.api.UserService.ListMemoViews:output_type -> memos.api.ListMemoViewsResponse + 26, // 113: memos.api.UserService.GetMemoView:output_type -> memos.api.MemoView + 26, // 114: memos.api.UserService.CreateMemoView:output_type -> memos.api.MemoView + 26, // 115: memos.api.UserService.UpdateMemoView:output_type -> memos.api.MemoView + 84, // 116: memos.api.UserService.DeleteMemoView:output_type -> google.protobuf.Empty + 35, // 117: memos.api.UserService.ListUserNotifications:output_type -> memos.api.ListUserNotificationsResponse + 33, // 118: memos.api.UserService.UpdateUserNotification:output_type -> memos.api.UserNotification + 84, // 119: memos.api.UserService.DeleteUserNotification:output_type -> google.protobuf.Empty + 40, // 120: memos.api.UserService.ListUserWebhooks:output_type -> memos.api.ListUserWebhooksResponse + 38, // 121: memos.api.UserService.CreateUserWebhook:output_type -> memos.api.UserWebhook + 38, // 122: memos.api.UserService.UpdateUserWebhook:output_type -> memos.api.UserWebhook + 84, // 123: memos.api.UserService.DeleteUserWebhook:output_type -> google.protobuf.Empty + 45, // 124: memos.api.UserService.GetUserWebhookSigningSecret:output_type -> memos.api.GetUserWebhookSigningSecretResponse + 48, // 125: memos.api.UserService.ListLinkedIdentities:output_type -> memos.api.ListLinkedIdentitiesResponse + 46, // 126: memos.api.UserService.GetLinkedIdentity:output_type -> memos.api.LinkedIdentity + 46, // 127: memos.api.UserService.CreateLinkedIdentity:output_type -> memos.api.LinkedIdentity + 84, // 128: memos.api.UserService.DeleteLinkedIdentity:output_type -> google.protobuf.Empty + 54, // 129: memos.api.UserService.ListPersonalAccessTokens:output_type -> memos.api.ListPersonalAccessTokensResponse + 56, // 130: memos.api.UserService.CreatePersonalAccessToken:output_type -> memos.api.CreatePersonalAccessTokenResponse + 84, // 131: memos.api.UserService.DeletePersonalAccessToken:output_type -> google.protobuf.Empty + 85, // 132: memos.api.UserService.ExportMemos:output_type -> google.api.HttpBody + 60, // 133: memos.api.UserService.ImportMemos:output_type -> memos.api.ImportMemosResponse + 100, // [100:134] is the sub-list for method output_type + 66, // [66:100] is the sub-list for method input_type + 66, // [66:66] is the sub-list for extension type_name + 66, // [66:66] is the sub-list for extension extendee + 0, // [0:66] is the sub-list for field type_name } func init() { file_api_user_service_proto_init() } @@ -5667,6 +5744,7 @@ func file_api_user_service_proto_init() { (*UserSetting_GeneralSetting_)(nil), (*UserSetting_WebhooksSetting_)(nil), (*UserSetting_TagsSetting_)(nil), + (*UserSetting_EditorSetting_)(nil), } file_api_user_service_proto_msgTypes[14].OneofWrappers = []any{} file_api_user_service_proto_msgTypes[27].OneofWrappers = []any{ @@ -5682,8 +5760,8 @@ func file_api_user_service_proto_init() { (*ImportMemosResponse_Plan)(nil), (*ImportMemosResponse_Report)(nil), } - file_api_user_service_proto_msgTypes[66].OneofWrappers = []any{} - file_api_user_service_proto_msgTypes[67].OneofWrappers = []any{ + file_api_user_service_proto_msgTypes[67].OneofWrappers = []any{} + file_api_user_service_proto_msgTypes[68].OneofWrappers = []any{ (*MemoView_Icon_Emoji)(nil), (*MemoView_Icon_Lucide)(nil), } @@ -5693,7 +5771,7 @@ func file_api_user_service_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_api_user_service_proto_rawDesc), len(file_api_user_service_proto_rawDesc)), NumEnums: 6, - NumMessages: 71, + NumMessages: 72, NumExtensions: 0, NumServices: 1, }, diff --git a/proto/gen/openapi.yaml b/proto/gen/openapi.yaml index 1c47bef02..528cbb7f7 100644 --- a/proto/gen/openapi.yaml +++ b/proto/gen/openapi.yaml @@ -5695,7 +5695,21 @@ components: allOf: - $ref: '#/components/schemas/UserSetting_TagsSetting' description: The value of the TAGS setting. + editorSetting: + allOf: + - $ref: '#/components/schemas/UserSetting_EditorSetting' + description: The value of the EDITOR setting. description: UserSetting is one group of a user's preferences, identified by its key. + UserSetting_EditorSetting: + type: object + properties: + sourceMode: + type: boolean + description: |- + Optional. Whether the official client's memo editor uses source mode, + which shows and edits memos as Markdown text instead of formatted text. + The official client calls this "Markdown mode". + description: EditorSetting holds the user's memo editor preferences. UserSetting_GeneralSetting: type: object properties: diff --git a/proto/gen/store/user_setting.pb.go b/proto/gen/store/user_setting.pb.go index edf81878a..470ffcb44 100644 --- a/proto/gen/store/user_setting.pb.go +++ b/proto/gen/store/user_setting.pb.go @@ -39,6 +39,8 @@ const ( UserSetting_PERSONAL_ACCESS_TOKENS UserSetting_Key = 5 // Per-user tag metadata. UserSetting_TAGS UserSetting_Key = 6 + // Memo editor preferences of the user. + UserSetting_EDITOR UserSetting_Key = 7 ) // Enum value maps for UserSetting_Key. @@ -51,6 +53,7 @@ var ( 4: "REFRESH_TOKENS", 5: "PERSONAL_ACCESS_TOKENS", 6: "TAGS", + 7: "EDITOR", } UserSetting_Key_value = map[string]int32{ "KEY_UNSPECIFIED": 0, @@ -60,6 +63,7 @@ var ( "REFRESH_TOKENS": 4, "PERSONAL_ACCESS_TOKENS": 5, "TAGS": 6, + "EDITOR": 7, } ) @@ -102,6 +106,7 @@ type UserSetting struct { // *UserSetting_RefreshTokens // *UserSetting_PersonalAccessTokens // *UserSetting_Tags + // *UserSetting_Editor Value isUserSetting_Value `protobuf_oneof:"value"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache @@ -212,6 +217,15 @@ func (x *UserSetting) GetTags() *TagsUserSetting { return nil } +func (x *UserSetting) GetEditor() *EditorUserSetting { + if x != nil { + if x, ok := x.Value.(*UserSetting_Editor); ok { + return x.Editor + } + } + return nil +} + type isUserSetting_Value interface { isUserSetting_Value() } @@ -240,6 +254,10 @@ type UserSetting_Tags struct { Tags *TagsUserSetting `protobuf:"bytes,8,opt,name=tags,proto3,oneof"` } +type UserSetting_Editor struct { + Editor *EditorUserSetting `protobuf:"bytes,9,opt,name=editor,proto3,oneof"` +} + func (*UserSetting_General) isUserSetting_Value() {} func (*UserSetting_MemoViews) isUserSetting_Value() {} @@ -252,6 +270,8 @@ func (*UserSetting_PersonalAccessTokens) isUserSetting_Value() {} func (*UserSetting_Tags) isUserSetting_Value() {} +func (*UserSetting_Editor) isUserSetting_Value() {} + type GeneralUserSetting struct { state protoimpl.MessageState `protogen:"open.v1"` // The user's locale. @@ -325,6 +345,51 @@ func (x *GeneralUserSetting) GetSaveMediaMetadata() bool { return false } +type EditorUserSetting struct { + state protoimpl.MessageState `protogen:"open.v1"` + // Whether the memo editor shows and edits memos as Markdown text. + SourceMode bool `protobuf:"varint,1,opt,name=source_mode,json=sourceMode,proto3" json:"source_mode,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *EditorUserSetting) Reset() { + *x = EditorUserSetting{} + mi := &file_store_user_setting_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *EditorUserSetting) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*EditorUserSetting) ProtoMessage() {} + +func (x *EditorUserSetting) ProtoReflect() protoreflect.Message { + mi := &file_store_user_setting_proto_msgTypes[2] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use EditorUserSetting.ProtoReflect.Descriptor instead. +func (*EditorUserSetting) Descriptor() ([]byte, []int) { + return file_store_user_setting_proto_rawDescGZIP(), []int{2} +} + +func (x *EditorUserSetting) GetSourceMode() bool { + if x != nil { + return x.SourceMode + } + return false +} + type UserTagMetadata struct { state protoimpl.MessageState `protogen:"open.v1"` // Optional background color for the tag label. @@ -338,7 +403,7 @@ type UserTagMetadata struct { func (x *UserTagMetadata) Reset() { *x = UserTagMetadata{} - mi := &file_store_user_setting_proto_msgTypes[2] + mi := &file_store_user_setting_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -350,7 +415,7 @@ func (x *UserTagMetadata) String() string { func (*UserTagMetadata) ProtoMessage() {} func (x *UserTagMetadata) ProtoReflect() protoreflect.Message { - mi := &file_store_user_setting_proto_msgTypes[2] + mi := &file_store_user_setting_proto_msgTypes[3] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -363,7 +428,7 @@ func (x *UserTagMetadata) ProtoReflect() protoreflect.Message { // Deprecated: Use UserTagMetadata.ProtoReflect.Descriptor instead. func (*UserTagMetadata) Descriptor() ([]byte, []int) { - return file_store_user_setting_proto_rawDescGZIP(), []int{2} + return file_store_user_setting_proto_rawDescGZIP(), []int{3} } func (x *UserTagMetadata) GetBackgroundColor() *color.Color { @@ -393,7 +458,7 @@ type TagsUserSetting struct { func (x *TagsUserSetting) Reset() { *x = TagsUserSetting{} - mi := &file_store_user_setting_proto_msgTypes[3] + mi := &file_store_user_setting_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -405,7 +470,7 @@ func (x *TagsUserSetting) String() string { func (*TagsUserSetting) ProtoMessage() {} func (x *TagsUserSetting) ProtoReflect() protoreflect.Message { - mi := &file_store_user_setting_proto_msgTypes[3] + mi := &file_store_user_setting_proto_msgTypes[4] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -418,7 +483,7 @@ func (x *TagsUserSetting) ProtoReflect() protoreflect.Message { // Deprecated: Use TagsUserSetting.ProtoReflect.Descriptor instead. func (*TagsUserSetting) Descriptor() ([]byte, []int) { - return file_store_user_setting_proto_rawDescGZIP(), []int{3} + return file_store_user_setting_proto_rawDescGZIP(), []int{4} } func (x *TagsUserSetting) GetTags() map[string]*UserTagMetadata { @@ -437,7 +502,7 @@ type RefreshTokensUserSetting struct { func (x *RefreshTokensUserSetting) Reset() { *x = RefreshTokensUserSetting{} - mi := &file_store_user_setting_proto_msgTypes[4] + mi := &file_store_user_setting_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -449,7 +514,7 @@ func (x *RefreshTokensUserSetting) String() string { func (*RefreshTokensUserSetting) ProtoMessage() {} func (x *RefreshTokensUserSetting) ProtoReflect() protoreflect.Message { - mi := &file_store_user_setting_proto_msgTypes[4] + mi := &file_store_user_setting_proto_msgTypes[5] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -462,7 +527,7 @@ func (x *RefreshTokensUserSetting) ProtoReflect() protoreflect.Message { // Deprecated: Use RefreshTokensUserSetting.ProtoReflect.Descriptor instead. func (*RefreshTokensUserSetting) Descriptor() ([]byte, []int) { - return file_store_user_setting_proto_rawDescGZIP(), []int{4} + return file_store_user_setting_proto_rawDescGZIP(), []int{5} } func (x *RefreshTokensUserSetting) GetRefreshTokens() []*RefreshTokensUserSetting_RefreshToken { @@ -481,7 +546,7 @@ type PersonalAccessTokensUserSetting struct { func (x *PersonalAccessTokensUserSetting) Reset() { *x = PersonalAccessTokensUserSetting{} - mi := &file_store_user_setting_proto_msgTypes[5] + mi := &file_store_user_setting_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -493,7 +558,7 @@ func (x *PersonalAccessTokensUserSetting) String() string { func (*PersonalAccessTokensUserSetting) ProtoMessage() {} func (x *PersonalAccessTokensUserSetting) ProtoReflect() protoreflect.Message { - mi := &file_store_user_setting_proto_msgTypes[5] + mi := &file_store_user_setting_proto_msgTypes[6] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -506,7 +571,7 @@ func (x *PersonalAccessTokensUserSetting) ProtoReflect() protoreflect.Message { // Deprecated: Use PersonalAccessTokensUserSetting.ProtoReflect.Descriptor instead. func (*PersonalAccessTokensUserSetting) Descriptor() ([]byte, []int) { - return file_store_user_setting_proto_rawDescGZIP(), []int{5} + return file_store_user_setting_proto_rawDescGZIP(), []int{6} } func (x *PersonalAccessTokensUserSetting) GetTokens() []*PersonalAccessTokensUserSetting_PersonalAccessToken { @@ -525,7 +590,7 @@ type MemoViewsUserSetting struct { func (x *MemoViewsUserSetting) Reset() { *x = MemoViewsUserSetting{} - mi := &file_store_user_setting_proto_msgTypes[6] + mi := &file_store_user_setting_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -537,7 +602,7 @@ func (x *MemoViewsUserSetting) String() string { func (*MemoViewsUserSetting) ProtoMessage() {} func (x *MemoViewsUserSetting) ProtoReflect() protoreflect.Message { - mi := &file_store_user_setting_proto_msgTypes[6] + mi := &file_store_user_setting_proto_msgTypes[7] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -550,7 +615,7 @@ func (x *MemoViewsUserSetting) ProtoReflect() protoreflect.Message { // Deprecated: Use MemoViewsUserSetting.ProtoReflect.Descriptor instead. func (*MemoViewsUserSetting) Descriptor() ([]byte, []int) { - return file_store_user_setting_proto_rawDescGZIP(), []int{6} + return file_store_user_setting_proto_rawDescGZIP(), []int{7} } func (x *MemoViewsUserSetting) GetMemoViews() []*MemoViewsUserSetting_MemoView { @@ -569,7 +634,7 @@ type WebhooksUserSetting struct { func (x *WebhooksUserSetting) Reset() { *x = WebhooksUserSetting{} - mi := &file_store_user_setting_proto_msgTypes[7] + mi := &file_store_user_setting_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -581,7 +646,7 @@ func (x *WebhooksUserSetting) String() string { func (*WebhooksUserSetting) ProtoMessage() {} func (x *WebhooksUserSetting) ProtoReflect() protoreflect.Message { - mi := &file_store_user_setting_proto_msgTypes[7] + mi := &file_store_user_setting_proto_msgTypes[8] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -594,7 +659,7 @@ func (x *WebhooksUserSetting) ProtoReflect() protoreflect.Message { // Deprecated: Use WebhooksUserSetting.ProtoReflect.Descriptor instead. func (*WebhooksUserSetting) Descriptor() ([]byte, []int) { - return file_store_user_setting_proto_rawDescGZIP(), []int{7} + return file_store_user_setting_proto_rawDescGZIP(), []int{8} } func (x *WebhooksUserSetting) GetWebhooks() []*WebhooksUserSetting_Webhook { @@ -622,7 +687,7 @@ type RefreshTokensUserSetting_RefreshToken struct { func (x *RefreshTokensUserSetting_RefreshToken) Reset() { *x = RefreshTokensUserSetting_RefreshToken{} - mi := &file_store_user_setting_proto_msgTypes[9] + mi := &file_store_user_setting_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -634,7 +699,7 @@ func (x *RefreshTokensUserSetting_RefreshToken) String() string { func (*RefreshTokensUserSetting_RefreshToken) ProtoMessage() {} func (x *RefreshTokensUserSetting_RefreshToken) ProtoReflect() protoreflect.Message { - mi := &file_store_user_setting_proto_msgTypes[9] + mi := &file_store_user_setting_proto_msgTypes[10] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -647,7 +712,7 @@ func (x *RefreshTokensUserSetting_RefreshToken) ProtoReflect() protoreflect.Mess // Deprecated: Use RefreshTokensUserSetting_RefreshToken.ProtoReflect.Descriptor instead. func (*RefreshTokensUserSetting_RefreshToken) Descriptor() ([]byte, []int) { - return file_store_user_setting_proto_rawDescGZIP(), []int{4, 0} + return file_store_user_setting_proto_rawDescGZIP(), []int{5, 0} } func (x *RefreshTokensUserSetting_RefreshToken) GetTokenId() string { @@ -703,7 +768,7 @@ type RefreshTokensUserSetting_ClientInfo struct { func (x *RefreshTokensUserSetting_ClientInfo) Reset() { *x = RefreshTokensUserSetting_ClientInfo{} - mi := &file_store_user_setting_proto_msgTypes[10] + mi := &file_store_user_setting_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -715,7 +780,7 @@ func (x *RefreshTokensUserSetting_ClientInfo) String() string { func (*RefreshTokensUserSetting_ClientInfo) ProtoMessage() {} func (x *RefreshTokensUserSetting_ClientInfo) ProtoReflect() protoreflect.Message { - mi := &file_store_user_setting_proto_msgTypes[10] + mi := &file_store_user_setting_proto_msgTypes[11] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -728,7 +793,7 @@ func (x *RefreshTokensUserSetting_ClientInfo) ProtoReflect() protoreflect.Messag // Deprecated: Use RefreshTokensUserSetting_ClientInfo.ProtoReflect.Descriptor instead. func (*RefreshTokensUserSetting_ClientInfo) Descriptor() ([]byte, []int) { - return file_store_user_setting_proto_rawDescGZIP(), []int{4, 1} + return file_store_user_setting_proto_rawDescGZIP(), []int{5, 1} } func (x *RefreshTokensUserSetting_ClientInfo) GetUserAgent() string { @@ -786,7 +851,7 @@ type PersonalAccessTokensUserSetting_PersonalAccessToken struct { func (x *PersonalAccessTokensUserSetting_PersonalAccessToken) Reset() { *x = PersonalAccessTokensUserSetting_PersonalAccessToken{} - mi := &file_store_user_setting_proto_msgTypes[11] + mi := &file_store_user_setting_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -798,7 +863,7 @@ func (x *PersonalAccessTokensUserSetting_PersonalAccessToken) String() string { func (*PersonalAccessTokensUserSetting_PersonalAccessToken) ProtoMessage() {} func (x *PersonalAccessTokensUserSetting_PersonalAccessToken) ProtoReflect() protoreflect.Message { - mi := &file_store_user_setting_proto_msgTypes[11] + mi := &file_store_user_setting_proto_msgTypes[12] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -811,7 +876,7 @@ func (x *PersonalAccessTokensUserSetting_PersonalAccessToken) ProtoReflect() pro // Deprecated: Use PersonalAccessTokensUserSetting_PersonalAccessToken.ProtoReflect.Descriptor instead. func (*PersonalAccessTokensUserSetting_PersonalAccessToken) Descriptor() ([]byte, []int) { - return file_store_user_setting_proto_rawDescGZIP(), []int{5, 0} + return file_store_user_setting_proto_rawDescGZIP(), []int{6, 0} } func (x *PersonalAccessTokensUserSetting_PersonalAccessToken) GetTokenId() string { @@ -868,7 +933,7 @@ type MemoViewsUserSetting_MemoView struct { func (x *MemoViewsUserSetting_MemoView) Reset() { *x = MemoViewsUserSetting_MemoView{} - mi := &file_store_user_setting_proto_msgTypes[12] + mi := &file_store_user_setting_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -880,7 +945,7 @@ func (x *MemoViewsUserSetting_MemoView) String() string { func (*MemoViewsUserSetting_MemoView) ProtoMessage() {} func (x *MemoViewsUserSetting_MemoView) ProtoReflect() protoreflect.Message { - mi := &file_store_user_setting_proto_msgTypes[12] + mi := &file_store_user_setting_proto_msgTypes[13] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -893,7 +958,7 @@ func (x *MemoViewsUserSetting_MemoView) ProtoReflect() protoreflect.Message { // Deprecated: Use MemoViewsUserSetting_MemoView.ProtoReflect.Descriptor instead. func (*MemoViewsUserSetting_MemoView) Descriptor() ([]byte, []int) { - return file_store_user_setting_proto_rawDescGZIP(), []int{6, 0} + return file_store_user_setting_proto_rawDescGZIP(), []int{7, 0} } func (x *MemoViewsUserSetting_MemoView) GetId() string { @@ -937,7 +1002,7 @@ type MemoViewsUserSetting_MemoView_Icon struct { func (x *MemoViewsUserSetting_MemoView_Icon) Reset() { *x = MemoViewsUserSetting_MemoView_Icon{} - mi := &file_store_user_setting_proto_msgTypes[13] + mi := &file_store_user_setting_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -949,7 +1014,7 @@ func (x *MemoViewsUserSetting_MemoView_Icon) String() string { func (*MemoViewsUserSetting_MemoView_Icon) ProtoMessage() {} func (x *MemoViewsUserSetting_MemoView_Icon) ProtoReflect() protoreflect.Message { - mi := &file_store_user_setting_proto_msgTypes[13] + mi := &file_store_user_setting_proto_msgTypes[14] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -962,7 +1027,7 @@ func (x *MemoViewsUserSetting_MemoView_Icon) ProtoReflect() protoreflect.Message // Deprecated: Use MemoViewsUserSetting_MemoView_Icon.ProtoReflect.Descriptor instead. func (*MemoViewsUserSetting_MemoView_Icon) Descriptor() ([]byte, []int) { - return file_store_user_setting_proto_rawDescGZIP(), []int{6, 0, 0} + return file_store_user_setting_proto_rawDescGZIP(), []int{7, 0, 0} } func (x *MemoViewsUserSetting_MemoView_Icon) GetValue() isMemoViewsUserSetting_MemoView_Icon_Value { @@ -1024,7 +1089,7 @@ type WebhooksUserSetting_Webhook struct { func (x *WebhooksUserSetting_Webhook) Reset() { *x = WebhooksUserSetting_Webhook{} - mi := &file_store_user_setting_proto_msgTypes[14] + mi := &file_store_user_setting_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1036,7 +1101,7 @@ func (x *WebhooksUserSetting_Webhook) String() string { func (*WebhooksUserSetting_Webhook) ProtoMessage() {} func (x *WebhooksUserSetting_Webhook) ProtoReflect() protoreflect.Message { - mi := &file_store_user_setting_proto_msgTypes[14] + mi := &file_store_user_setting_proto_msgTypes[15] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1049,7 +1114,7 @@ func (x *WebhooksUserSetting_Webhook) ProtoReflect() protoreflect.Message { // Deprecated: Use WebhooksUserSetting_Webhook.ProtoReflect.Descriptor instead. func (*WebhooksUserSetting_Webhook) Descriptor() ([]byte, []int) { - return file_store_user_setting_proto_rawDescGZIP(), []int{7, 0} + return file_store_user_setting_proto_rawDescGZIP(), []int{8, 0} } func (x *WebhooksUserSetting_Webhook) GetId() string { @@ -1084,7 +1149,7 @@ var File_store_user_setting_proto protoreflect.FileDescriptor const file_store_user_setting_proto_rawDesc = "" + "\n" + - "\x18store/user_setting.proto\x12\vmemos.store\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x17google/type/color.proto\"\x8b\x05\n" + + "\x18store/user_setting.proto\x12\vmemos.store\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x17google/type/color.proto\"\xd2\x05\n" + "\vUserSetting\x12\x17\n" + "\auser_id\x18\x01 \x01(\x05R\x06userId\x12.\n" + "\x03key\x18\x02 \x01(\x0e2\x1c.memos.store.UserSetting.KeyR\x03key\x12;\n" + @@ -1094,7 +1159,8 @@ const file_store_user_setting_proto_rawDesc = "" + "\bwebhooks\x18\x05 \x01(\v2 .memos.store.WebhooksUserSettingH\x00R\bwebhooks\x12N\n" + "\x0erefresh_tokens\x18\x06 \x01(\v2%.memos.store.RefreshTokensUserSettingH\x00R\rrefreshTokens\x12d\n" + "\x16personal_access_tokens\x18\a \x01(\v2,.memos.store.PersonalAccessTokensUserSettingH\x00R\x14personalAccessTokens\x122\n" + - "\x04tags\x18\b \x01(\v2\x1c.memos.store.TagsUserSettingH\x00R\x04tags\"\x7f\n" + + "\x04tags\x18\b \x01(\v2\x1c.memos.store.TagsUserSettingH\x00R\x04tags\x128\n" + + "\x06editor\x18\t \x01(\v2\x1e.memos.store.EditorUserSettingH\x00R\x06editor\"\x8b\x01\n" + "\x03Key\x12\x13\n" + "\x0fKEY_UNSPECIFIED\x10\x00\x12\v\n" + "\aGENERAL\x10\x01\x12\x0e\n" + @@ -1103,13 +1169,18 @@ const file_store_user_setting_proto_rawDesc = "" + "\bWEBHOOKS\x10\x03\x12\x12\n" + "\x0eREFRESH_TOKENS\x10\x04\x12\x1a\n" + "\x16PERSONAL_ACCESS_TOKENS\x10\x05\x12\b\n" + - "\x04TAGS\x10\x06B\a\n" + + "\x04TAGS\x10\x06\x12\n" + + "\n" + + "\x06EDITOR\x10\aB\a\n" + "\x05value\"\x9b\x01\n" + "\x12GeneralUserSetting\x12\x16\n" + "\x06locale\x18\x01 \x01(\tR\x06locale\x12'\n" + "\x0fmemo_visibility\x18\x02 \x01(\tR\x0ememoVisibility\x12\x14\n" + "\x05theme\x18\x03 \x01(\tR\x05theme\x12.\n" + - "\x13save_media_metadata\x18\x04 \x01(\bR\x11saveMediaMetadata\"s\n" + + "\x13save_media_metadata\x18\x04 \x01(\bR\x11saveMediaMetadata\"4\n" + + "\x11EditorUserSetting\x12\x1f\n" + + "\vsource_mode\x18\x01 \x01(\bR\n" + + "sourceMode\"s\n" + "\x0fUserTagMetadata\x12=\n" + "\x10background_color\x18\x01 \x01(\v2\x12.google.type.ColorR\x0fbackgroundColor\x12!\n" + "\fblur_content\x18\x02 \x01(\bR\vblurContent\"\xa4\x01\n" + @@ -1186,54 +1257,56 @@ func file_store_user_setting_proto_rawDescGZIP() []byte { } var file_store_user_setting_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_store_user_setting_proto_msgTypes = make([]protoimpl.MessageInfo, 15) +var file_store_user_setting_proto_msgTypes = make([]protoimpl.MessageInfo, 16) var file_store_user_setting_proto_goTypes = []any{ - (UserSetting_Key)(0), // 0: memos.store.UserSetting.Key - (*UserSetting)(nil), // 1: memos.store.UserSetting - (*GeneralUserSetting)(nil), // 2: memos.store.GeneralUserSetting - (*UserTagMetadata)(nil), // 3: memos.store.UserTagMetadata - (*TagsUserSetting)(nil), // 4: memos.store.TagsUserSetting - (*RefreshTokensUserSetting)(nil), // 5: memos.store.RefreshTokensUserSetting - (*PersonalAccessTokensUserSetting)(nil), // 6: memos.store.PersonalAccessTokensUserSetting - (*MemoViewsUserSetting)(nil), // 7: memos.store.MemoViewsUserSetting - (*WebhooksUserSetting)(nil), // 8: memos.store.WebhooksUserSetting - nil, // 9: memos.store.TagsUserSetting.TagsEntry - (*RefreshTokensUserSetting_RefreshToken)(nil), // 10: memos.store.RefreshTokensUserSetting.RefreshToken - (*RefreshTokensUserSetting_ClientInfo)(nil), // 11: memos.store.RefreshTokensUserSetting.ClientInfo - (*PersonalAccessTokensUserSetting_PersonalAccessToken)(nil), // 12: memos.store.PersonalAccessTokensUserSetting.PersonalAccessToken - (*MemoViewsUserSetting_MemoView)(nil), // 13: memos.store.MemoViewsUserSetting.MemoView - (*MemoViewsUserSetting_MemoView_Icon)(nil), // 14: memos.store.MemoViewsUserSetting.MemoView.Icon - (*WebhooksUserSetting_Webhook)(nil), // 15: memos.store.WebhooksUserSetting.Webhook - (*color.Color)(nil), // 16: google.type.Color - (*timestamppb.Timestamp)(nil), // 17: google.protobuf.Timestamp + (UserSetting_Key)(0), // 0: memos.store.UserSetting.Key + (*UserSetting)(nil), // 1: memos.store.UserSetting + (*GeneralUserSetting)(nil), // 2: memos.store.GeneralUserSetting + (*EditorUserSetting)(nil), // 3: memos.store.EditorUserSetting + (*UserTagMetadata)(nil), // 4: memos.store.UserTagMetadata + (*TagsUserSetting)(nil), // 5: memos.store.TagsUserSetting + (*RefreshTokensUserSetting)(nil), // 6: memos.store.RefreshTokensUserSetting + (*PersonalAccessTokensUserSetting)(nil), // 7: memos.store.PersonalAccessTokensUserSetting + (*MemoViewsUserSetting)(nil), // 8: memos.store.MemoViewsUserSetting + (*WebhooksUserSetting)(nil), // 9: memos.store.WebhooksUserSetting + nil, // 10: memos.store.TagsUserSetting.TagsEntry + (*RefreshTokensUserSetting_RefreshToken)(nil), // 11: memos.store.RefreshTokensUserSetting.RefreshToken + (*RefreshTokensUserSetting_ClientInfo)(nil), // 12: memos.store.RefreshTokensUserSetting.ClientInfo + (*PersonalAccessTokensUserSetting_PersonalAccessToken)(nil), // 13: memos.store.PersonalAccessTokensUserSetting.PersonalAccessToken + (*MemoViewsUserSetting_MemoView)(nil), // 14: memos.store.MemoViewsUserSetting.MemoView + (*MemoViewsUserSetting_MemoView_Icon)(nil), // 15: memos.store.MemoViewsUserSetting.MemoView.Icon + (*WebhooksUserSetting_Webhook)(nil), // 16: memos.store.WebhooksUserSetting.Webhook + (*color.Color)(nil), // 17: google.type.Color + (*timestamppb.Timestamp)(nil), // 18: google.protobuf.Timestamp } var file_store_user_setting_proto_depIdxs = []int32{ 0, // 0: memos.store.UserSetting.key:type_name -> memos.store.UserSetting.Key 2, // 1: memos.store.UserSetting.general:type_name -> memos.store.GeneralUserSetting - 7, // 2: memos.store.UserSetting.memo_views:type_name -> memos.store.MemoViewsUserSetting - 8, // 3: memos.store.UserSetting.webhooks:type_name -> memos.store.WebhooksUserSetting - 5, // 4: memos.store.UserSetting.refresh_tokens:type_name -> memos.store.RefreshTokensUserSetting - 6, // 5: memos.store.UserSetting.personal_access_tokens:type_name -> memos.store.PersonalAccessTokensUserSetting - 4, // 6: memos.store.UserSetting.tags:type_name -> memos.store.TagsUserSetting - 16, // 7: memos.store.UserTagMetadata.background_color:type_name -> google.type.Color - 9, // 8: memos.store.TagsUserSetting.tags:type_name -> memos.store.TagsUserSetting.TagsEntry - 10, // 9: memos.store.RefreshTokensUserSetting.refresh_tokens:type_name -> memos.store.RefreshTokensUserSetting.RefreshToken - 12, // 10: memos.store.PersonalAccessTokensUserSetting.tokens:type_name -> memos.store.PersonalAccessTokensUserSetting.PersonalAccessToken - 13, // 11: memos.store.MemoViewsUserSetting.memo_views:type_name -> memos.store.MemoViewsUserSetting.MemoView - 15, // 12: memos.store.WebhooksUserSetting.webhooks:type_name -> memos.store.WebhooksUserSetting.Webhook - 3, // 13: memos.store.TagsUserSetting.TagsEntry.value:type_name -> memos.store.UserTagMetadata - 17, // 14: memos.store.RefreshTokensUserSetting.RefreshToken.expires_at:type_name -> google.protobuf.Timestamp - 17, // 15: memos.store.RefreshTokensUserSetting.RefreshToken.created_at:type_name -> google.protobuf.Timestamp - 11, // 16: memos.store.RefreshTokensUserSetting.RefreshToken.client_info:type_name -> memos.store.RefreshTokensUserSetting.ClientInfo - 17, // 17: memos.store.PersonalAccessTokensUserSetting.PersonalAccessToken.expires_at:type_name -> google.protobuf.Timestamp - 17, // 18: memos.store.PersonalAccessTokensUserSetting.PersonalAccessToken.created_at:type_name -> google.protobuf.Timestamp - 17, // 19: memos.store.PersonalAccessTokensUserSetting.PersonalAccessToken.last_used_at:type_name -> google.protobuf.Timestamp - 14, // 20: memos.store.MemoViewsUserSetting.MemoView.icon:type_name -> memos.store.MemoViewsUserSetting.MemoView.Icon - 21, // [21:21] is the sub-list for method output_type - 21, // [21:21] is the sub-list for method input_type - 21, // [21:21] is the sub-list for extension type_name - 21, // [21:21] is the sub-list for extension extendee - 0, // [0:21] is the sub-list for field type_name + 8, // 2: memos.store.UserSetting.memo_views:type_name -> memos.store.MemoViewsUserSetting + 9, // 3: memos.store.UserSetting.webhooks:type_name -> memos.store.WebhooksUserSetting + 6, // 4: memos.store.UserSetting.refresh_tokens:type_name -> memos.store.RefreshTokensUserSetting + 7, // 5: memos.store.UserSetting.personal_access_tokens:type_name -> memos.store.PersonalAccessTokensUserSetting + 5, // 6: memos.store.UserSetting.tags:type_name -> memos.store.TagsUserSetting + 3, // 7: memos.store.UserSetting.editor:type_name -> memos.store.EditorUserSetting + 17, // 8: memos.store.UserTagMetadata.background_color:type_name -> google.type.Color + 10, // 9: memos.store.TagsUserSetting.tags:type_name -> memos.store.TagsUserSetting.TagsEntry + 11, // 10: memos.store.RefreshTokensUserSetting.refresh_tokens:type_name -> memos.store.RefreshTokensUserSetting.RefreshToken + 13, // 11: memos.store.PersonalAccessTokensUserSetting.tokens:type_name -> memos.store.PersonalAccessTokensUserSetting.PersonalAccessToken + 14, // 12: memos.store.MemoViewsUserSetting.memo_views:type_name -> memos.store.MemoViewsUserSetting.MemoView + 16, // 13: memos.store.WebhooksUserSetting.webhooks:type_name -> memos.store.WebhooksUserSetting.Webhook + 4, // 14: memos.store.TagsUserSetting.TagsEntry.value:type_name -> memos.store.UserTagMetadata + 18, // 15: memos.store.RefreshTokensUserSetting.RefreshToken.expires_at:type_name -> google.protobuf.Timestamp + 18, // 16: memos.store.RefreshTokensUserSetting.RefreshToken.created_at:type_name -> google.protobuf.Timestamp + 12, // 17: memos.store.RefreshTokensUserSetting.RefreshToken.client_info:type_name -> memos.store.RefreshTokensUserSetting.ClientInfo + 18, // 18: memos.store.PersonalAccessTokensUserSetting.PersonalAccessToken.expires_at:type_name -> google.protobuf.Timestamp + 18, // 19: memos.store.PersonalAccessTokensUserSetting.PersonalAccessToken.created_at:type_name -> google.protobuf.Timestamp + 18, // 20: memos.store.PersonalAccessTokensUserSetting.PersonalAccessToken.last_used_at:type_name -> google.protobuf.Timestamp + 15, // 21: memos.store.MemoViewsUserSetting.MemoView.icon:type_name -> memos.store.MemoViewsUserSetting.MemoView.Icon + 22, // [22:22] is the sub-list for method output_type + 22, // [22:22] is the sub-list for method input_type + 22, // [22:22] is the sub-list for extension type_name + 22, // [22:22] is the sub-list for extension extendee + 0, // [0:22] is the sub-list for field type_name } func init() { file_store_user_setting_proto_init() } @@ -1248,8 +1321,9 @@ func file_store_user_setting_proto_init() { (*UserSetting_RefreshTokens)(nil), (*UserSetting_PersonalAccessTokens)(nil), (*UserSetting_Tags)(nil), + (*UserSetting_Editor)(nil), } - file_store_user_setting_proto_msgTypes[13].OneofWrappers = []any{ + file_store_user_setting_proto_msgTypes[14].OneofWrappers = []any{ (*MemoViewsUserSetting_MemoView_Icon_Emoji)(nil), (*MemoViewsUserSetting_MemoView_Icon_Lucide)(nil), } @@ -1259,7 +1333,7 @@ func file_store_user_setting_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_store_user_setting_proto_rawDesc), len(file_store_user_setting_proto_rawDesc)), NumEnums: 1, - NumMessages: 15, + NumMessages: 16, NumExtensions: 0, NumServices: 0, }, diff --git a/proto/store/user_setting.proto b/proto/store/user_setting.proto index e1a193237..fccbaf613 100644 --- a/proto/store/user_setting.proto +++ b/proto/store/user_setting.proto @@ -22,6 +22,8 @@ message UserSetting { PERSONAL_ACCESS_TOKENS = 5; // Per-user tag metadata. TAGS = 6; + // Memo editor preferences of the user. + EDITOR = 7; } int32 user_id = 1; @@ -34,6 +36,7 @@ message UserSetting { RefreshTokensUserSetting refresh_tokens = 6; PersonalAccessTokensUserSetting personal_access_tokens = 7; TagsUserSetting tags = 8; + EditorUserSetting editor = 9; } } @@ -49,6 +52,11 @@ message GeneralUserSetting { bool save_media_metadata = 4; } +message EditorUserSetting { + // Whether the memo editor shows and edits memos as Markdown text. + bool source_mode = 1; +} + message UserTagMetadata { // Optional background color for the tag label. // When unset, the default tag color is used. diff --git a/server/api/test/user_setting_test.go b/server/api/test/user_setting_test.go index 86f889587..5a7d73730 100644 --- a/server/api/test/user_setting_test.go +++ b/server/api/test/user_setting_test.go @@ -258,3 +258,70 @@ func TestUserTagSettingsPermissionDeniedForOtherUser(t *testing.T) { require.Error(t, err) require.Contains(t, err.Error(), "permission denied") } + +func TestUserEditorSetting(t *testing.T) { + ctx := context.Background() + ts := NewTestService(t) + defer ts.Cleanup() + + user, err := ts.CreateRegularUser(ctx, "editor-user") + require.NoError(t, err) + userCtx := ts.CreateUserContext(ctx, user.ID) + settingName := "users/editor-user/settings/EDITOR" + + defaultSetting, err := ts.Service.GetUserSetting(userCtx, &apipb.GetUserSettingRequest{Name: settingName}) + require.NoError(t, err) + require.Equal(t, settingName, defaultSetting.Name) + require.NotNil(t, defaultSetting.GetEditorSetting()) + require.False(t, defaultSetting.GetEditorSetting().GetSourceMode()) + + // An unset editor setting is not listed. + listed, err := ts.Service.ListUserSettings(userCtx, &apipb.ListUserSettingsRequest{Parent: api.BuildUserName(user.Username)}) + require.NoError(t, err) + for _, setting := range listed.UserSettings { + require.Nil(t, setting.GetEditorSetting()) + } + + updated, err := ts.Service.UpdateUserSetting(userCtx, &apipb.UpdateUserSettingRequest{ + UserSetting: &apipb.UserSetting{ + Name: settingName, + Value: &apipb.UserSetting_EditorSetting_{ + EditorSetting: &apipb.UserSetting_EditorSetting{SourceMode: true}, + }, + }, + UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"source_mode"}}, + }) + require.NoError(t, err) + require.True(t, updated.GetEditorSetting().GetSourceMode()) + + listed, err = ts.Service.ListUserSettings(userCtx, &apipb.ListUserSettingsRequest{Parent: api.BuildUserName(user.Username)}) + require.NoError(t, err) + var listedEditor *apipb.UserSetting + for _, setting := range listed.UserSettings { + if setting.GetEditorSetting() != nil { + listedEditor = setting + } + } + require.NotNil(t, listedEditor) + require.Equal(t, settingName, listedEditor.Name) + require.True(t, listedEditor.GetEditorSetting().GetSourceMode()) + + _, err = ts.Service.UpdateUserSetting(userCtx, &apipb.UpdateUserSettingRequest{ + UserSetting: &apipb.UserSetting{ + Name: settingName, + Value: &apipb.UserSetting_EditorSetting_{ + EditorSetting: &apipb.UserSetting_EditorSetting{}, + }, + }, + UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"theme"}}, + }) + require.Error(t, err) + require.Contains(t, err.Error(), "unsupported update mask path") + + other, err := ts.CreateRegularUser(ctx, "editor-other") + require.NoError(t, err) + otherCtx := ts.CreateUserContext(ctx, other.ID) + _, err = ts.Service.GetUserSetting(otherCtx, &apipb.GetUserSettingRequest{Name: settingName}) + require.Error(t, err) + require.Contains(t, err.Error(), "permission denied") +} diff --git a/server/api/user_service_converters.go b/server/api/user_service_converters.go index 2055d341b..7d82241bd 100644 --- a/server/api/user_service_converters.go +++ b/server/api/user_service_converters.go @@ -79,6 +79,8 @@ func convertSettingKeyToStore(key string) (storepb.UserSetting_Key, error) { return storepb.UserSetting_WEBHOOKS, nil case apipb.UserSetting_Key_name[int32(apipb.UserSetting_TAGS)]: return storepb.UserSetting_TAGS, nil + case apipb.UserSetting_Key_name[int32(apipb.UserSetting_EDITOR)]: + return storepb.UserSetting_EDITOR, nil default: return storepb.UserSetting_KEY_UNSPECIFIED, errors.Errorf("unknown setting key: %s", key) } @@ -95,6 +97,8 @@ func convertSettingKeyFromStore(key storepb.UserSetting_Key) string { return apipb.UserSetting_Key_name[int32(apipb.UserSetting_WEBHOOKS)] case storepb.UserSetting_TAGS: return apipb.UserSetting_Key_name[int32(apipb.UserSetting_TAGS)] + case storepb.UserSetting_EDITOR: + return apipb.UserSetting_Key_name[int32(apipb.UserSetting_EDITOR)] default: return "unknown" } @@ -160,6 +164,10 @@ func convertUserSettingFromStore(storeSetting *storepb.UserSetting, user *store. setting.Value = &apipb.UserSetting_TagsSetting_{ TagsSetting: &apipb.UserSetting_TagsSetting{Tags: map[string]*apipb.UserSetting_TagMetadata{}}, } + case storepb.UserSetting_EDITOR: + setting.Value = &apipb.UserSetting_EditorSetting_{ + EditorSetting: &apipb.UserSetting_EditorSetting{}, + } default: return nil } @@ -211,6 +219,12 @@ func convertUserSettingFromStore(storeSetting *storepb.UserSetting, user *store. setting.Value = &apipb.UserSetting_TagsSetting_{ TagsSetting: convertUserTagsSettingFromStore(storeSetting.GetTags()), } + case storepb.UserSetting_EDITOR: + setting.Value = &apipb.UserSetting_EditorSetting_{ + EditorSetting: &apipb.UserSetting_EditorSetting{ + SourceMode: storeSetting.GetEditor().GetSourceMode(), + }, + } default: return nil } @@ -266,6 +280,16 @@ func convertUserSettingToStore(apiSetting *apipb.UserSetting, userID int32, key } else { return nil, errors.Errorf("tags setting is required") } + case storepb.UserSetting_EDITOR: + if editor := apiSetting.GetEditorSetting(); editor != nil { + storeSetting.Value = &storepb.UserSetting_Editor{ + Editor: &storepb.EditorUserSetting{ + SourceMode: editor.SourceMode, + }, + } + } else { + return nil, errors.Errorf("editor setting is required") + } default: return nil, errors.Errorf("unsupported setting key: %v", key) } diff --git a/server/api/user_service_settings.go b/server/api/user_service_settings.go index 7f823095a..c6ebf6404 100644 --- a/server/api/user_service_settings.go +++ b/server/api/user_service_settings.go @@ -153,6 +153,30 @@ func (s *APIService) UpdateUserSetting(ctx context.Context, request *apipb.Updat TagsSetting: incomingTags, }, } + case storepb.UserSetting_EDITOR: + var shouldUpdateSourceMode bool + for _, field := range request.UpdateMask.Paths { + switch field { + case "source_mode": + shouldUpdateSourceMode = true + default: + return nil, status.Errorf(codes.InvalidArgument, "unsupported update mask path for editor setting: %s", field) + } + } + if !shouldUpdateSourceMode { + return nil, status.Errorf(codes.InvalidArgument, "update mask must include source_mode") + } + + incomingEditor := request.UserSetting.GetEditorSetting() + if incomingEditor == nil { + return nil, status.Errorf(codes.InvalidArgument, "editor setting is required") + } + updatedSetting = &apipb.UserSetting{ + Name: request.UserSetting.Name, + Value: &apipb.UserSetting_EditorSetting_{ + EditorSetting: &apipb.UserSetting_EditorSetting{SourceMode: incomingEditor.SourceMode}, + }, + } default: return nil, status.Errorf(codes.InvalidArgument, "setting type %s should not be updated via UpdateUserSetting", storeKey.String()) } diff --git a/store/test/user_setting_test.go b/store/test/user_setting_test.go index c91793159..4af36ecc4 100644 --- a/store/test/user_setting_test.go +++ b/store/test/user_setting_test.go @@ -857,6 +857,40 @@ func TestUserSettingMultipleSettingTypes(t *testing.T) { ts.Close() } +func TestUserSettingEditor(t *testing.T) { + t.Parallel() + ctx := context.Background() + ts := NewTestingStore(ctx, t) + user, err := createTestingHostUser(ctx, ts) + require.NoError(t, err) + + _, err = ts.UpsertUserSetting(ctx, &storepb.UserSetting{ + UserId: user.ID, + Key: storepb.UserSetting_EDITOR, + Value: &storepb.UserSetting_Editor{Editor: &storepb.EditorUserSetting{SourceMode: true}}, + }) + require.NoError(t, err) + + setting, err := ts.GetUserSetting(ctx, &store.FindUserSetting{UserID: &user.ID, Key: storepb.UserSetting_EDITOR}) + require.NoError(t, err) + require.NotNil(t, setting) + require.True(t, setting.GetEditor().GetSourceMode()) + + _, err = ts.UpsertUserSetting(ctx, &storepb.UserSetting{ + UserId: user.ID, + Key: storepb.UserSetting_EDITOR, + Value: &storepb.UserSetting_Editor{Editor: &storepb.EditorUserSetting{SourceMode: false}}, + }) + require.NoError(t, err) + + setting, err = ts.GetUserSetting(ctx, &store.FindUserSetting{UserID: &user.ID, Key: storepb.UserSetting_EDITOR}) + require.NoError(t, err) + require.NotNil(t, setting) + require.False(t, setting.GetEditor().GetSourceMode()) + + ts.Close() +} + func TestUserSettingMemoViewsEdgeCases(t *testing.T) { t.Parallel() ctx := context.Background() diff --git a/store/user_setting.go b/store/user_setting.go index 1ed709039..e3fef7af4 100644 --- a/store/user_setting.go +++ b/store/user_setting.go @@ -656,6 +656,12 @@ func convertUserSettingFromRaw(raw *UserSetting) (*storepb.UserSetting, error) { return nil, errors.Wrap(err, "unmarshal tags user setting") } userSetting.Value = &storepb.UserSetting_Tags{Tags: tagsUserSetting} + case storepb.UserSetting_EDITOR: + editorUserSetting := &storepb.EditorUserSetting{} + if err := protojsonUnmarshaler.Unmarshal([]byte(raw.Value), editorUserSetting); err != nil { + return nil, errors.Wrap(err, "unmarshal editor user setting") + } + userSetting.Value = &storepb.UserSetting_Editor{Editor: editorUserSetting} case storepb.UserSetting_REFRESH_TOKENS: refreshTokensUserSetting := &storepb.RefreshTokensUserSetting{} if err := protojsonUnmarshaler.Unmarshal([]byte(raw.Value), refreshTokensUserSetting); err != nil { @@ -708,6 +714,12 @@ func convertUserSettingToRaw(userSetting *storepb.UserSetting) (*UserSetting, er return nil, errors.Wrap(err, "marshal tags user setting") } raw.Value = string(value) + case storepb.UserSetting_EDITOR: + value, err := protojson.Marshal(userSetting.GetEditor()) + if err != nil { + return nil, errors.Wrap(err, "marshal editor user setting") + } + raw.Value = string(value) case storepb.UserSetting_REFRESH_TOKENS: refreshTokensUserSetting := userSetting.GetRefreshTokens() value, err := protojson.Marshal(refreshTokensUserSetting) diff --git a/web/src/components/MemoEditor/README.md b/web/src/components/MemoEditor/README.md index f39e7115d..c90946ff8 100644 --- a/web/src/components/MemoEditor/README.md +++ b/web/src/components/MemoEditor/README.md @@ -47,7 +47,7 @@ A reducer (`edit/state/reducer.ts`) drives an external store; consumers subscrib ### Formatting and source mode -Formatting is the editor's own: its toolbar appears over selected text, the slash menu and Markdown shortcuts change block types, and its keys cover the rest. The editor's `mode` option shows the whole memo as Markdown text, with its syntax highlighted, and edits it as text; `useSourceMode` remembers the choice per device. To people it is "Markdown mode", the + menu's item with the code glyph (Lucide `CodeXml`), checked while on; in code it keeps the editor's name, source mode. A small, noninteractive `Markdown` label sits inside the composer's top-right corner while source mode is on. Switching changes no text and emits no change. In source mode the toolbar, slash menu, block handle and link card do not show; the `#tag` and `:emoji` popups open as in rich mode, the formatting keys edit the Markdown, and the checklist chip toggles the task marker on the caret's line through the same `toggleTaskList` command. The controller reads tags and checklists from the text parsed as a memo. The source text is in the body font (the editor's `sourceFont` token is left at its default) so a switch keeps the text's rhythm; nothing in memos targets the editor's source classes. +Formatting is the editor's own: its toolbar appears over selected text, the slash menu and Markdown shortcuts change block types, and its keys cover the rest. The editor's `mode` option shows the whole memo as Markdown text, with its syntax highlighted, and edits it as text; `useSourceMode` (`@/hooks/useSourceMode`) keeps the choice in the account's `EDITOR` user setting (`source_mode`), so it follows the user to every device; a switch applies at once and reverts if saving fails, and Settings → Editor changes the same value. To people it is "Markdown mode", the + menu's item with the code glyph (Lucide `CodeXml`), checked while on; in code it keeps the editor's name, source mode. A small, noninteractive `Markdown` label sits inside the composer's top-right corner while source mode is on. Switching changes no text and emits no change. In source mode the toolbar, slash menu, block handle and link card do not show; the `#tag` and `:emoji` popups open as in rich mode, the formatting keys edit the Markdown, and the checklist chip toggles the task marker on the caret's line through the same `toggleTaskList` command. The controller reads tags and checklists from the text parsed as a memo. The source text is in the body font (the editor's `sourceFont` token is left at its default) so a switch keeps the text's rhythm; nothing in memos targets the editor's source classes. ### Saving diff --git a/web/src/components/MemoEditor/edit/EditSession.tsx b/web/src/components/MemoEditor/edit/EditSession.tsx index 683cbcb9a..0c2b0bb00 100644 --- a/web/src/components/MemoEditor/edit/EditSession.tsx +++ b/web/src/components/MemoEditor/edit/EditSession.tsx @@ -3,6 +3,7 @@ import { toast } from "react-hot-toast"; import { useAuth } from "@/contexts/AuthContext"; import { useInstance } from "@/contexts/InstanceContext"; import useCurrentUser from "@/hooks/useCurrentUser"; +import { useSourceMode } from "@/hooks/useSourceMode"; import { cn } from "@/lib/utils"; import { InstanceSetting_Key } from "@/types/proto/api/instance_service_pb"; import { useTranslate } from "@/utils/i18n"; @@ -23,7 +24,6 @@ import { useInlineImageUpload, useMemoInit, useMemoSave, - useSourceMode, } from "./hooks"; import { canChooseSpaceFor } from "./initialState"; import { cacheService, errorService, transcriptionService } from "./services"; diff --git a/web/src/components/MemoEditor/edit/hooks/index.ts b/web/src/components/MemoEditor/edit/hooks/index.ts index ae0d034ce..9cc80fa41 100644 --- a/web/src/components/MemoEditor/edit/hooks/index.ts +++ b/web/src/components/MemoEditor/edit/hooks/index.ts @@ -12,4 +12,3 @@ export { useLinkMemo } from "./useLinkMemo"; export { useLocation } from "./useLocation"; export { useMemoInit } from "./useMemoInit"; export { useMemoSave } from "./useMemoSave"; -export { useSourceMode } from "./useSourceMode"; diff --git a/web/src/components/MemoEditor/edit/hooks/useSourceMode.ts b/web/src/components/MemoEditor/edit/hooks/useSourceMode.ts deleted file mode 100644 index a6e4f1c78..000000000 --- a/web/src/components/MemoEditor/edit/hooks/useSourceMode.ts +++ /dev/null @@ -1,7 +0,0 @@ -import type { EditorMode } from "@usememos/editor"; -import { useLocalStorage } from "@/hooks/useLocalStorage"; - -const STORAGE_KEY = "memos-editor-mode"; - -/** The composer's editing mode, remembered per device and shared by every composer. */ -export const useSourceMode = () => useLocalStorage(STORAGE_KEY, "rich"); diff --git a/web/src/components/Settings/EditorSection.tsx b/web/src/components/Settings/EditorSection.tsx new file mode 100644 index 000000000..2e774df98 --- /dev/null +++ b/web/src/components/Settings/EditorSection.tsx @@ -0,0 +1,26 @@ +import { Switch } from "@/components/ui/switch"; +import { useSourceMode } from "@/hooks/useSourceMode"; +import { useTranslate } from "@/utils/i18n"; +import { SettingList, SettingListItem } from "./SettingList"; +import SettingSection from "./SettingSection"; + +const EditorSection = () => { + const t = useTranslate(); + const [editorMode, setEditorMode] = useSourceMode(); + + return ( + + + + setEditorMode(checked ? "source" : "rich")} + /> + + + + ); +}; + +export default EditorSection; diff --git a/web/src/components/Settings/settingSections.ts b/web/src/components/Settings/settingSections.ts index 22ae8f9d8..5e54210b2 100644 --- a/web/src/components/Settings/settingSections.ts +++ b/web/src/components/Settings/settingSections.ts @@ -13,6 +13,7 @@ import { type LucideIcon, MailIcon, Settings2Icon, + SquarePenIcon, TagsIcon, UserIcon, UsersIcon, @@ -22,6 +23,7 @@ import { type ComponentType } from "react"; import AccessTokenSection from "@/components/Settings/AccessTokenSection"; import AISection from "@/components/Settings/AISection"; import ConfigurationSection from "@/components/Settings/ConfigurationSection"; +import EditorSection from "@/components/Settings/EditorSection"; import InstanceSection from "@/components/Settings/InstanceSection"; import MemberSection from "@/components/Settings/MemberSection"; import MemoExportSection from "@/components/Settings/MemoExportSection"; @@ -44,6 +46,7 @@ export type SettingSectionKey = | "spaces" | "access-token" | "preference" + | "editor" | "webhook" | "member" | "system" @@ -97,6 +100,13 @@ export const SETTINGS_SECTIONS: SettingSectionDefinition[] = [ icon: CogIcon, component: PreferencesSection, }, + { + key: "editor", + scope: "basic", + labelKey: "setting.editor.label", + icon: SquarePenIcon, + component: EditorSection, + }, { key: "webhook", scope: "basic", diff --git a/web/src/contexts/AuthContext.tsx b/web/src/contexts/AuthContext.tsx index 05696a02e..5627c0a81 100644 --- a/web/src/contexts/AuthContext.tsx +++ b/web/src/contexts/AuthContext.tsx @@ -5,6 +5,7 @@ import { authServiceClient, refreshAccessToken, userServiceClient } from "@/conn import { userKeys } from "@/hooks/useUserQueries"; import type { User, + UserSetting_EditorSetting, UserSetting_GeneralSetting, UserSetting_TagsSetting, UserSetting_WebhooksSetting, @@ -15,6 +16,8 @@ interface AuthState { userGeneralSetting: UserSetting_GeneralSetting | undefined; userWebhooksSetting: UserSetting_WebhooksSetting | undefined; userTagsSetting: UserSetting_TagsSetting | undefined; + /** Unset until the user first changes an editor preference. */ + userEditorSetting: UserSetting_EditorSetting | undefined; /** Authentication identity has settled, while user settings may still be loading. */ isIdentityInitialized: boolean; /** User settings that affect memo presentation are safe to consume. */ @@ -28,6 +31,8 @@ interface AuthContextValue extends AuthState { logout: () => Promise; refetchSettings: () => Promise; setCurrentUser: (user: User | undefined) => void; + /** Applies an editor setting locally, ahead of or instead of a refetch. */ + setUserEditorSetting: (setting: UserSetting_EditorSetting | undefined) => void; } const AuthContext = createContext(null); @@ -38,6 +43,7 @@ const UNAUTHENTICATED_STATE: AuthState = { userGeneralSetting: undefined, userWebhooksSetting: undefined, userTagsSetting: undefined, + userEditorSetting: undefined, isIdentityInitialized: true, isUserSettingsInitialized: true, isInitialized: true, @@ -51,6 +57,7 @@ export function AuthProvider({ children }: { children: ReactNode }) { userGeneralSetting: undefined, userWebhooksSetting: undefined, userTagsSetting: undefined, + userEditorSetting: undefined, isIdentityInitialized: false, isUserSettingsInitialized: false, isInitialized: false, @@ -62,10 +69,12 @@ export function AuthProvider({ children }: { children: ReactNode }) { const generalSetting = settings.find((s) => s.value.case === "generalSetting"); const webhooksSetting = settings.find((s) => s.value.case === "webhooksSetting"); const tagsSetting = settings.find((s) => s.value.case === "tagsSetting"); + const editorSetting = settings.find((s) => s.value.case === "editorSetting"); const userSettings = { userGeneralSetting: generalSetting?.value.case === "generalSetting" ? generalSetting.value.value : undefined, userWebhooksSetting: webhooksSetting?.value.case === "webhooksSetting" ? webhooksSetting.value.value : undefined, userTagsSetting: tagsSetting?.value.case === "tagsSetting" ? tagsSetting.value.value : undefined, + userEditorSetting: editorSetting?.value.case === "editorSetting" ? editorSetting.value.value : undefined, }; // Tag settings control sensitive-content blurring. Publish them as soon as @@ -190,6 +199,10 @@ export function AuthProvider({ children }: { children: ReactNode }) { [queryClient], ); + const setUserEditorSetting = useCallback((setting: UserSetting_EditorSetting | undefined) => { + setState((prev) => ({ ...prev, userEditorSetting: setting })); + }, []); + // Memoize context value to prevent unnecessary re-renders of consumers const value = useMemo( () => ({ @@ -198,8 +211,9 @@ export function AuthProvider({ children }: { children: ReactNode }) { logout, refetchSettings, setCurrentUser, + setUserEditorSetting, }), - [state, initialize, logout, refetchSettings, setCurrentUser], + [state, initialize, logout, refetchSettings, setCurrentUser, setUserEditorSetting], ); return {children}; diff --git a/web/src/hooks/useSourceMode.ts b/web/src/hooks/useSourceMode.ts new file mode 100644 index 000000000..c49e23d6c --- /dev/null +++ b/web/src/hooks/useSourceMode.ts @@ -0,0 +1,35 @@ +import { create } from "@bufbuild/protobuf"; +import type { EditorMode } from "@usememos/editor"; +import { useCallback } from "react"; +import { toast } from "react-hot-toast"; +import { useAuth } from "@/contexts/AuthContext"; +import { useUpdateUserEditorSetting } from "@/hooks/useUserQueries"; +import { handleError } from "@/lib/error"; +import { UserSetting_EditorSettingSchema } from "@/types/proto/api/user_service_pb"; + +/** + * The memo editor's mode, saved to the account's EDITOR setting so every composer on every device shares it. + * A change applies at once and is reverted if saving it fails. + */ +export const useSourceMode = (): [EditorMode, (mode: EditorMode) => void] => { + const { currentUser, userEditorSetting, setUserEditorSetting } = useAuth(); + const { mutate: updateUserEditorSetting } = useUpdateUserEditorSetting(currentUser?.name); + const mode: EditorMode = userEditorSetting?.sourceMode ? "source" : "rich"; + + const setMode = useCallback( + (next: EditorMode) => { + const previous = userEditorSetting; + const editorSetting = create(UserSetting_EditorSettingSchema, { sourceMode: next === "source" }); + setUserEditorSetting(editorSetting); + updateUserEditorSetting(editorSetting, { + onError: (error) => { + setUserEditorSetting(previous); + handleError(error, toast.error); + }, + }); + }, + [setUserEditorSetting, updateUserEditorSetting, userEditorSetting], + ); + + return [mode, setMode]; +}; diff --git a/web/src/hooks/useUserQueries.ts b/web/src/hooks/useUserQueries.ts index d68b3399b..a4e9496b2 100644 --- a/web/src/hooks/useUserQueries.ts +++ b/web/src/hooks/useUserQueries.ts @@ -12,6 +12,7 @@ import { UserNotification, UserNotification_Status, UserSetting, + UserSetting_EditorSetting, UserSetting_GeneralSetting, UserSetting_Key, UserSettingSchema, @@ -312,6 +313,31 @@ export function useUpdateUserGeneralSetting(currentUserName?: string) { }); } +// Hook to update the user's EDITOR setting +export function useUpdateUserEditorSetting(currentUserName?: string) { + const queryClient = useQueryClient(); + + return useMutation({ + mutationFn: async (editorSetting: UserSetting_EditorSetting) => { + if (!currentUserName) { + throw new Error("No current user"); + } + + const userSetting = create(UserSettingSchema, { + name: buildUserSettingName(currentUserName, UserSetting_Key.EDITOR), + value: { case: "editorSetting", value: editorSetting }, + }); + return await userServiceClient.updateUserSetting({ + userSetting, + updateMask: create(FieldMaskSchema, { paths: ["source_mode"] }), + }); + }, + onSuccess: () => { + queryClient.invalidateQueries({ queryKey: [...userKeys.all, "settings"] }); + }, + }); +} + // Hook to fetch multiple users by names (returns Map) export function useUsersByNames(names: string[], options?: { enabled?: boolean }) { const queryClient = useQueryClient(); diff --git a/web/src/locales/ar.json b/web/src/locales/ar.json index 6e05a32d7..2e82f0420 100644 --- a/web/src/locales/ar.json +++ b/web/src/locales/ar.json @@ -433,6 +433,10 @@ "uploads-privacy-description": "التحكم في المعلومات الحساسة المتعلقة بالخصوصية المُرسلة مع الوسائط المُحمّلة.", "uploads-privacy-title": "التحميلات والخصوصية" }, + "editor": { + "label": "المحرر", + "markdown-mode-description": "اكتب المذكرات وعدّلها كنص Markdown بدلًا من النص المنسق." + }, "memo-view": { "create": "إنشاء عرض", "delete-confirm": "هل أنت متأكد من حذف طريقة العرض `{{title}}`؟", diff --git a/web/src/locales/az.json b/web/src/locales/az.json index de710e909..328d2da5c 100644 --- a/web/src/locales/az.json +++ b/web/src/locales/az.json @@ -832,6 +832,10 @@ "uploads-privacy-description": "Yüklənən media ilə birlikdə göndərilən, məxfiliyə həssas məlumatları idarə edin.", "uploads-privacy-title": "Yükləmələr və məxfilik" }, + "editor": { + "label": "Redaktor", + "markdown-mode-description": "Qeydləri formatlanmış mətn əvəzinə Markdown mətni kimi yazın və redaktə edin." + }, "memo-view": { "create": "Görünüş yarat", "change-icon": "Görünüş ikonunu dəyiş", diff --git a/web/src/locales/bg.json b/web/src/locales/bg.json index fa9741611..00f94741e 100644 --- a/web/src/locales/bg.json +++ b/web/src/locales/bg.json @@ -638,6 +638,10 @@ "uploads-privacy-description": "Контролирайте поверителната информация, изпратена с качените медийни файлове.", "uploads-privacy-title": "Качвания и поверителност" }, + "editor": { + "label": "Редактор", + "markdown-mode-description": "Пишете и редактирайте бележки като Markdown текст вместо форматиран текст." + }, "memo-view": { "create": "Създаване на изглед", "delete-confirm": "Сигурни ли сте, че искате да изтриете изгледа `{{title}}`?", diff --git a/web/src/locales/ca.json b/web/src/locales/ca.json index f5e695a52..2e0e5fdad 100644 --- a/web/src/locales/ca.json +++ b/web/src/locales/ca.json @@ -522,6 +522,10 @@ "uploads-privacy-description": "Controla la informació sensible a la privadesa enviada amb els continguts multimèdia carregats.", "uploads-privacy-title": "Càrregues i privadesa" }, + "editor": { + "label": "Editor", + "markdown-mode-description": "Escriu i edita les notes com a text Markdown en lloc de text amb format." + }, "memo-view": { "create": "Crea una vista", "delete-confirm": "Estàs segur que vols eliminar la vista `{{title}}`?", diff --git a/web/src/locales/cs.json b/web/src/locales/cs.json index 0a643b35c..77d752dd7 100644 --- a/web/src/locales/cs.json +++ b/web/src/locales/cs.json @@ -522,6 +522,10 @@ "uploads-privacy-description": "Ovládejte informace citlivé na ochranu soukromí odesílané s nahranými médii.", "uploads-privacy-title": "Nahrávání a soukromí" }, + "editor": { + "label": "Editor", + "markdown-mode-description": "Pište a upravujte poznámky jako text Markdown místo formátovaného textu." + }, "memo-view": { "create": "Vytvořit pohled", "delete-confirm": "Jste si jisti, že chcete odstranit zobrazení `{{title}}`?", diff --git a/web/src/locales/da.json b/web/src/locales/da.json index a40bc6cda..5d7417b6e 100644 --- a/web/src/locales/da.json +++ b/web/src/locales/da.json @@ -638,6 +638,10 @@ "uploads-privacy-description": "Kontroller privatlivsfølsomme oplysninger, der indsendes med uploadede medier.", "uploads-privacy-title": "Uploads og privatliv" }, + "editor": { + "label": "Editor", + "markdown-mode-description": "Skriv og rediger notater som Markdown-tekst i stedet for formateret tekst." + }, "memo-view": { "create": "Opret visning", "delete-confirm": "Er du sikker på, at du vil slette visningen `{{title}}`?", diff --git a/web/src/locales/de.json b/web/src/locales/de.json index b13406ee5..cad0ce794 100644 --- a/web/src/locales/de.json +++ b/web/src/locales/de.json @@ -522,6 +522,10 @@ "uploads-privacy-description": "Kontrolle über datenschutzrelevante Informationen, die mit hochgeladenen Medien übermittelt werden.", "uploads-privacy-title": "Uploads & Datenschutz" }, + "editor": { + "label": "Editor", + "markdown-mode-description": "Memos als Markdown-Text statt als formatierten Text schreiben und bearbeiten." + }, "memo-view": { "create": "Ansicht erstellen", "delete-confirm": "Bist du sicher, dass du die Ansicht `{{title}}` löschen möchtest?", diff --git a/web/src/locales/el.json b/web/src/locales/el.json index 535f38dc2..35de5fef5 100644 --- a/web/src/locales/el.json +++ b/web/src/locales/el.json @@ -638,6 +638,10 @@ "uploads-privacy-description": "Έλεγχος πληροφοριών που είναι ευαίσθητες στην προστασία της ιδιωτικής ζωής και υποβάλλονται με τα μεταφορτωμένα μέσα.", "uploads-privacy-title": "Μεταφορτώσεις & απόρρητο" }, + "editor": { + "label": "Πρόγραμμα επεξεργασίας", + "markdown-mode-description": "Γράψτε και επεξεργαστείτε σημειώσεις ως κείμενο Markdown αντί για μορφοποιημένο κείμενο." + }, "memo-view": { "create": "Δημιουργία προβολής", "delete-confirm": "Είστε βέβαιοι ότι θέλετε να διαγράψετε την προβολή `{{title}}`;", diff --git a/web/src/locales/en-GB.json b/web/src/locales/en-GB.json index 511066909..b34a3e30c 100644 --- a/web/src/locales/en-GB.json +++ b/web/src/locales/en-GB.json @@ -522,6 +522,10 @@ "uploads-privacy-description": "Control privacy-sensitive information submitted with uploaded media.", "uploads-privacy-title": "Uploads & privacy" }, + "editor": { + "label": "Editor", + "markdown-mode-description": "Write and edit memos as Markdown text instead of formatted text." + }, "memo-view": { "create": "Create view", "delete-confirm": "Are you sure you want to delete view `{{title}}`?", diff --git a/web/src/locales/en.json b/web/src/locales/en.json index 8322ad7fb..a97694246 100644 --- a/web/src/locales/en.json +++ b/web/src/locales/en.json @@ -832,6 +832,10 @@ "uploads-privacy-description": "Control privacy-sensitive information submitted with uploaded media.", "uploads-privacy-title": "Uploads & privacy" }, + "editor": { + "label": "Editor", + "markdown-mode-description": "Write and edit memos as Markdown text instead of formatted text." + }, "memo-view": { "create": "Create view", "change-icon": "Change view icon", diff --git a/web/src/locales/es.json b/web/src/locales/es.json index e804562ac..ef8fb798b 100644 --- a/web/src/locales/es.json +++ b/web/src/locales/es.json @@ -522,6 +522,10 @@ "uploads-privacy-description": "Controlar la información confidencial enviada con los archivos multimedia cargados.", "uploads-privacy-title": "Cargas y privacidad" }, + "editor": { + "label": "Editor", + "markdown-mode-description": "Escribe y edita las notas como texto Markdown en lugar de texto con formato." + }, "memo-view": { "create": "Crear vista", "delete-confirm": "¿Estás seguro de que quieres eliminar la vista `{{title}}`?", diff --git a/web/src/locales/et.json b/web/src/locales/et.json index f71b45296..ab84361ac 100644 --- a/web/src/locales/et.json +++ b/web/src/locales/et.json @@ -638,6 +638,10 @@ "uploads-privacy-description": "Kontrolli üleslaaditud meediaga esitatud privaatsustundlikku teavet.", "uploads-privacy-title": "Üleslaadimised ja privaatsus" }, + "editor": { + "label": "Redaktor", + "markdown-mode-description": "Kirjuta ja muuda memosid Markdown-tekstina vormindatud teksti asemel." + }, "memo-view": { "create": "Loo vaade", "delete-confirm": "Kas olete kindel, et soovite vaate `{{title}}` kustutada?", diff --git a/web/src/locales/fa.json b/web/src/locales/fa.json index 3dd347d8c..4df5bacf0 100644 --- a/web/src/locales/fa.json +++ b/web/src/locales/fa.json @@ -433,6 +433,10 @@ "uploads-privacy-description": "اطلاعات حساس به حریم خصوصی ارسال شده با رسانه آپلود شده را کنترل می‌کند.", "uploads-privacy-title": "آپلودها و حریم خصوصی" }, + "editor": { + "label": "ویرایشگر", + "markdown-mode-description": "یادداشت‌ها را به‌جای متن قالب‌بندی‌شده، به‌صورت متن Markdown بنویسید و ویرایش کنید." + }, "memo-view": { "create": "ایجاد نما", "delete-confirm": "آیا مطمئن هستید که می‌خواهید نمای «{{title}}» را حذف کنید؟", diff --git a/web/src/locales/fi.json b/web/src/locales/fi.json index 3e4f78eca..4135b9ddf 100644 --- a/web/src/locales/fi.json +++ b/web/src/locales/fi.json @@ -638,6 +638,10 @@ "uploads-privacy-description": "Hallitse ladatun median mukana lähetettyjä yksityisyyttä suojaavia tietoja.", "uploads-privacy-title": "Lataukset ja tietosuoja" }, + "editor": { + "label": "Editori", + "markdown-mode-description": "Kirjoita ja muokkaa muistioita Markdown-tekstinä muotoillun tekstin sijaan." + }, "memo-view": { "create": "Luo näkymä", "delete-confirm": "Haluatko varmasti poistaa näkymän `{{title}}`?", diff --git a/web/src/locales/fr.json b/web/src/locales/fr.json index 6ce39cdf7..3abea1035 100644 --- a/web/src/locales/fr.json +++ b/web/src/locales/fr.json @@ -522,6 +522,10 @@ "uploads-privacy-description": "Contrôler les informations sensibles soumises avec les médias chargés.", "uploads-privacy-title": "Téléchargements et confidentialité" }, + "editor": { + "label": "Éditeur", + "markdown-mode-description": "Rédigez et modifiez les mémos en texte Markdown plutôt qu'en texte mis en forme." + }, "memo-view": { "create": "Créer une vue", "delete-confirm": "Êtes-vous sûr de vouloir supprimer la vue `{{title}}` ?", diff --git a/web/src/locales/gl.json b/web/src/locales/gl.json index f302609c4..719173bb6 100644 --- a/web/src/locales/gl.json +++ b/web/src/locales/gl.json @@ -522,6 +522,10 @@ "uploads-privacy-description": "Controla a información confidencial sobre a privacidade enviada cos medios cargados.", "uploads-privacy-title": "Cargas e privacidade" }, + "editor": { + "label": "Editor", + "markdown-mode-description": "Escribe e edita as notas como texto Markdown en lugar de texto con formato." + }, "memo-view": { "create": "Crear vista", "delete-confirm": "Tes certeza de querer eliminar a vista `{{title}}`?", diff --git a/web/src/locales/he.json b/web/src/locales/he.json index 6ba210675..6352e21e0 100644 --- a/web/src/locales/he.json +++ b/web/src/locales/he.json @@ -671,6 +671,10 @@ "uploads-privacy-description": "שליטה במידע רגיש לפרטיות שנשלח עם מדיה שהועלתה.", "uploads-privacy-title": "העלאות ופרטיות" }, + "editor": { + "label": "עורך", + "markdown-mode-description": "כתבו וערכו פתקים כטקסט Markdown במקום כטקסט מעוצב." + }, "memo-view": { "create": "יצירת תצוגה", "delete-confirm": "האם אתם בטוחים שברצונכם למחוק את התצוגה `{{title}}`?", diff --git a/web/src/locales/hi.json b/web/src/locales/hi.json index b3b64ce19..e459a9c1b 100644 --- a/web/src/locales/hi.json +++ b/web/src/locales/hi.json @@ -433,6 +433,10 @@ "uploads-privacy-description": "अपलोड किए गए मीडिया के साथ सबमिट की गई प्राइवेसी-सेंसिटिव जानकारी को कंट्रोल करें।", "uploads-privacy-title": "अपलोड और प्राइवेसी" }, + "editor": { + "label": "एडिटर", + "markdown-mode-description": "मेमो को फ़ॉर्मैट किए गए टेक्स्ट के बजाय Markdown टेक्स्ट के रूप में लिखें और संपादित करें।" + }, "memo-view": { "create": "व्यू बनाएँ", "delete-confirm": "क्या आप वाकई दृश्य `{{title}}` हटाना चाहते हैं?", diff --git a/web/src/locales/hr.json b/web/src/locales/hr.json index 9627bc05b..10434459a 100644 --- a/web/src/locales/hr.json +++ b/web/src/locales/hr.json @@ -522,6 +522,10 @@ "uploads-privacy-description": "Kontrolirajte podatke osjetljive na privatnost koji se šalju s prenesenim medijima.", "uploads-privacy-title": "Prijenosi i privatnost" }, + "editor": { + "label": "Uređivač", + "markdown-mode-description": "Pišite i uređujte bilješke kao Markdown tekst umjesto oblikovanog teksta." + }, "memo-view": { "create": "Stvori prikaz", "delete-confirm": "Jesi li siguran da želiš obrisati prikaz `{{title}}`?", diff --git a/web/src/locales/hu.json b/web/src/locales/hu.json index b0271ef30..5a7c7f675 100644 --- a/web/src/locales/hu.json +++ b/web/src/locales/hu.json @@ -522,6 +522,10 @@ "uploads-privacy-description": "A feltöltött médiával beküldött adatvédelmi szempontból érzékeny információk kezelése.", "uploads-privacy-title": "Feltöltések és adatvédelem" }, + "editor": { + "label": "Szerkesztő", + "markdown-mode-description": "Jegyzetek írása és szerkesztése Markdown szövegként formázott szöveg helyett." + }, "memo-view": { "create": "Nézet létrehozása", "delete-confirm": "Biztosan törlöd a `{{title}}` nézetet?", diff --git a/web/src/locales/id.json b/web/src/locales/id.json index d0371f913..0fc442ca9 100644 --- a/web/src/locales/id.json +++ b/web/src/locales/id.json @@ -433,6 +433,10 @@ "uploads-privacy-description": "Mengontrol informasi sensitif privasi yang dikirimkan dengan media yang diunggah.", "uploads-privacy-title": "Unggahan & privasi" }, + "editor": { + "label": "Editor", + "markdown-mode-description": "Tulis dan sunting memo sebagai teks Markdown, bukan teks berformat." + }, "memo-view": { "create": "Buat tampilan", "delete-confirm": "Apakah Anda yakin ingin menghapus tampilan `{{title}}`?", diff --git a/web/src/locales/it.json b/web/src/locales/it.json index d13c61fb0..aa8909ae6 100644 --- a/web/src/locales/it.json +++ b/web/src/locales/it.json @@ -522,6 +522,10 @@ "uploads-privacy-description": "Controlla le informazioni sensibili alla privacy inviate con i media caricati.", "uploads-privacy-title": "Caricamenti e privacy" }, + "editor": { + "label": "Editor", + "markdown-mode-description": "Scrivi e modifica i promemoria come testo Markdown anziché come testo formattato." + }, "memo-view": { "create": "Crea vista", "delete-confirm": "Confermi di voler eliminare la vista `{{title}}`?", diff --git a/web/src/locales/ja.json b/web/src/locales/ja.json index ab43963f4..59d14b253 100644 --- a/web/src/locales/ja.json +++ b/web/src/locales/ja.json @@ -522,6 +522,10 @@ "uploads-privacy-description": "アップロードされたメディアとともに送信されるプライバシーに配慮した情報を管理します。", "uploads-privacy-title": "アップロードとプライバシー" }, + "editor": { + "label": "エディター", + "markdown-mode-description": "メモを書式付きテキストではなく Markdown テキストとして作成・編集します。" + }, "memo-view": { "create": "ビューを作成", "delete-confirm": "ビュー `{{title}}` を削除してもよろしいですか?", diff --git a/web/src/locales/ka-GE.json b/web/src/locales/ka-GE.json index 4a76a4022..8ad21005f 100644 --- a/web/src/locales/ka-GE.json +++ b/web/src/locales/ka-GE.json @@ -522,6 +522,10 @@ "uploads-privacy-description": "ატვირთულ მედიასთან ერთად წარდგენილი კონფიდენციალურობისადმი მგრძნობიარე ინფორმაციის კონტროლი.", "uploads-privacy-title": "ატვირთვები და კონფიდენციალურობა" }, + "editor": { + "label": "რედაქტორი", + "markdown-mode-description": "დაწერეთ და დაარედაქტირეთ შენიშვნები Markdown ტექსტად ფორმატირებული ტექსტის ნაცვლად." + }, "memo-view": { "create": "ხედის შექმნა", "delete-confirm": "დარწმუნებული ხართ, რომ გინდათ ხედის `{{title}}` წაშლა?", diff --git a/web/src/locales/ko.json b/web/src/locales/ko.json index ce8a4f87c..d4bc0cf49 100644 --- a/web/src/locales/ko.json +++ b/web/src/locales/ko.json @@ -433,6 +433,10 @@ "uploads-privacy-description": "업로드된 미디어와 함께 제출되는 개인 정보 보호에 민감한 정보를 관리합니다.", "uploads-privacy-title": "업로드 및 개인 정보 보호" }, + "editor": { + "label": "편집기", + "markdown-mode-description": "메모를 서식 있는 텍스트 대신 Markdown 텍스트로 작성하고 편집합니다." + }, "memo-view": { "create": "뷰 만들기", "delete-confirm": "보기 `{{title}}`를 정말로 삭제하시겠습니까?", diff --git a/web/src/locales/lt.json b/web/src/locales/lt.json index 14ef99cf2..497093695 100644 --- a/web/src/locales/lt.json +++ b/web/src/locales/lt.json @@ -638,6 +638,10 @@ "uploads-privacy-description": "Valdykite privatumo požiūriu svarbią informaciją, pateiktą kartu su įkelta medija.", "uploads-privacy-title": "Įkėlimai ir privatumas" }, + "editor": { + "label": "Redaktorius", + "markdown-mode-description": "Rašykite ir redaguokite pastabas kaip Markdown tekstą, o ne formatuotą tekstą." + }, "memo-view": { "create": "Sukurti rodinį", "delete-confirm": "Ar tikrai norite ištrinti rodinį `{{title}}`?", diff --git a/web/src/locales/lv.json b/web/src/locales/lv.json index 8c573b831..0a7bedcf9 100644 --- a/web/src/locales/lv.json +++ b/web/src/locales/lv.json @@ -638,6 +638,10 @@ "uploads-privacy-description": "Kontrolējiet konfidenciālu informāciju, kas iesniegta kopā ar augšupielādēto multividi.", "uploads-privacy-title": "Augšupielādes un konfidencialitāte" }, + "editor": { + "label": "Redaktors", + "markdown-mode-description": "Rakstiet un rediģējiet piezīmes kā Markdown tekstu, nevis formatētu tekstu." + }, "memo-view": { "create": "Izveidot skatu", "delete-confirm": "Vai tiešām vēlaties dzēst skatu `{{title}}`?", diff --git a/web/src/locales/mr.json b/web/src/locales/mr.json index d76411826..d78065fb6 100644 --- a/web/src/locales/mr.json +++ b/web/src/locales/mr.json @@ -433,6 +433,10 @@ "uploads-privacy-description": "अपलोड केलेल्या मीडियासोबत सबमिट केलेल्या गोपनीयतेसाठी संवेदनशील माहितीवर नियंत्रण ठेवा.", "uploads-privacy-title": "अपलोड आणि गोपनीयता" }, + "editor": { + "label": "संपादक", + "markdown-mode-description": "मेमो स्वरूपित मजकुराऐवजी Markdown मजकूर म्हणून लिहा आणि संपादित करा." + }, "memo-view": { "create": "दृश्य तयार करा", "delete-confirm": "तुम्हाला दृश्य `{{title}}` हटवायचे आहे याची खात्री आहे का?", diff --git a/web/src/locales/nb.json b/web/src/locales/nb.json index ef3b2a4f7..219b42ed8 100644 --- a/web/src/locales/nb.json +++ b/web/src/locales/nb.json @@ -522,6 +522,10 @@ "uploads-privacy-description": "Kontroller personvernsensitiv informasjon som sendes inn med opplastede medier.", "uploads-privacy-title": "Opplastinger og personvern" }, + "editor": { + "label": "Redigering", + "markdown-mode-description": "Skriv og rediger notater som Markdown-tekst i stedet for formatert tekst." + }, "memo-view": { "create": "Opprett visning", "delete-confirm": "Er du sikker på at du vil slette visningen `{{title}}`?", diff --git a/web/src/locales/nl.json b/web/src/locales/nl.json index 9be184494..3bfdd179e 100644 --- a/web/src/locales/nl.json +++ b/web/src/locales/nl.json @@ -522,6 +522,10 @@ "uploads-privacy-description": "Beheer privacygevoelige informatie die met geüploade media wordt verzonden.", "uploads-privacy-title": "Uploads en privacy" }, + "editor": { + "label": "Editor", + "markdown-mode-description": "Schrijf en bewerk memo's als Markdown-tekst in plaats van opgemaakte tekst." + }, "memo-view": { "create": "Weergave maken", "delete-confirm": "Weet je zeker dat je weergave `{{title}}` wilt verwijderen?", diff --git a/web/src/locales/nn.json b/web/src/locales/nn.json index 7965f7ffa..e33ef3457 100644 --- a/web/src/locales/nn.json +++ b/web/src/locales/nn.json @@ -757,6 +757,10 @@ "uploads-privacy-description": "Styr kva personvernkjenslege opplysningar som vert sende med opplasta medium.", "uploads-privacy-title": "Opplasting og personvern" }, + "editor": { + "label": "Redigering", + "markdown-mode-description": "Skriv og rediger notat som Markdown-tekst i staden for formatert tekst." + }, "resource-stats": { "database": { "driver": "Drivar", diff --git a/web/src/locales/pl.json b/web/src/locales/pl.json index fd7567b90..06d4f7625 100644 --- a/web/src/locales/pl.json +++ b/web/src/locales/pl.json @@ -522,6 +522,10 @@ "uploads-privacy-description": "Kontroluj informacje wrażliwe dotyczące prywatności przesyłane wraz z przesłanymi multimediami.", "uploads-privacy-title": "Przesyłanie i prywatność" }, + "editor": { + "label": "Edytor", + "markdown-mode-description": "Pisz i edytuj notatki jako tekst Markdown zamiast tekstu sformatowanego." + }, "memo-view": { "create": "Utwórz widok", "delete-confirm": "Czy na pewno chcesz usunąć widok `{{title}}`?", diff --git a/web/src/locales/pt-BR.json b/web/src/locales/pt-BR.json index b68e164a1..72f5fe8b1 100644 --- a/web/src/locales/pt-BR.json +++ b/web/src/locales/pt-BR.json @@ -433,6 +433,10 @@ "uploads-privacy-description": "Controle as informações confidenciais de privacidade enviadas com a mídia carregada.", "uploads-privacy-title": "Uploads e privacidade" }, + "editor": { + "label": "Editor", + "markdown-mode-description": "Escreva e edite memorandos como texto Markdown em vez de texto formatado." + }, "memo-view": { "create": "Criar visualização", "delete-confirm": "Tem certeza de que deseja excluir a vista `{{title}}`?", diff --git a/web/src/locales/pt-PT.json b/web/src/locales/pt-PT.json index b3a7b8294..5a2b5d692 100644 --- a/web/src/locales/pt-PT.json +++ b/web/src/locales/pt-PT.json @@ -522,6 +522,10 @@ "uploads-privacy-description": "Controle as informações de privacidade confidenciais enviadas com os suportes carregados.", "uploads-privacy-title": "Uploads e privacidade" }, + "editor": { + "label": "Editor", + "markdown-mode-description": "Escreva e edite memorandos como texto Markdown em vez de texto formatado." + }, "memo-view": { "create": "Criar vista", "delete-confirm": "Tem a certeza de que deseja eliminar a vista `{{title}}`?", diff --git a/web/src/locales/ro.json b/web/src/locales/ro.json index ee4c6bc8e..3a04c0824 100644 --- a/web/src/locales/ro.json +++ b/web/src/locales/ro.json @@ -638,6 +638,10 @@ "uploads-privacy-description": "Controlați informațiile sensibile la confidențialitate trimise odată cu media încărcată.", "uploads-privacy-title": "Încărcări și confidențialitate" }, + "editor": { + "label": "Editor", + "markdown-mode-description": "Scrieți și editați notițele ca text Markdown în loc de text formatat." + }, "memo-view": { "create": "Creează o vizualizare", "delete-confirm": "Sigur doriți să ștergeți vizualizarea `{{title}}`?", diff --git a/web/src/locales/ru.json b/web/src/locales/ru.json index 640335c8e..0e34e66e9 100644 --- a/web/src/locales/ru.json +++ b/web/src/locales/ru.json @@ -522,6 +522,10 @@ "uploads-privacy-description": "Управляйте конфиденциальными сведениями, отправляемыми вместе с загружаемыми медиафайлами.", "uploads-privacy-title": "Загрузки и конфиденциальность" }, + "editor": { + "label": "Редактор", + "markdown-mode-description": "Создавайте и редактируйте заметки как текст Markdown вместо форматированного текста." + }, "memo-view": { "create": "Создать представление", "delete-confirm": "Вы уверены, что хотите удалить представление `{{title}}`?", diff --git a/web/src/locales/sk.json b/web/src/locales/sk.json index f10905381..41133484e 100644 --- a/web/src/locales/sk.json +++ b/web/src/locales/sk.json @@ -638,6 +638,10 @@ "uploads-privacy-description": "Ovládať informácie citlivé na ochranu súkromia odoslané s nahranými médiami.", "uploads-privacy-title": "Nahrávanie a súkromie" }, + "editor": { + "label": "Editor", + "markdown-mode-description": "Píšte a upravujte poznámky ako text Markdown namiesto formátovaného textu." + }, "memo-view": { "create": "Vytvoriť zobrazenie", "delete-confirm": "Naozaj chcete odstrániť zobrazenie `{{title}}`?", diff --git a/web/src/locales/sl.json b/web/src/locales/sl.json index fc28f022c..90bd68b52 100644 --- a/web/src/locales/sl.json +++ b/web/src/locales/sl.json @@ -522,6 +522,10 @@ "uploads-privacy-description": "Nadzorujte podatke, ki so občutljivi na zasebnost in so poslani z naloženimi mediji.", "uploads-privacy-title": "Nalaganja in zasebnost" }, + "editor": { + "label": "Urejevalnik", + "markdown-mode-description": "Pišite in urejajte beležke kot besedilo Markdown namesto oblikovanega besedila." + }, "memo-view": { "create": "Ustvari pogled", "delete-confirm": "Ali ste prepričani, da želite izbrisati pogled \"{{title}}\"?", diff --git a/web/src/locales/sr.json b/web/src/locales/sr.json index d47c8654f..880240c2a 100644 --- a/web/src/locales/sr.json +++ b/web/src/locales/sr.json @@ -638,6 +638,10 @@ "uploads-privacy-description": "Контролишите информације које су осетљиве на приватност и које се достављају уз отпремљене медије.", "uploads-privacy-title": "Отпремања и приватност" }, + "editor": { + "label": "Уређивач", + "markdown-mode-description": "Пишите и уређујте белешке као Markdown текст уместо форматираног текста." + }, "memo-view": { "create": "Направи приказ", "delete-confirm": "Да ли сте сигурни да желите да избришете приказ `{{title}}`?", diff --git a/web/src/locales/sv.json b/web/src/locales/sv.json index cf373ad87..d00ea4645 100644 --- a/web/src/locales/sv.json +++ b/web/src/locales/sv.json @@ -522,6 +522,10 @@ "uploads-privacy-description": "Kontrollera integritetskänslig information som skickas in med uppladdad media.", "uploads-privacy-title": "Uppladdningar och sekretess" }, + "editor": { + "label": "Redigerare", + "markdown-mode-description": "Skriv och redigera memon som Markdown-text i stället för formaterad text." + }, "memo-view": { "create": "Skapa vy", "delete-confirm": "Är du säker på att du vill ta bort vyn `{{title}}`?", diff --git a/web/src/locales/th.json b/web/src/locales/th.json index 668fd5655..eb45a4884 100644 --- a/web/src/locales/th.json +++ b/web/src/locales/th.json @@ -433,6 +433,10 @@ "uploads-privacy-description": "ควบคุมข้อมูลที่ละเอียดอ่อนด้านความเป็นส่วนตัวที่ส่งมาพร้อมกับสื่อที่อัปโหลด", "uploads-privacy-title": "การอัปโหลดและความเป็นส่วนตัว" }, + "editor": { + "label": "โปรแกรมแก้ไข", + "markdown-mode-description": "เขียนและแก้ไขบันทึกช่วยจำเป็นข้อความ Markdown แทนข้อความที่จัดรูปแบบ" + }, "memo-view": { "create": "สร้างมุมมอง", "delete-confirm": "คุณแน่ใจหรือไม่ว่าต้องการลบมุมมอง `{{title}}`?", diff --git a/web/src/locales/tr.json b/web/src/locales/tr.json index 1f146076e..edea072d8 100644 --- a/web/src/locales/tr.json +++ b/web/src/locales/tr.json @@ -683,6 +683,10 @@ "uploads-privacy-description": "Yüklenen medyayla birlikte gönderilen, gizlilik açısından hassas bilgileri denetleyin.", "uploads-privacy-title": "Yüklemeler ve gizlilik" }, + "editor": { + "label": "Editör", + "markdown-mode-description": "Notları biçimlendirilmiş metin yerine Markdown metni olarak yazın ve düzenleyin." + }, "memo-view": { "create": "Görünüm oluştur", "change-icon": "Görünüm simgesini değiştir", diff --git a/web/src/locales/uk.json b/web/src/locales/uk.json index 92c640622..c79a002c2 100644 --- a/web/src/locales/uk.json +++ b/web/src/locales/uk.json @@ -522,6 +522,10 @@ "uploads-privacy-description": "Контролювати конфіденційну інформацію, що надсилається разом із завантаженими медіафайлами.", "uploads-privacy-title": "Завантаження та конфіденційність" }, + "editor": { + "label": "Редактор", + "markdown-mode-description": "Пишіть і редагуйте нотатки як текст Markdown замість форматованого тексту." + }, "memo-view": { "create": "Створити подання", "delete-confirm": "Ви впевнені, що хочете видалити подання `{{title}}`?", diff --git a/web/src/locales/vi.json b/web/src/locales/vi.json index 17f18649a..1d1e87ee2 100644 --- a/web/src/locales/vi.json +++ b/web/src/locales/vi.json @@ -433,6 +433,10 @@ "uploads-privacy-description": "Kiểm soát thông tin nhạy cảm về quyền riêng tư được gửi kèm theo phương tiện đã tải lên.", "uploads-privacy-title": "Tải lên & quyền riêng tư" }, + "editor": { + "label": "Trình chỉnh sửa", + "markdown-mode-description": "Viết và chỉnh sửa ghi chú dưới dạng văn bản Markdown thay vì văn bản có định dạng." + }, "memo-view": { "create": "Tạo chế độ xem", "delete-confirm": "Bạn có chắc chắn muốn xóa chế độ xem `{{title}}`?", diff --git a/web/src/locales/zh-Hans.json b/web/src/locales/zh-Hans.json index 69935cbd0..5a11bb867 100644 --- a/web/src/locales/zh-Hans.json +++ b/web/src/locales/zh-Hans.json @@ -507,6 +507,10 @@ "uploads-privacy-description": "控制上传媒体时提交的隐私敏感信息。", "uploads-privacy-title": "上传与隐私" }, + "editor": { + "label": "编辑器", + "markdown-mode-description": "以 Markdown 文本而非格式化文本撰写和编辑备忘录。" + }, "memo-view": { "create": "创建视图", "delete-confirm": "您确定要删除视图 `{{title}}` 吗?", diff --git a/web/src/locales/zh-Hant.json b/web/src/locales/zh-Hant.json index 1499a486c..e8a3aa373 100644 --- a/web/src/locales/zh-Hant.json +++ b/web/src/locales/zh-Hant.json @@ -679,6 +679,10 @@ "uploads-privacy-description": "控制上傳媒體時提交的隱私敏感資訊。", "uploads-privacy-title": "上傳與隱私" }, + "editor": { + "label": "編輯器", + "markdown-mode-description": "以 Markdown 文字而非格式化文字撰寫和編輯備忘錄。" + }, "memo-view": { "create": "建立檢視", "delete-confirm": "您確定要刪除檢視 `{{title}}` 嗎?", diff --git a/web/src/types/proto/api/user_service_pb.ts b/web/src/types/proto/api/user_service_pb.ts index d3e4422d9..a1184fab1 100644 --- a/web/src/types/proto/api/user_service_pb.ts +++ b/web/src/types/proto/api/user_service_pb.ts @@ -24,7 +24,7 @@ import type { Message } from "@bufbuild/protobuf"; * Describes the file api/user_service.proto. */ export const file_api_user_service: GenFile = /*@__PURE__*/ - fileDesc("ChZhcGkvdXNlcl9zZXJ2aWNlLnByb3RvEgltZW1vcy5hcGkixwMKBFVzZXISEQoEbmFtZRgBIAEoCUID4EEIEhUKCHVzZXJuYW1lGAIgASgJQgPgQQISGQoMZGlzcGxheV9uYW1lGAMgASgJQgPgQQESEgoFZW1haWwYBCABKAlCA+BBARIXCgphdmF0YXJfdXJsGAUgASgJQgPgQQESGAoLZGVzY3JpcHRpb24YBiABKAlCA+BBARIVCghwYXNzd29yZBgHIAEoCUID4EEEEicKBHJvbGUYCCABKA4yFC5tZW1vcy5hcGkuVXNlci5Sb2xlQgPgQQISJAoFc3RhdGUYCSABKA4yEC5tZW1vcy5hcGkuU3RhdGVCA+BBAhI0CgtjcmVhdGVfdGltZRgKIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgLIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAyIxCgRSb2xlEhQKEFJPTEVfVU5TUEVDSUZJRUQQABIJCgVBRE1JThABEggKBFVTRVIQAjou6kErCg5tZW1vcy5hcGkvVXNlchIMdXNlcnMve3VzZXJ9KgV1c2VyczIEdXNlciJzChBMaXN0VXNlcnNSZXF1ZXN0EhYKCXBhZ2Vfc2l6ZRgBIAEoBUID4EEBEhcKCnBhZ2VfdG9rZW4YAiABKAlCA+BBARITCgZmaWx0ZXIYAyABKAlCA+BBARIZCgxzaG93X2RlbGV0ZWQYBCABKAhCA+BBASJMChFMaXN0VXNlcnNSZXNwb25zZRIeCgV1c2VycxgBIAMoCzIPLm1lbW9zLmFwaS5Vc2VyEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJqCg5HZXRVc2VyUmVxdWVzdBIkCgRuYW1lGAEgASgJQhbgQQL6QRAKDm1lbW9zLmFwaS9Vc2VyEjIKCXJlYWRfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBASI9ChRCYXRjaEdldFVzZXJzUmVxdWVzdBIlCgVuYW1lcxgBIAMoCUIW4EEC+kEQCg5tZW1vcy5hcGkvVXNlciI3ChVCYXRjaEdldFVzZXJzUmVzcG9uc2USHgoFdXNlcnMYASADKAsyDy5tZW1vcy5hcGkuVXNlciKFAQoRQ3JlYXRlVXNlclJlcXVlc3QSJQoEdXNlchgBIAEoCzIPLm1lbW9zLmFwaS5Vc2VyQgbgQQLgQQQSFAoHdXNlcl9pZBgCIAEoCUID4EEBEhoKDXZhbGlkYXRlX29ubHkYAyABKAhCA+BBARIXCgpyZXF1ZXN0X2lkGAQgASgJQgPgQQEiiQEKEVVwZGF0ZVVzZXJSZXF1ZXN0EiIKBHVzZXIYASABKAsyDy5tZW1vcy5hcGkuVXNlckID4EECEjQKC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFza0ID4EECEhoKDWFsbG93X21pc3NpbmcYAyABKAhCA+BBASJNChFEZWxldGVVc2VyUmVxdWVzdBIkCgRuYW1lGAEgASgJQhbgQQL6QRAKDm1lbW9zLmFwaS9Vc2VyEhIKBWZvcmNlGAIgASgIQgPgQQEiuwYKC1VzZXJTZXR0aW5nEhEKBG5hbWUYASABKAlCA+BBCBJACg9nZW5lcmFsX3NldHRpbmcYAiABKAsyJS5tZW1vcy5hcGkuVXNlclNldHRpbmcuR2VuZXJhbFNldHRpbmdIABJCChB3ZWJob29rc19zZXR0aW5nGAMgASgLMiYubWVtb3MuYXBpLlVzZXJTZXR0aW5nLldlYmhvb2tzU2V0dGluZ0gAEjoKDHRhZ3Nfc2V0dGluZxgEIAEoCzIiLm1lbW9zLmFwaS5Vc2VyU2V0dGluZy5UYWdzU2V0dGluZ0gAGnkKDkdlbmVyYWxTZXR0aW5nEhMKBmxvY2FsZRgBIAEoCUID4EEBEhwKD21lbW9fdmlzaWJpbGl0eRgCIAEoCUID4EEBEhIKBXRoZW1lGAMgASgJQgPgQQESIAoTc2F2ZV9tZWRpYV9tZXRhZGF0YRgEIAEoCEID4EEBGjsKD1dlYmhvb2tzU2V0dGluZxIoCgh3ZWJob29rcxgBIAMoCzIWLm1lbW9zLmFwaS5Vc2VyV2ViaG9vaxqfAQoLVGFnc1NldHRpbmcSPwoEdGFncxgBIAMoCzIsLm1lbW9zLmFwaS5Vc2VyU2V0dGluZy5UYWdzU2V0dGluZy5UYWdzRW50cnlCA+BBARpPCglUYWdzRW50cnkSCwoDa2V5GAEgASgJEjEKBXZhbHVlGAIgASgLMiIubWVtb3MuYXBpLlVzZXJTZXR0aW5nLlRhZ01ldGFkYXRhOgI4ARpbCgtUYWdNZXRhZGF0YRIxChBiYWNrZ3JvdW5kX2NvbG9yGAEgASgLMhIuZ29vZ2xlLnR5cGUuQ29sb3JCA+BBARIZCgxibHVyX2NvbnRlbnQYAiABKAhCA+BBASI/CgNLZXkSEwoPS0VZX1VOU1BFQ0lGSUVEEAASCwoHR0VORVJBTBABEgwKCFdFQkhPT0tTEAISCAoEVEFHUxADOlbqQVMKFW1lbW9zLmFwaS9Vc2VyU2V0dGluZxIfdXNlcnMve3VzZXJ9L3NldHRpbmdzL3tzZXR0aW5nfSoMdXNlclNldHRpbmdzMgt1c2VyU2V0dGluZ0IHCgV2YWx1ZSJyChdMaXN0VXNlclNldHRpbmdzUmVxdWVzdBImCgZwYXJlbnQYASABKAlCFuBBAvpBEAoObWVtb3MuYXBpL1VzZXISFgoJcGFnZV9zaXplGAIgASgFQgPgQQESFwoKcGFnZV90b2tlbhgDIAEoCUID4EEBImIKGExpc3RVc2VyU2V0dGluZ3NSZXNwb25zZRItCg11c2VyX3NldHRpbmdzGAEgAygLMhYubWVtb3MuYXBpLlVzZXJTZXR0aW5nEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJEChVHZXRVc2VyU2V0dGluZ1JlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVtZW1vcy5hcGkvVXNlclNldHRpbmcigwEKGFVwZGF0ZVVzZXJTZXR0aW5nUmVxdWVzdBIxCgx1c2VyX3NldHRpbmcYASABKAsyFi5tZW1vcy5hcGkuVXNlclNldHRpbmdCA+BBAhI0Cgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBAiLzBAoJVXNlclN0YXRzEhEKBG5hbWUYASABKAlCA+BBCBIYChB0b3RhbF9tZW1vX2NvdW50GAIgASgFEjsKD21lbW9fdHlwZV9zdGF0cxgDIAEoCzIiLm1lbW9zLmFwaS5Vc2VyU3RhdHMuTWVtb1R5cGVTdGF0cxI3Cgp0YWdfY291bnRzGAQgAygLMiMubWVtb3MuYXBpLlVzZXJTdGF0cy5UYWdDb3VudHNFbnRyeRIpCgxwaW5uZWRfbWVtb3MYBSADKAlCE/pBEAoObWVtb3MuYXBpL01lbW8SOwoXbWVtb19jcmVhdGVkX3RpbWVzdGFtcHMYBiADKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEjsKF21lbW9fdXBkYXRlZF90aW1lc3RhbXBzGAcgAygLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIqChhhdHRhY2htZW50X3N0b3JhZ2VfYnl0ZXMYCCABKANCA+BBA0gAiAEBGjAKDlRhZ0NvdW50c0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoBToCOAEaXwoNTWVtb1R5cGVTdGF0cxISCgpsaW5rX2NvdW50GAEgASgFEhIKCmNvZGVfY291bnQYAiABKAUSEgoKdG9kb19jb3VudBgDIAEoBRISCgp1bmRvX2NvdW50GAQgASgFOkLqQT8KE21lbW9zLmFwaS9Vc2VyU3RhdHMSEnVzZXJzL3t1c2VyfS9zdGF0cyoJdXNlclN0YXRzMgl1c2VyU3RhdHNCGwoZX2F0dGFjaG1lbnRfc3RvcmFnZV9ieXRlcyJ+ChRMaXN0VXNlclN0YXRzUmVxdWVzdBIrCgZwYXJlbnQYASABKAlCG+BBAvpBFRITbWVtb3MuYXBpL1VzZXJTdGF0cxITCgZmaWx0ZXIYAiABKAlCA+BBARIkCgVzdGF0ZRgDIAEoDjIQLm1lbW9zLmFwaS5TdGF0ZUID4EEBIkEKFUxpc3RVc2VyU3RhdHNSZXNwb25zZRIoCgp1c2VyX3N0YXRzGAEgAygLMhQubWVtb3MuYXBpLlVzZXJTdGF0cyJQChNHZXRVc2VyU3RhdHNSZXF1ZXN0EiQKBG5hbWUYASABKAlCFuBBAvpBEAoObWVtb3MuYXBpL1VzZXISEwoGZmlsdGVyGAIgASgJQgPgQQEilQMKCVVzZXJVc2FnZRIRCgRuYW1lGAEgASgJQgPgQQgSEgoKbWVtb19jb3VudBgCIAEoAxIVCg1zdG9yYWdlX2J5dGVzGAMgASgDEisKBmxpbWl0cxgEIAEoCzIbLm1lbW9zLmFwaS5Vc2VyVXNhZ2UuTGltaXRzEhMKC2xpbWl0X2luZGV4GAUgASgFGsIBCgZMaW1pdHMSFwoKbWVtb19jb3VudBgBIAEoA0gAiAEBEh8KEm1lbW9fY29udGVudF9ieXRlcxgCIAEoA0gBiAEBEhoKDXN0b3JhZ2VfYnl0ZXMYAyABKANIAogBARIZCgx1cGxvYWRfYnl0ZXMYBCABKANIA4gBAUINCgtfbWVtb19jb3VudEIVChNfbWVtb19jb250ZW50X2J5dGVzQhAKDl9zdG9yYWdlX2J5dGVzQg8KDV91cGxvYWRfYnl0ZXM6Q+pBQAoTbWVtb3MuYXBpL1VzZXJVc2FnZRISdXNlcnMve3VzZXJ9L3VzYWdlKgp1c2VyVXNhZ2VzMgl1c2VyVXNhZ2UiQAoTR2V0VXNlclVzYWdlUmVxdWVzdBIpCgRuYW1lGAEgASgJQhvgQQL6QRUKE21lbW9zLmFwaS9Vc2VyVXNhZ2Ui8AEKCE1lbW9WaWV3EhEKBG5hbWUYASABKAlCA+BBCBISCgV0aXRsZRgCIAEoCUID4EECEhMKBmZpbHRlchgDIAEoCUID4EECEisKBGljb24YBCABKAsyGC5tZW1vcy5hcGkuTWVtb1ZpZXcuSWNvbkID4EEBGjIKBEljb24SDwoFZW1vamkYASABKAlIABIQCgZsdWNpZGUYAiABKAlIAEIHCgV2YWx1ZTpH6kFEChJtZW1vcy5hcGkvTWVtb1ZpZXcSGXVzZXJzL3t1c2VyfS92aWV3cy97dmlld30qCW1lbW9WaWV3czIIbWVtb1ZpZXciQgoUTGlzdE1lbW9WaWV3c1JlcXVlc3QSKgoGcGFyZW50GAEgASgJQhrgQQL6QRQSEm1lbW9zLmFwaS9NZW1vVmlldyJAChVMaXN0TWVtb1ZpZXdzUmVzcG9uc2USJwoKbWVtb192aWV3cxgBIAMoCzITLm1lbW9zLmFwaS5NZW1vVmlldyI+ChJHZXRNZW1vVmlld1JlcXVlc3QSKAoEbmFtZRgBIAEoCUIa4EEC+kEUChJtZW1vcy5hcGkvTWVtb1ZpZXcijAEKFUNyZWF0ZU1lbW9WaWV3UmVxdWVzdBIqCgZwYXJlbnQYASABKAlCGuBBAvpBFBISbWVtb3MuYXBpL01lbW9WaWV3EisKCW1lbW9fdmlldxgCIAEoCzITLm1lbW9zLmFwaS5NZW1vVmlld0ID4EECEhoKDXZhbGlkYXRlX29ubHkYAyABKAhCA+BBASJ6ChVVcGRhdGVNZW1vVmlld1JlcXVlc3QSKwoJbWVtb192aWV3GAEgASgLMhMubWVtb3MuYXBpLk1lbW9WaWV3QgPgQQISNAoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrQgPgQQEiQQoVRGVsZXRlTWVtb1ZpZXdSZXF1ZXN0EigKBG5hbWUYASABKAlCGuBBAvpBFAoSbWVtb3MuYXBpL01lbW9WaWV3IrMKChBVc2VyTm90aWZpY2F0aW9uEhQKBG5hbWUYASABKAlCBuBBA+BBCBImCgZzZW5kZXIYAiABKAlCFuBBA/pBEAoObWVtb3MuYXBpL1VzZXISKQoLc2VuZGVyX3VzZXIYAyABKAsyDy5tZW1vcy5hcGkuVXNlckID4EEDEjMKBHR5cGUYBCABKA4yIC5tZW1vcy5hcGkuVXNlck5vdGlmaWNhdGlvbi5UeXBlQgPgQQMSSwoMbWVtb19jb21tZW50GAUgASgLMi4ubWVtb3MuYXBpLlVzZXJOb3RpZmljYXRpb24uTWVtb0NvbW1lbnRQYXlsb2FkQgPgQQNIABJLCgxtZW1vX21lbnRpb24YBiABKAsyLi5tZW1vcy5hcGkuVXNlck5vdGlmaWNhdGlvbi5NZW1vTWVudGlvblBheWxvYWRCA+BBA0gAElMKEHNwYWNlX2ludml0YXRpb24YByABKAsyMi5tZW1vcy5hcGkuVXNlck5vdGlmaWNhdGlvbi5TcGFjZUludml0YXRpb25QYXlsb2FkQgPgQQNIABI3CgZzdGF0dXMYCCABKA4yIi5tZW1vcy5hcGkuVXNlck5vdGlmaWNhdGlvbi5TdGF0dXNCA+BBARI0CgtjcmVhdGVfdGltZRgJIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxpsChJNZW1vQ29tbWVudFBheWxvYWQSDAoEbWVtbxgBIAEoCRIUCgxyZWxhdGVkX21lbW8YAiABKAkSFAoMbWVtb19zbmlwcGV0GAMgASgJEhwKFHJlbGF0ZWRfbWVtb19zbmlwcGV0GAQgASgJGmwKEk1lbW9NZW50aW9uUGF5bG9hZBIMCgRtZW1vGAEgASgJEhQKDHJlbGF0ZWRfbWVtbxgCIAEoCRIUCgxtZW1vX3NuaXBwZXQYAyABKAkSHAoUcmVsYXRlZF9tZW1vX3NuaXBwZXQYBCABKAkatgIKFlNwYWNlSW52aXRhdGlvblBheWxvYWQSOAoQc3BhY2VfaW52aXRhdGlvbhgBIAEoCUIe+kEbChltZW1vcy5hcGkvU3BhY2VJbnZpdGF0aW9uEh8KBXNwYWNlGAIgASgLMhAubWVtb3MuYXBpLlNwYWNlEikKBHJvbGUYAyABKA4yGy5tZW1vcy5hcGkuU3BhY2VNZW1iZXIuUm9sZRJRCgVzdGF0ZRgEIAEoDjJCLm1lbW9zLmFwaS5Vc2VyTm90aWZpY2F0aW9uLlNwYWNlSW52aXRhdGlvblBheWxvYWQuSW52aXRhdGlvblN0YXRlIkMKD0ludml0YXRpb25TdGF0ZRIVChFTVEFURV9VTlNQRUNJRklFRBAAEgsKB1BFTkRJTkcQARIMCghBQ0NFUFRFRBACIjoKBlN0YXR1cxIWChJTVEFUVVNfVU5TUEVDSUZJRUQQABIKCgZVTlJFQUQQARIMCghBUkNISVZFRBACIlYKBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEhAKDE1FTU9fQ09NTUVOVBABEhAKDE1FTU9fTUVOVElPThACEhQKEFNQQUNFX0lOVklUQVRJT04QAzpv6kFsChptZW1vcy5hcGkvVXNlck5vdGlmaWNhdGlvbhIpdXNlcnMve3VzZXJ9L25vdGlmaWNhdGlvbnMve25vdGlmaWNhdGlvbn0qEXVzZXJOb3RpZmljYXRpb25zMhB1c2VyTm90aWZpY2F0aW9uQgkKB3BheWxvYWQijAEKHExpc3RVc2VyTm90aWZpY2F0aW9uc1JlcXVlc3QSJgoGcGFyZW50GAEgASgJQhbgQQL6QRAKDm1lbW9zLmFwaS9Vc2VyEhYKCXBhZ2Vfc2l6ZRgCIAEoBUID4EEBEhcKCnBhZ2VfdG9rZW4YAyABKAlCA+BBARITCgZmaWx0ZXIYBCABKAlCA+BBASJsCh1MaXN0VXNlck5vdGlmaWNhdGlvbnNSZXNwb25zZRIyCg1ub3RpZmljYXRpb25zGAEgAygLMhsubWVtb3MuYXBpLlVzZXJOb3RpZmljYXRpb24SFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIo0BCh1VcGRhdGVVc2VyTm90aWZpY2F0aW9uUmVxdWVzdBI2Cgxub3RpZmljYXRpb24YASABKAsyGy5tZW1vcy5hcGkuVXNlck5vdGlmaWNhdGlvbkID4EECEjQKC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFza0ID4EECIlEKHURlbGV0ZVVzZXJOb3RpZmljYXRpb25SZXF1ZXN0EjAKBG5hbWUYASABKAlCIuBBAvpBHAoabWVtb3MuYXBpL1VzZXJOb3RpZmljYXRpb24ixQIKC1VzZXJXZWJob29rEhEKBG5hbWUYASABKAlCA+BBCBIUCgxkaXNwbGF5X25hbWUYAiABKAkSCwoDdXJsGAMgASgJEhsKDnNpZ25pbmdfc2VjcmV0GAQgASgJQgPgQQQSHwoSc2lnbmluZ19zZWNyZXRfc2V0GAUgASgIQgPgQQMSNAoLY3JlYXRlX3RpbWUYBiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSNAoLdXBkYXRlX3RpbWUYByABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQM6VupBUwoVbWVtb3MuYXBpL1VzZXJXZWJob29rEh91c2Vycy97dXNlcn0vd2ViaG9va3Mve3dlYmhvb2t9Kgx1c2VyV2ViaG9va3MyC3VzZXJXZWJob29rIkgKF0xpc3RVc2VyV2ViaG9va3NSZXF1ZXN0Ei0KBnBhcmVudBgBIAEoCUId4EEC+kEXEhVtZW1vcy5hcGkvVXNlcldlYmhvb2siRAoYTGlzdFVzZXJXZWJob29rc1Jlc3BvbnNlEigKCHdlYmhvb2tzGAEgAygLMhYubWVtb3MuYXBpLlVzZXJXZWJob29rIncKGENyZWF0ZVVzZXJXZWJob29rUmVxdWVzdBItCgZwYXJlbnQYASABKAlCHeBBAvpBFxIVbWVtb3MuYXBpL1VzZXJXZWJob29rEiwKB3dlYmhvb2sYAiABKAsyFi5tZW1vcy5hcGkuVXNlcldlYmhvb2tCA+BBAiJ5ChhVcGRhdGVVc2VyV2ViaG9va1JlcXVlc3QSLAoHd2ViaG9vaxgBIAEoCzIWLm1lbW9zLmFwaS5Vc2VyV2ViaG9va0ID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzayJHChhEZWxldGVVc2VyV2ViaG9va1JlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVtZW1vcy5hcGkvVXNlcldlYmhvb2siUQoiR2V0VXNlcldlYmhvb2tTaWduaW5nU2VjcmV0UmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFW1lbW9zLmFwaS9Vc2VyV2ViaG9vayI9CiNHZXRVc2VyV2ViaG9va1NpZ25pbmdTZWNyZXRSZXNwb25zZRIWCg5zaWduaW5nX3NlY3JldBgBIAEoCSLvAQoOTGlua2VkSWRlbnRpdHkSEQoEbmFtZRgBIAEoCUID4EEIEj0KEWlkZW50aXR5X3Byb3ZpZGVyGAIgASgJQiLgQQP6QRwKGm1lbW9zLmFwaS9JZGVudGl0eVByb3ZpZGVyEhkKDGV4dGVybmFsX3VpZBgDIAEoCUID4EEDOnDqQW0KGG1lbW9zLmFwaS9MaW5rZWRJZGVudGl0eRIvdXNlcnMve3VzZXJ9L2xpbmtlZElkZW50aXRpZXMve2xpbmtlZF9pZGVudGl0eX0qEGxpbmtlZElkZW50aXRpZXMyDmxpbmtlZElkZW50aXR5IkUKG0xpc3RMaW5rZWRJZGVudGl0aWVzUmVxdWVzdBImCgZwYXJlbnQYASABKAlCFuBBAvpBEAoObWVtb3MuYXBpL1VzZXIiVAocTGlzdExpbmtlZElkZW50aXRpZXNSZXNwb25zZRI0ChFsaW5rZWRfaWRlbnRpdGllcxgBIAMoCzIZLm1lbW9zLmFwaS5MaW5rZWRJZGVudGl0eSJKChhHZXRMaW5rZWRJZGVudGl0eVJlcXVlc3QSLgoEbmFtZRgBIAEoCUIg4EEC+kEaChhtZW1vcy5hcGkvTGlua2VkSWRlbnRpdHkizgEKG0NyZWF0ZUxpbmtlZElkZW50aXR5UmVxdWVzdBImCgZwYXJlbnQYASABKAlCFuBBAvpBEAoObWVtb3MuYXBpL1VzZXISPQoRaWRlbnRpdHlfcHJvdmlkZXIYAiABKAlCIuBBAvpBHAoabWVtb3MuYXBpL0lkZW50aXR5UHJvdmlkZXISEQoEY29kZRgDIAEoCUID4EECEhkKDHJlZGlyZWN0X3VyaRgEIAEoCUID4EECEhoKDWNvZGVfdmVyaWZpZXIYBSABKAlCA+BBASJNChtEZWxldGVMaW5rZWRJZGVudGl0eVJlcXVlc3QSLgoEbmFtZRgBIAEoCUIg4EEC+kEaChhtZW1vcy5hcGkvTGlua2VkSWRlbnRpdHki8gIKE1BlcnNvbmFsQWNjZXNzVG9rZW4SEQoEbmFtZRgBIAEoCUID4EEIEhgKC2Rlc2NyaXB0aW9uGAIgASgJQgPgQQESNAoLY3JlYXRlX3RpbWUYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSNAoLZXhwaXJlX3RpbWUYBCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQESNgoNbGFzdF91c2VfdGltZRgFIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAzqJAepBhQEKHW1lbW9zLmFwaS9QZXJzb25hbEFjY2Vzc1Rva2VuEjl1c2Vycy97dXNlcn0vcGVyc29uYWxBY2Nlc3NUb2tlbnMve3BlcnNvbmFsX2FjY2Vzc190b2tlbn0qFHBlcnNvbmFsQWNjZXNzVG9rZW5zMhNwZXJzb25hbEFjY2Vzc1Rva2VuInoKH0xpc3RQZXJzb25hbEFjY2Vzc1Rva2Vuc1JlcXVlc3QSJgoGcGFyZW50GAEgASgJQhbgQQL6QRAKDm1lbW9zLmFwaS9Vc2VyEhYKCXBhZ2Vfc2l6ZRgCIAEoBUID4EEBEhcKCnBhZ2VfdG9rZW4YAyABKAlCA+BBASJ7CiBMaXN0UGVyc29uYWxBY2Nlc3NUb2tlbnNSZXNwb25zZRI+ChZwZXJzb25hbF9hY2Nlc3NfdG9rZW5zGAEgAygLMh4ubWVtb3MuYXBpLlBlcnNvbmFsQWNjZXNzVG9rZW4SFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIoIBCiBDcmVhdGVQZXJzb25hbEFjY2Vzc1Rva2VuUmVxdWVzdBImCgZwYXJlbnQYASABKAlCFuBBAvpBEAoObWVtb3MuYXBpL1VzZXISGAoLZGVzY3JpcHRpb24YAiABKAlCA+BBARIcCg9leHBpcmVzX2luX2RheXMYAyABKAVCA+BBASJxCiFDcmVhdGVQZXJzb25hbEFjY2Vzc1Rva2VuUmVzcG9uc2USPQoVcGVyc29uYWxfYWNjZXNzX3Rva2VuGAEgASgLMh4ubWVtb3MuYXBpLlBlcnNvbmFsQWNjZXNzVG9rZW4SDQoFdG9rZW4YAiABKAkiVwogRGVsZXRlUGVyc29uYWxBY2Nlc3NUb2tlblJlcXVlc3QSMwoEbmFtZRgBIAEoCUIl4EEC+kEfCh1tZW1vcy5hcGkvUGVyc29uYWxBY2Nlc3NUb2tlbiI6ChJFeHBvcnRNZW1vc1JlcXVlc3QSJAoEbmFtZRgBIAEoCUIW4EEC+kEQCg5tZW1vcy5hcGkvVXNlciKPAwoSSW1wb3J0TWVtb3NSZXF1ZXN0EiQKBG5hbWUYASABKAlCFuBBAvpBEAoObWVtb3MuYXBpL1VzZXISKgoEc3BlYxgCIAEoCzIaLm1lbW9zLmFwaS5JbXBvcnRNZW1vc1NwZWNIABITCgl1cGxvYWRfaWQYAyABKAlIABIZCgx3cml0ZV9vZmZzZXQYBCABKANCA+BBAhIRCgRkYXRhGAUgASgMQgPgQQESGQoMZmluaXNoX3dyaXRlGAYgASgIQgPgQQESSgoPY29uZmxpY3RfcG9saWN5GAcgASgOMiwubWVtb3MuYXBpLkltcG9ydE1lbW9zUmVxdWVzdC5Db25mbGljdFBvbGljeUID4EEBEhoKDXZhbGlkYXRlX29ubHkYCCABKAhCA+BBASJXCg5Db25mbGljdFBvbGljeRIfChtDT05GTElDVF9QT0xJQ1lfVU5TUEVDSUZJRUQQABIICgRTS0lQEAESCwoHUkVQTEFDRRACEg0KCURVUExJQ0FURRADQggKBnVwbG9hZCK+AQoTSW1wb3J0TWVtb3NSZXNwb25zZRIRCgl1cGxvYWRfaWQYASABKAkSFgoOY29tbWl0dGVkX3NpemUYAiABKAMSFgoObWF4X2NodW5rX3NpemUYAyABKAUSKgoEcGxhbhgEIAEoCzIaLm1lbW9zLmFwaS5JbXBvcnRNZW1vc1BsYW5IABIuCgZyZXBvcnQYBSABKAsyHC5tZW1vcy5hcGkuSW1wb3J0TWVtb3NSZXBvcnRIAEIICgZyZXN1bHQiKgoPSW1wb3J0TWVtb3NTcGVjEhcKCnRvdGFsX3NpemUYASABKANCA+BBASL0AQoPSW1wb3J0TWVtb3NQbGFuEi8KC2V4cG9ydF90aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIQCghleHBvcnRlchgCIAEoCRIRCglnZW5lcmF0b3IYAyABKAkSEgoKbWVtb19jb3VudBgEIAEoBRIYChBhdHRhY2htZW50X2NvdW50GAUgASgFEgsKA25ldxgGIAEoBRIQCghleGlzdGluZxgHIAEoBRIPCgdyZW5hbWVkGAggASgFEi0KCHdhcm5pbmdzGAkgAygLMhsubWVtb3MuYXBpLkltcG9ydE1lbW9zSXNzdWUitAEKEUltcG9ydE1lbW9zUmVwb3J0Eg8KB2NyZWF0ZWQYASABKAUSDwoHdXBkYXRlZBgCIAEoBRIPCgdza2lwcGVkGAMgASgFEg4KBmZhaWxlZBgEIAEoBRItCgh3YXJuaW5ncxgFIAMoCzIbLm1lbW9zLmFwaS5JbXBvcnRNZW1vc0lzc3VlEi0KCGZhaWx1cmVzGAYgAygLMhsubWVtb3MuYXBpLkltcG9ydE1lbW9zSXNzdWUiNQoQSW1wb3J0TWVtb3NJc3N1ZRIQCghtZW1vX3VpZBgBIAEoCRIPCgdtZXNzYWdlGAIgASgJMoolCgtVc2VyU2VydmljZRJaCglMaXN0VXNlcnMSGy5tZW1vcy5hcGkuTGlzdFVzZXJzUmVxdWVzdBocLm1lbW9zLmFwaS5MaXN0VXNlcnNSZXNwb25zZSISgtPkkwIMEgovYXBpL3VzZXJzElkKB0dldFVzZXISGS5tZW1vcy5hcGkuR2V0VXNlclJlcXVlc3QaDy5tZW1vcy5hcGkuVXNlciIi2kEEbmFtZYLT5JMCFRITL2FwaS97bmFtZT11c2Vycy8qfRJyCg1CYXRjaEdldFVzZXJzEh8ubWVtb3MuYXBpLkJhdGNoR2V0VXNlcnNSZXF1ZXN0GiAubWVtb3MuYXBpLkJhdGNoR2V0VXNlcnNSZXNwb25zZSIegtPkkwIYOgEqIhMvYXBpL3VzZXJzOmJhdGNoR2V0EmQKCkNyZWF0ZVVzZXISHC5tZW1vcy5hcGkuQ3JlYXRlVXNlclJlcXVlc3QaDy5tZW1vcy5hcGkuVXNlciIn2kEMdXNlcix1c2VyX2lkgtPkkwISOgR1c2VyIgovYXBpL3VzZXJzEnYKClVwZGF0ZVVzZXISHC5tZW1vcy5hcGkuVXBkYXRlVXNlclJlcXVlc3QaDy5tZW1vcy5hcGkuVXNlciI52kEQdXNlcix1cGRhdGVfbWFza4LT5JMCIDoEdXNlcjIYL2FwaS97dXNlci5uYW1lPXVzZXJzLyp9EmYKCkRlbGV0ZVVzZXISHC5tZW1vcy5hcGkuRGVsZXRlVXNlclJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiItpBBG5hbWWC0+STAhUqEy9hcGkve25hbWU9dXNlcnMvKn0SjAEKEExpc3RVc2VyU2V0dGluZ3MSIi5tZW1vcy5hcGkuTGlzdFVzZXJTZXR0aW5nc1JlcXVlc3QaIy5tZW1vcy5hcGkuTGlzdFVzZXJTZXR0aW5nc1Jlc3BvbnNlIi/aQQZwYXJlbnSC0+STAiASHi9hcGkve3BhcmVudD11c2Vycy8qfS9zZXR0aW5ncxJ5Cg5HZXRVc2VyU2V0dGluZxIgLm1lbW9zLmFwaS5HZXRVc2VyU2V0dGluZ1JlcXVlc3QaFi5tZW1vcy5hcGkuVXNlclNldHRpbmciLdpBBG5hbWWC0+STAiASHi9hcGkve25hbWU9dXNlcnMvKi9zZXR0aW5ncy8qfRKuAQoRVXBkYXRlVXNlclNldHRpbmcSIy5tZW1vcy5hcGkuVXBkYXRlVXNlclNldHRpbmdSZXF1ZXN0GhYubWVtb3MuYXBpLlVzZXJTZXR0aW5nIlzaQRh1c2VyX3NldHRpbmcsdXBkYXRlX21hc2uC0+STAjs6DHVzZXJfc2V0dGluZzIrL2FwaS97dXNlcl9zZXR0aW5nLm5hbWU9dXNlcnMvKi9zZXR0aW5ncy8qfRKAAQoNTGlzdFVzZXJTdGF0cxIfLm1lbW9zLmFwaS5MaXN0VXNlclN0YXRzUmVxdWVzdBogLm1lbW9zLmFwaS5MaXN0VXNlclN0YXRzUmVzcG9uc2UiLNpBBnBhcmVudILT5JMCHRIbL2FwaS97cGFyZW50PXVzZXJzLyp9L3N0YXRzEnEKDEdldFVzZXJTdGF0cxIeLm1lbW9zLmFwaS5HZXRVc2VyU3RhdHNSZXF1ZXN0GhQubWVtb3MuYXBpLlVzZXJTdGF0cyIr2kEEbmFtZYLT5JMCHhIcL2FwaS97bmFtZT11c2Vycy8qfTpnZXRTdGF0cxJuCgxHZXRVc2VyVXNhZ2USHi5tZW1vcy5hcGkuR2V0VXNlclVzYWdlUmVxdWVzdBoULm1lbW9zLmFwaS5Vc2VyVXNhZ2UiKNpBBG5hbWWC0+STAhsSGS9hcGkve25hbWU9dXNlcnMvKi91c2FnZX0SgAEKDUxpc3RNZW1vVmlld3MSHy5tZW1vcy5hcGkuTGlzdE1lbW9WaWV3c1JlcXVlc3QaIC5tZW1vcy5hcGkuTGlzdE1lbW9WaWV3c1Jlc3BvbnNlIizaQQZwYXJlbnSC0+STAh0SGy9hcGkve3BhcmVudD11c2Vycy8qfS92aWV3cxJtCgtHZXRNZW1vVmlldxIdLm1lbW9zLmFwaS5HZXRNZW1vVmlld1JlcXVlc3QaEy5tZW1vcy5hcGkuTWVtb1ZpZXciKtpBBG5hbWWC0+STAh0SGy9hcGkve25hbWU9dXNlcnMvKi92aWV3cy8qfRKKAQoOQ3JlYXRlTWVtb1ZpZXcSIC5tZW1vcy5hcGkuQ3JlYXRlTWVtb1ZpZXdSZXF1ZXN0GhMubWVtb3MuYXBpLk1lbW9WaWV3IkHaQRBwYXJlbnQsbWVtb192aWV3gtPkkwIoOgltZW1vX3ZpZXciGy9hcGkve3BhcmVudD11c2Vycy8qfS92aWV3cxKZAQoOVXBkYXRlTWVtb1ZpZXcSIC5tZW1vcy5hcGkuVXBkYXRlTWVtb1ZpZXdSZXF1ZXN0GhMubWVtb3MuYXBpLk1lbW9WaWV3IlDaQRVtZW1vX3ZpZXcsdXBkYXRlX21hc2uC0+STAjI6CW1lbW9fdmlldzIlL2FwaS97bWVtb192aWV3Lm5hbWU9dXNlcnMvKi92aWV3cy8qfRJ2Cg5EZWxldGVNZW1vVmlldxIgLm1lbW9zLmFwaS5EZWxldGVNZW1vVmlld1JlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiKtpBBG5hbWWC0+STAh0qGy9hcGkve25hbWU9dXNlcnMvKi92aWV3cy8qfRKgAQoVTGlzdFVzZXJOb3RpZmljYXRpb25zEicubWVtb3MuYXBpLkxpc3RVc2VyTm90aWZpY2F0aW9uc1JlcXVlc3QaKC5tZW1vcy5hcGkuTGlzdFVzZXJOb3RpZmljYXRpb25zUmVzcG9uc2UiNNpBBnBhcmVudILT5JMCJRIjL2FwaS97cGFyZW50PXVzZXJzLyp9L25vdGlmaWNhdGlvbnMSwgEKFlVwZGF0ZVVzZXJOb3RpZmljYXRpb24SKC5tZW1vcy5hcGkuVXBkYXRlVXNlck5vdGlmaWNhdGlvblJlcXVlc3QaGy5tZW1vcy5hcGkuVXNlck5vdGlmaWNhdGlvbiJh2kEYbm90aWZpY2F0aW9uLHVwZGF0ZV9tYXNrgtPkkwJAOgxub3RpZmljYXRpb24yMC9hcGkve25vdGlmaWNhdGlvbi5uYW1lPXVzZXJzLyovbm90aWZpY2F0aW9ucy8qfRKOAQoWRGVsZXRlVXNlck5vdGlmaWNhdGlvbhIoLm1lbW9zLmFwaS5EZWxldGVVc2VyTm90aWZpY2F0aW9uUmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSIy2kEEbmFtZYLT5JMCJSojL2FwaS97bmFtZT11c2Vycy8qL25vdGlmaWNhdGlvbnMvKn0SjAEKEExpc3RVc2VyV2ViaG9va3MSIi5tZW1vcy5hcGkuTGlzdFVzZXJXZWJob29rc1JlcXVlc3QaIy5tZW1vcy5hcGkuTGlzdFVzZXJXZWJob29rc1Jlc3BvbnNlIi/aQQZwYXJlbnSC0+STAiASHi9hcGkve3BhcmVudD11c2Vycy8qfS93ZWJob29rcxKSAQoRQ3JlYXRlVXNlcldlYmhvb2sSIy5tZW1vcy5hcGkuQ3JlYXRlVXNlcldlYmhvb2tSZXF1ZXN0GhYubWVtb3MuYXBpLlVzZXJXZWJob29rIkDaQQ5wYXJlbnQsd2ViaG9va4LT5JMCKToHd2ViaG9vayIeL2FwaS97cGFyZW50PXVzZXJzLyp9L3dlYmhvb2tzEp8BChFVcGRhdGVVc2VyV2ViaG9vaxIjLm1lbW9zLmFwaS5VcGRhdGVVc2VyV2ViaG9va1JlcXVlc3QaFi5tZW1vcy5hcGkuVXNlcldlYmhvb2siTdpBE3dlYmhvb2ssdXBkYXRlX21hc2uC0+STAjE6B3dlYmhvb2syJi9hcGkve3dlYmhvb2submFtZT11c2Vycy8qL3dlYmhvb2tzLyp9En8KEURlbGV0ZVVzZXJXZWJob29rEiMubWVtb3MuYXBpLkRlbGV0ZVVzZXJXZWJob29rUmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSIt2kEEbmFtZYLT5JMCICoeL2FwaS97bmFtZT11c2Vycy8qL3dlYmhvb2tzLyp9ErwBChtHZXRVc2VyV2ViaG9va1NpZ25pbmdTZWNyZXQSLS5tZW1vcy5hcGkuR2V0VXNlcldlYmhvb2tTaWduaW5nU2VjcmV0UmVxdWVzdBouLm1lbW9zLmFwaS5HZXRVc2VyV2ViaG9va1NpZ25pbmdTZWNyZXRSZXNwb25zZSI+2kEEbmFtZYLT5JMCMRIvL2FwaS97bmFtZT11c2Vycy8qL3dlYmhvb2tzLyp9OmdldFNpZ25pbmdTZWNyZXQSoAEKFExpc3RMaW5rZWRJZGVudGl0aWVzEiYubWVtb3MuYXBpLkxpc3RMaW5rZWRJZGVudGl0aWVzUmVxdWVzdBonLm1lbW9zLmFwaS5MaXN0TGlua2VkSWRlbnRpdGllc1Jlc3BvbnNlIjfaQQZwYXJlbnSC0+STAigSJi9hcGkve3BhcmVudD11c2Vycy8qfS9saW5rZWRJZGVudGl0aWVzEooBChFHZXRMaW5rZWRJZGVudGl0eRIjLm1lbW9zLmFwaS5HZXRMaW5rZWRJZGVudGl0eVJlcXVlc3QaGS5tZW1vcy5hcGkuTGlua2VkSWRlbnRpdHkiNdpBBG5hbWWC0+STAigSJi9hcGkve25hbWU9dXNlcnMvKi9saW5rZWRJZGVudGl0aWVzLyp9EqcBChRDcmVhdGVMaW5rZWRJZGVudGl0eRImLm1lbW9zLmFwaS5DcmVhdGVMaW5rZWRJZGVudGl0eVJlcXVlc3QaGS5tZW1vcy5hcGkuTGlua2VkSWRlbnRpdHkiTNpBGHBhcmVudCxpZGVudGl0eV9wcm92aWRlcoLT5JMCKzoBKiImL2FwaS97cGFyZW50PXVzZXJzLyp9L2xpbmtlZElkZW50aXRpZXMSjQEKFERlbGV0ZUxpbmtlZElkZW50aXR5EiYubWVtb3MuYXBpLkRlbGV0ZUxpbmtlZElkZW50aXR5UmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSI12kEEbmFtZYLT5JMCKComL2FwaS97bmFtZT11c2Vycy8qL2xpbmtlZElkZW50aXRpZXMvKn0SsAEKGExpc3RQZXJzb25hbEFjY2Vzc1Rva2VucxIqLm1lbW9zLmFwaS5MaXN0UGVyc29uYWxBY2Nlc3NUb2tlbnNSZXF1ZXN0GisubWVtb3MuYXBpLkxpc3RQZXJzb25hbEFjY2Vzc1Rva2Vuc1Jlc3BvbnNlIjvaQQZwYXJlbnSC0+STAiwSKi9hcGkve3BhcmVudD11c2Vycy8qfS9wZXJzb25hbEFjY2Vzc1Rva2VucxKtAQoZQ3JlYXRlUGVyc29uYWxBY2Nlc3NUb2tlbhIrLm1lbW9zLmFwaS5DcmVhdGVQZXJzb25hbEFjY2Vzc1Rva2VuUmVxdWVzdBosLm1lbW9zLmFwaS5DcmVhdGVQZXJzb25hbEFjY2Vzc1Rva2VuUmVzcG9uc2UiNYLT5JMCLzoBKiIqL2FwaS97cGFyZW50PXVzZXJzLyp9L3BlcnNvbmFsQWNjZXNzVG9rZW5zEpsBChlEZWxldGVQZXJzb25hbEFjY2Vzc1Rva2VuEisubWVtb3MuYXBpLkRlbGV0ZVBlcnNvbmFsQWNjZXNzVG9rZW5SZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IjnaQQRuYW1lgtPkkwIsKiovYXBpL3tuYW1lPXVzZXJzLyovcGVyc29uYWxBY2Nlc3NUb2tlbnMvKn0ScgoLRXhwb3J0TWVtb3MSHS5tZW1vcy5hcGkuRXhwb3J0TWVtb3NSZXF1ZXN0GhQuZ29vZ2xlLmFwaS5IdHRwQm9keSIu2kEEbmFtZYLT5JMCIRIfL2FwaS97bmFtZT11c2Vycy8qfTpleHBvcnRNZW1vcxJ4CgtJbXBvcnRNZW1vcxIdLm1lbW9zLmFwaS5JbXBvcnRNZW1vc1JlcXVlc3QaHi5tZW1vcy5hcGkuSW1wb3J0TWVtb3NSZXNwb25zZSIqgtPkkwIkOgEqIh8vYXBpL3tuYW1lPXVzZXJzLyp9OmltcG9ydE1lbW9zQo8BCg1jb20ubWVtb3MuYXBpQhBVc2VyU2VydmljZVByb3RvUAFaJ2dpdGh1Yi5jb20vdXNlbWVtb3MvbWVtb3MvcHJvdG8vZ2VuL2FwaaICA01BWKoCCU1lbW9zLkFwacoCCU1lbW9zXEFwaeICFU1lbW9zXEFwaVxHUEJNZXRhZGF0YeoCCk1lbW9zOjpBcGliBnByb3RvMw", [file_api_common, file_api_space_service, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_httpbody, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_google_type_color]); + fileDesc("ChZhcGkvdXNlcl9zZXJ2aWNlLnByb3RvEgltZW1vcy5hcGkixwMKBFVzZXISEQoEbmFtZRgBIAEoCUID4EEIEhUKCHVzZXJuYW1lGAIgASgJQgPgQQISGQoMZGlzcGxheV9uYW1lGAMgASgJQgPgQQESEgoFZW1haWwYBCABKAlCA+BBARIXCgphdmF0YXJfdXJsGAUgASgJQgPgQQESGAoLZGVzY3JpcHRpb24YBiABKAlCA+BBARIVCghwYXNzd29yZBgHIAEoCUID4EEEEicKBHJvbGUYCCABKA4yFC5tZW1vcy5hcGkuVXNlci5Sb2xlQgPgQQISJAoFc3RhdGUYCSABKA4yEC5tZW1vcy5hcGkuU3RhdGVCA+BBAhI0CgtjcmVhdGVfdGltZRgKIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgLIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAyIxCgRSb2xlEhQKEFJPTEVfVU5TUEVDSUZJRUQQABIJCgVBRE1JThABEggKBFVTRVIQAjou6kErCg5tZW1vcy5hcGkvVXNlchIMdXNlcnMve3VzZXJ9KgV1c2VyczIEdXNlciJzChBMaXN0VXNlcnNSZXF1ZXN0EhYKCXBhZ2Vfc2l6ZRgBIAEoBUID4EEBEhcKCnBhZ2VfdG9rZW4YAiABKAlCA+BBARITCgZmaWx0ZXIYAyABKAlCA+BBARIZCgxzaG93X2RlbGV0ZWQYBCABKAhCA+BBASJMChFMaXN0VXNlcnNSZXNwb25zZRIeCgV1c2VycxgBIAMoCzIPLm1lbW9zLmFwaS5Vc2VyEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJqCg5HZXRVc2VyUmVxdWVzdBIkCgRuYW1lGAEgASgJQhbgQQL6QRAKDm1lbW9zLmFwaS9Vc2VyEjIKCXJlYWRfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBASI9ChRCYXRjaEdldFVzZXJzUmVxdWVzdBIlCgVuYW1lcxgBIAMoCUIW4EEC+kEQCg5tZW1vcy5hcGkvVXNlciI3ChVCYXRjaEdldFVzZXJzUmVzcG9uc2USHgoFdXNlcnMYASADKAsyDy5tZW1vcy5hcGkuVXNlciKFAQoRQ3JlYXRlVXNlclJlcXVlc3QSJQoEdXNlchgBIAEoCzIPLm1lbW9zLmFwaS5Vc2VyQgbgQQLgQQQSFAoHdXNlcl9pZBgCIAEoCUID4EEBEhoKDXZhbGlkYXRlX29ubHkYAyABKAhCA+BBARIXCgpyZXF1ZXN0X2lkGAQgASgJQgPgQQEiiQEKEVVwZGF0ZVVzZXJSZXF1ZXN0EiIKBHVzZXIYASABKAsyDy5tZW1vcy5hcGkuVXNlckID4EECEjQKC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFza0ID4EECEhoKDWFsbG93X21pc3NpbmcYAyABKAhCA+BBASJNChFEZWxldGVVc2VyUmVxdWVzdBIkCgRuYW1lGAEgASgJQhbgQQL6QRAKDm1lbW9zLmFwaS9Vc2VyEhIKBWZvcmNlGAIgASgIQgPgQQEisgcKC1VzZXJTZXR0aW5nEhEKBG5hbWUYASABKAlCA+BBCBJACg9nZW5lcmFsX3NldHRpbmcYAiABKAsyJS5tZW1vcy5hcGkuVXNlclNldHRpbmcuR2VuZXJhbFNldHRpbmdIABJCChB3ZWJob29rc19zZXR0aW5nGAMgASgLMiYubWVtb3MuYXBpLlVzZXJTZXR0aW5nLldlYmhvb2tzU2V0dGluZ0gAEjoKDHRhZ3Nfc2V0dGluZxgEIAEoCzIiLm1lbW9zLmFwaS5Vc2VyU2V0dGluZy5UYWdzU2V0dGluZ0gAEj4KDmVkaXRvcl9zZXR0aW5nGAUgASgLMiQubWVtb3MuYXBpLlVzZXJTZXR0aW5nLkVkaXRvclNldHRpbmdIABp5Cg5HZW5lcmFsU2V0dGluZxITCgZsb2NhbGUYASABKAlCA+BBARIcCg9tZW1vX3Zpc2liaWxpdHkYAiABKAlCA+BBARISCgV0aGVtZRgDIAEoCUID4EEBEiAKE3NhdmVfbWVkaWFfbWV0YWRhdGEYBCABKAhCA+BBARo7Cg9XZWJob29rc1NldHRpbmcSKAoId2ViaG9va3MYASADKAsyFi5tZW1vcy5hcGkuVXNlcldlYmhvb2sanwEKC1RhZ3NTZXR0aW5nEj8KBHRhZ3MYASADKAsyLC5tZW1vcy5hcGkuVXNlclNldHRpbmcuVGFnc1NldHRpbmcuVGFnc0VudHJ5QgPgQQEaTwoJVGFnc0VudHJ5EgsKA2tleRgBIAEoCRIxCgV2YWx1ZRgCIAEoCzIiLm1lbW9zLmFwaS5Vc2VyU2V0dGluZy5UYWdNZXRhZGF0YToCOAEaWwoLVGFnTWV0YWRhdGESMQoQYmFja2dyb3VuZF9jb2xvchgBIAEoCzISLmdvb2dsZS50eXBlLkNvbG9yQgPgQQESGQoMYmx1cl9jb250ZW50GAIgASgIQgPgQQEaKQoNRWRpdG9yU2V0dGluZxIYCgtzb3VyY2VfbW9kZRgBIAEoCEID4EEBIksKA0tleRITCg9LRVlfVU5TUEVDSUZJRUQQABILCgdHRU5FUkFMEAESDAoIV0VCSE9PS1MQAhIICgRUQUdTEAMSCgoGRURJVE9SEAQ6VupBUwoVbWVtb3MuYXBpL1VzZXJTZXR0aW5nEh91c2Vycy97dXNlcn0vc2V0dGluZ3Mve3NldHRpbmd9Kgx1c2VyU2V0dGluZ3MyC3VzZXJTZXR0aW5nQgcKBXZhbHVlInIKF0xpc3RVc2VyU2V0dGluZ3NSZXF1ZXN0EiYKBnBhcmVudBgBIAEoCUIW4EEC+kEQCg5tZW1vcy5hcGkvVXNlchIWCglwYWdlX3NpemUYAiABKAVCA+BBARIXCgpwYWdlX3Rva2VuGAMgASgJQgPgQQEiYgoYTGlzdFVzZXJTZXR0aW5nc1Jlc3BvbnNlEi0KDXVzZXJfc2V0dGluZ3MYASADKAsyFi5tZW1vcy5hcGkuVXNlclNldHRpbmcSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIkQKFUdldFVzZXJTZXR0aW5nUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFW1lbW9zLmFwaS9Vc2VyU2V0dGluZyKDAQoYVXBkYXRlVXNlclNldHRpbmdSZXF1ZXN0EjEKDHVzZXJfc2V0dGluZxgBIAEoCzIWLm1lbW9zLmFwaS5Vc2VyU2V0dGluZ0ID4EECEjQKC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFza0ID4EECIvMECglVc2VyU3RhdHMSEQoEbmFtZRgBIAEoCUID4EEIEhgKEHRvdGFsX21lbW9fY291bnQYAiABKAUSOwoPbWVtb190eXBlX3N0YXRzGAMgASgLMiIubWVtb3MuYXBpLlVzZXJTdGF0cy5NZW1vVHlwZVN0YXRzEjcKCnRhZ19jb3VudHMYBCADKAsyIy5tZW1vcy5hcGkuVXNlclN0YXRzLlRhZ0NvdW50c0VudHJ5EikKDHBpbm5lZF9tZW1vcxgFIAMoCUIT+kEQCg5tZW1vcy5hcGkvTWVtbxI7ChdtZW1vX2NyZWF0ZWRfdGltZXN0YW1wcxgGIAMoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASOwoXbWVtb191cGRhdGVkX3RpbWVzdGFtcHMYByADKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEioKGGF0dGFjaG1lbnRfc3RvcmFnZV9ieXRlcxgIIAEoA0ID4EEDSACIAQEaMAoOVGFnQ291bnRzRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgFOgI4ARpfCg1NZW1vVHlwZVN0YXRzEhIKCmxpbmtfY291bnQYASABKAUSEgoKY29kZV9jb3VudBgCIAEoBRISCgp0b2RvX2NvdW50GAMgASgFEhIKCnVuZG9fY291bnQYBCABKAU6QupBPwoTbWVtb3MuYXBpL1VzZXJTdGF0cxISdXNlcnMve3VzZXJ9L3N0YXRzKgl1c2VyU3RhdHMyCXVzZXJTdGF0c0IbChlfYXR0YWNobWVudF9zdG9yYWdlX2J5dGVzIn4KFExpc3RVc2VyU3RhdHNSZXF1ZXN0EisKBnBhcmVudBgBIAEoCUIb4EEC+kEVEhNtZW1vcy5hcGkvVXNlclN0YXRzEhMKBmZpbHRlchgCIAEoCUID4EEBEiQKBXN0YXRlGAMgASgOMhAubWVtb3MuYXBpLlN0YXRlQgPgQQEiQQoVTGlzdFVzZXJTdGF0c1Jlc3BvbnNlEigKCnVzZXJfc3RhdHMYASADKAsyFC5tZW1vcy5hcGkuVXNlclN0YXRzIlAKE0dldFVzZXJTdGF0c1JlcXVlc3QSJAoEbmFtZRgBIAEoCUIW4EEC+kEQCg5tZW1vcy5hcGkvVXNlchITCgZmaWx0ZXIYAiABKAlCA+BBASKVAwoJVXNlclVzYWdlEhEKBG5hbWUYASABKAlCA+BBCBISCgptZW1vX2NvdW50GAIgASgDEhUKDXN0b3JhZ2VfYnl0ZXMYAyABKAMSKwoGbGltaXRzGAQgASgLMhsubWVtb3MuYXBpLlVzZXJVc2FnZS5MaW1pdHMSEwoLbGltaXRfaW5kZXgYBSABKAUawgEKBkxpbWl0cxIXCgptZW1vX2NvdW50GAEgASgDSACIAQESHwoSbWVtb19jb250ZW50X2J5dGVzGAIgASgDSAGIAQESGgoNc3RvcmFnZV9ieXRlcxgDIAEoA0gCiAEBEhkKDHVwbG9hZF9ieXRlcxgEIAEoA0gDiAEBQg0KC19tZW1vX2NvdW50QhUKE19tZW1vX2NvbnRlbnRfYnl0ZXNCEAoOX3N0b3JhZ2VfYnl0ZXNCDwoNX3VwbG9hZF9ieXRlczpD6kFAChNtZW1vcy5hcGkvVXNlclVzYWdlEhJ1c2Vycy97dXNlcn0vdXNhZ2UqCnVzZXJVc2FnZXMyCXVzZXJVc2FnZSJAChNHZXRVc2VyVXNhZ2VSZXF1ZXN0EikKBG5hbWUYASABKAlCG+BBAvpBFQoTbWVtb3MuYXBpL1VzZXJVc2FnZSLwAQoITWVtb1ZpZXcSEQoEbmFtZRgBIAEoCUID4EEIEhIKBXRpdGxlGAIgASgJQgPgQQISEwoGZmlsdGVyGAMgASgJQgPgQQISKwoEaWNvbhgEIAEoCzIYLm1lbW9zLmFwaS5NZW1vVmlldy5JY29uQgPgQQEaMgoESWNvbhIPCgVlbW9qaRgBIAEoCUgAEhAKBmx1Y2lkZRgCIAEoCUgAQgcKBXZhbHVlOkfqQUQKEm1lbW9zLmFwaS9NZW1vVmlldxIZdXNlcnMve3VzZXJ9L3ZpZXdzL3t2aWV3fSoJbWVtb1ZpZXdzMghtZW1vVmlldyJCChRMaXN0TWVtb1ZpZXdzUmVxdWVzdBIqCgZwYXJlbnQYASABKAlCGuBBAvpBFBISbWVtb3MuYXBpL01lbW9WaWV3IkAKFUxpc3RNZW1vVmlld3NSZXNwb25zZRInCgptZW1vX3ZpZXdzGAEgAygLMhMubWVtb3MuYXBpLk1lbW9WaWV3Ij4KEkdldE1lbW9WaWV3UmVxdWVzdBIoCgRuYW1lGAEgASgJQhrgQQL6QRQKEm1lbW9zLmFwaS9NZW1vVmlldyKMAQoVQ3JlYXRlTWVtb1ZpZXdSZXF1ZXN0EioKBnBhcmVudBgBIAEoCUIa4EEC+kEUEhJtZW1vcy5hcGkvTWVtb1ZpZXcSKwoJbWVtb192aWV3GAIgASgLMhMubWVtb3MuYXBpLk1lbW9WaWV3QgPgQQISGgoNdmFsaWRhdGVfb25seRgDIAEoCEID4EEBInoKFVVwZGF0ZU1lbW9WaWV3UmVxdWVzdBIrCgltZW1vX3ZpZXcYASABKAsyEy5tZW1vcy5hcGkuTWVtb1ZpZXdCA+BBAhI0Cgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBASJBChVEZWxldGVNZW1vVmlld1JlcXVlc3QSKAoEbmFtZRgBIAEoCUIa4EEC+kEUChJtZW1vcy5hcGkvTWVtb1ZpZXciswoKEFVzZXJOb3RpZmljYXRpb24SFAoEbmFtZRgBIAEoCUIG4EED4EEIEiYKBnNlbmRlchgCIAEoCUIW4EED+kEQCg5tZW1vcy5hcGkvVXNlchIpCgtzZW5kZXJfdXNlchgDIAEoCzIPLm1lbW9zLmFwaS5Vc2VyQgPgQQMSMwoEdHlwZRgEIAEoDjIgLm1lbW9zLmFwaS5Vc2VyTm90aWZpY2F0aW9uLlR5cGVCA+BBAxJLCgxtZW1vX2NvbW1lbnQYBSABKAsyLi5tZW1vcy5hcGkuVXNlck5vdGlmaWNhdGlvbi5NZW1vQ29tbWVudFBheWxvYWRCA+BBA0gAEksKDG1lbW9fbWVudGlvbhgGIAEoCzIuLm1lbW9zLmFwaS5Vc2VyTm90aWZpY2F0aW9uLk1lbW9NZW50aW9uUGF5bG9hZEID4EEDSAASUwoQc3BhY2VfaW52aXRhdGlvbhgHIAEoCzIyLm1lbW9zLmFwaS5Vc2VyTm90aWZpY2F0aW9uLlNwYWNlSW52aXRhdGlvblBheWxvYWRCA+BBA0gAEjcKBnN0YXR1cxgIIAEoDjIiLm1lbW9zLmFwaS5Vc2VyTm90aWZpY2F0aW9uLlN0YXR1c0ID4EEBEjQKC2NyZWF0ZV90aW1lGAkgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDGmwKEk1lbW9Db21tZW50UGF5bG9hZBIMCgRtZW1vGAEgASgJEhQKDHJlbGF0ZWRfbWVtbxgCIAEoCRIUCgxtZW1vX3NuaXBwZXQYAyABKAkSHAoUcmVsYXRlZF9tZW1vX3NuaXBwZXQYBCABKAkabAoSTWVtb01lbnRpb25QYXlsb2FkEgwKBG1lbW8YASABKAkSFAoMcmVsYXRlZF9tZW1vGAIgASgJEhQKDG1lbW9fc25pcHBldBgDIAEoCRIcChRyZWxhdGVkX21lbW9fc25pcHBldBgEIAEoCRq2AgoWU3BhY2VJbnZpdGF0aW9uUGF5bG9hZBI4ChBzcGFjZV9pbnZpdGF0aW9uGAEgASgJQh76QRsKGW1lbW9zLmFwaS9TcGFjZUludml0YXRpb24SHwoFc3BhY2UYAiABKAsyEC5tZW1vcy5hcGkuU3BhY2USKQoEcm9sZRgDIAEoDjIbLm1lbW9zLmFwaS5TcGFjZU1lbWJlci5Sb2xlElEKBXN0YXRlGAQgASgOMkIubWVtb3MuYXBpLlVzZXJOb3RpZmljYXRpb24uU3BhY2VJbnZpdGF0aW9uUGF5bG9hZC5JbnZpdGF0aW9uU3RhdGUiQwoPSW52aXRhdGlvblN0YXRlEhUKEVNUQVRFX1VOU1BFQ0lGSUVEEAASCwoHUEVORElORxABEgwKCEFDQ0VQVEVEEAIiOgoGU3RhdHVzEhYKElNUQVRVU19VTlNQRUNJRklFRBAAEgoKBlVOUkVBRBABEgwKCEFSQ0hJVkVEEAIiVgoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASEAoMTUVNT19DT01NRU5UEAESEAoMTUVNT19NRU5USU9OEAISFAoQU1BBQ0VfSU5WSVRBVElPThADOm/qQWwKGm1lbW9zLmFwaS9Vc2VyTm90aWZpY2F0aW9uEil1c2Vycy97dXNlcn0vbm90aWZpY2F0aW9ucy97bm90aWZpY2F0aW9ufSoRdXNlck5vdGlmaWNhdGlvbnMyEHVzZXJOb3RpZmljYXRpb25CCQoHcGF5bG9hZCKMAQocTGlzdFVzZXJOb3RpZmljYXRpb25zUmVxdWVzdBImCgZwYXJlbnQYASABKAlCFuBBAvpBEAoObWVtb3MuYXBpL1VzZXISFgoJcGFnZV9zaXplGAIgASgFQgPgQQESFwoKcGFnZV90b2tlbhgDIAEoCUID4EEBEhMKBmZpbHRlchgEIAEoCUID4EEBImwKHUxpc3RVc2VyTm90aWZpY2F0aW9uc1Jlc3BvbnNlEjIKDW5vdGlmaWNhdGlvbnMYASADKAsyGy5tZW1vcy5hcGkuVXNlck5vdGlmaWNhdGlvbhIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkijQEKHVVwZGF0ZVVzZXJOb3RpZmljYXRpb25SZXF1ZXN0EjYKDG5vdGlmaWNhdGlvbhgBIAEoCzIbLm1lbW9zLmFwaS5Vc2VyTm90aWZpY2F0aW9uQgPgQQISNAoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrQgPgQQIiUQodRGVsZXRlVXNlck5vdGlmaWNhdGlvblJlcXVlc3QSMAoEbmFtZRgBIAEoCUIi4EEC+kEcChptZW1vcy5hcGkvVXNlck5vdGlmaWNhdGlvbiLFAgoLVXNlcldlYmhvb2sSEQoEbmFtZRgBIAEoCUID4EEIEhQKDGRpc3BsYXlfbmFtZRgCIAEoCRILCgN1cmwYAyABKAkSGwoOc2lnbmluZ19zZWNyZXQYBCABKAlCA+BBBBIfChJzaWduaW5nX3NlY3JldF9zZXQYBSABKAhCA+BBAxI0CgtjcmVhdGVfdGltZRgGIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgHIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAzpW6kFTChVtZW1vcy5hcGkvVXNlcldlYmhvb2sSH3VzZXJzL3t1c2VyfS93ZWJob29rcy97d2ViaG9va30qDHVzZXJXZWJob29rczILdXNlcldlYmhvb2siSAoXTGlzdFVzZXJXZWJob29rc1JlcXVlc3QSLQoGcGFyZW50GAEgASgJQh3gQQL6QRcSFW1lbW9zLmFwaS9Vc2VyV2ViaG9vayJEChhMaXN0VXNlcldlYmhvb2tzUmVzcG9uc2USKAoId2ViaG9va3MYASADKAsyFi5tZW1vcy5hcGkuVXNlcldlYmhvb2sidwoYQ3JlYXRlVXNlcldlYmhvb2tSZXF1ZXN0Ei0KBnBhcmVudBgBIAEoCUId4EEC+kEXEhVtZW1vcy5hcGkvVXNlcldlYmhvb2sSLAoHd2ViaG9vaxgCIAEoCzIWLm1lbW9zLmFwaS5Vc2VyV2ViaG9va0ID4EECInkKGFVwZGF0ZVVzZXJXZWJob29rUmVxdWVzdBIsCgd3ZWJob29rGAEgASgLMhYubWVtb3MuYXBpLlVzZXJXZWJob29rQgPgQQISLwoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrIkcKGERlbGV0ZVVzZXJXZWJob29rUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFW1lbW9zLmFwaS9Vc2VyV2ViaG9vayJRCiJHZXRVc2VyV2ViaG9va1NpZ25pbmdTZWNyZXRSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVbWVtb3MuYXBpL1VzZXJXZWJob29rIj0KI0dldFVzZXJXZWJob29rU2lnbmluZ1NlY3JldFJlc3BvbnNlEhYKDnNpZ25pbmdfc2VjcmV0GAEgASgJIu8BCg5MaW5rZWRJZGVudGl0eRIRCgRuYW1lGAEgASgJQgPgQQgSPQoRaWRlbnRpdHlfcHJvdmlkZXIYAiABKAlCIuBBA/pBHAoabWVtb3MuYXBpL0lkZW50aXR5UHJvdmlkZXISGQoMZXh0ZXJuYWxfdWlkGAMgASgJQgPgQQM6cOpBbQoYbWVtb3MuYXBpL0xpbmtlZElkZW50aXR5Ei91c2Vycy97dXNlcn0vbGlua2VkSWRlbnRpdGllcy97bGlua2VkX2lkZW50aXR5fSoQbGlua2VkSWRlbnRpdGllczIObGlua2VkSWRlbnRpdHkiRQobTGlzdExpbmtlZElkZW50aXRpZXNSZXF1ZXN0EiYKBnBhcmVudBgBIAEoCUIW4EEC+kEQCg5tZW1vcy5hcGkvVXNlciJUChxMaXN0TGlua2VkSWRlbnRpdGllc1Jlc3BvbnNlEjQKEWxpbmtlZF9pZGVudGl0aWVzGAEgAygLMhkubWVtb3MuYXBpLkxpbmtlZElkZW50aXR5IkoKGEdldExpbmtlZElkZW50aXR5UmVxdWVzdBIuCgRuYW1lGAEgASgJQiDgQQL6QRoKGG1lbW9zLmFwaS9MaW5rZWRJZGVudGl0eSLOAQobQ3JlYXRlTGlua2VkSWRlbnRpdHlSZXF1ZXN0EiYKBnBhcmVudBgBIAEoCUIW4EEC+kEQCg5tZW1vcy5hcGkvVXNlchI9ChFpZGVudGl0eV9wcm92aWRlchgCIAEoCUIi4EEC+kEcChptZW1vcy5hcGkvSWRlbnRpdHlQcm92aWRlchIRCgRjb2RlGAMgASgJQgPgQQISGQoMcmVkaXJlY3RfdXJpGAQgASgJQgPgQQISGgoNY29kZV92ZXJpZmllchgFIAEoCUID4EEBIk0KG0RlbGV0ZUxpbmtlZElkZW50aXR5UmVxdWVzdBIuCgRuYW1lGAEgASgJQiDgQQL6QRoKGG1lbW9zLmFwaS9MaW5rZWRJZGVudGl0eSLyAgoTUGVyc29uYWxBY2Nlc3NUb2tlbhIRCgRuYW1lGAEgASgJQgPgQQgSGAoLZGVzY3JpcHRpb24YAiABKAlCA+BBARI0CgtjcmVhdGVfdGltZRgDIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0CgtleHBpcmVfdGltZRgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBARI2Cg1sYXN0X3VzZV90aW1lGAUgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDOokB6kGFAQodbWVtb3MuYXBpL1BlcnNvbmFsQWNjZXNzVG9rZW4SOXVzZXJzL3t1c2VyfS9wZXJzb25hbEFjY2Vzc1Rva2Vucy97cGVyc29uYWxfYWNjZXNzX3Rva2VufSoUcGVyc29uYWxBY2Nlc3NUb2tlbnMyE3BlcnNvbmFsQWNjZXNzVG9rZW4iegofTGlzdFBlcnNvbmFsQWNjZXNzVG9rZW5zUmVxdWVzdBImCgZwYXJlbnQYASABKAlCFuBBAvpBEAoObWVtb3MuYXBpL1VzZXISFgoJcGFnZV9zaXplGAIgASgFQgPgQQESFwoKcGFnZV90b2tlbhgDIAEoCUID4EEBInsKIExpc3RQZXJzb25hbEFjY2Vzc1Rva2Vuc1Jlc3BvbnNlEj4KFnBlcnNvbmFsX2FjY2Vzc190b2tlbnMYASADKAsyHi5tZW1vcy5hcGkuUGVyc29uYWxBY2Nlc3NUb2tlbhIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkiggEKIENyZWF0ZVBlcnNvbmFsQWNjZXNzVG9rZW5SZXF1ZXN0EiYKBnBhcmVudBgBIAEoCUIW4EEC+kEQCg5tZW1vcy5hcGkvVXNlchIYCgtkZXNjcmlwdGlvbhgCIAEoCUID4EEBEhwKD2V4cGlyZXNfaW5fZGF5cxgDIAEoBUID4EEBInEKIUNyZWF0ZVBlcnNvbmFsQWNjZXNzVG9rZW5SZXNwb25zZRI9ChVwZXJzb25hbF9hY2Nlc3NfdG9rZW4YASABKAsyHi5tZW1vcy5hcGkuUGVyc29uYWxBY2Nlc3NUb2tlbhINCgV0b2tlbhgCIAEoCSJXCiBEZWxldGVQZXJzb25hbEFjY2Vzc1Rva2VuUmVxdWVzdBIzCgRuYW1lGAEgASgJQiXgQQL6QR8KHW1lbW9zLmFwaS9QZXJzb25hbEFjY2Vzc1Rva2VuIjoKEkV4cG9ydE1lbW9zUmVxdWVzdBIkCgRuYW1lGAEgASgJQhbgQQL6QRAKDm1lbW9zLmFwaS9Vc2VyIo8DChJJbXBvcnRNZW1vc1JlcXVlc3QSJAoEbmFtZRgBIAEoCUIW4EEC+kEQCg5tZW1vcy5hcGkvVXNlchIqCgRzcGVjGAIgASgLMhoubWVtb3MuYXBpLkltcG9ydE1lbW9zU3BlY0gAEhMKCXVwbG9hZF9pZBgDIAEoCUgAEhkKDHdyaXRlX29mZnNldBgEIAEoA0ID4EECEhEKBGRhdGEYBSABKAxCA+BBARIZCgxmaW5pc2hfd3JpdGUYBiABKAhCA+BBARJKCg9jb25mbGljdF9wb2xpY3kYByABKA4yLC5tZW1vcy5hcGkuSW1wb3J0TWVtb3NSZXF1ZXN0LkNvbmZsaWN0UG9saWN5QgPgQQESGgoNdmFsaWRhdGVfb25seRgIIAEoCEID4EEBIlcKDkNvbmZsaWN0UG9saWN5Eh8KG0NPTkZMSUNUX1BPTElDWV9VTlNQRUNJRklFRBAAEggKBFNLSVAQARILCgdSRVBMQUNFEAISDQoJRFVQTElDQVRFEANCCAoGdXBsb2FkIr4BChNJbXBvcnRNZW1vc1Jlc3BvbnNlEhEKCXVwbG9hZF9pZBgBIAEoCRIWCg5jb21taXR0ZWRfc2l6ZRgCIAEoAxIWCg5tYXhfY2h1bmtfc2l6ZRgDIAEoBRIqCgRwbGFuGAQgASgLMhoubWVtb3MuYXBpLkltcG9ydE1lbW9zUGxhbkgAEi4KBnJlcG9ydBgFIAEoCzIcLm1lbW9zLmFwaS5JbXBvcnRNZW1vc1JlcG9ydEgAQggKBnJlc3VsdCIqCg9JbXBvcnRNZW1vc1NwZWMSFwoKdG90YWxfc2l6ZRgBIAEoA0ID4EEBIvQBCg9JbXBvcnRNZW1vc1BsYW4SLwoLZXhwb3J0X3RpbWUYASABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEhAKCGV4cG9ydGVyGAIgASgJEhEKCWdlbmVyYXRvchgDIAEoCRISCgptZW1vX2NvdW50GAQgASgFEhgKEGF0dGFjaG1lbnRfY291bnQYBSABKAUSCwoDbmV3GAYgASgFEhAKCGV4aXN0aW5nGAcgASgFEg8KB3JlbmFtZWQYCCABKAUSLQoId2FybmluZ3MYCSADKAsyGy5tZW1vcy5hcGkuSW1wb3J0TWVtb3NJc3N1ZSK0AQoRSW1wb3J0TWVtb3NSZXBvcnQSDwoHY3JlYXRlZBgBIAEoBRIPCgd1cGRhdGVkGAIgASgFEg8KB3NraXBwZWQYAyABKAUSDgoGZmFpbGVkGAQgASgFEi0KCHdhcm5pbmdzGAUgAygLMhsubWVtb3MuYXBpLkltcG9ydE1lbW9zSXNzdWUSLQoIZmFpbHVyZXMYBiADKAsyGy5tZW1vcy5hcGkuSW1wb3J0TWVtb3NJc3N1ZSI1ChBJbXBvcnRNZW1vc0lzc3VlEhAKCG1lbW9fdWlkGAEgASgJEg8KB21lc3NhZ2UYAiABKAkyiiUKC1VzZXJTZXJ2aWNlEloKCUxpc3RVc2VycxIbLm1lbW9zLmFwaS5MaXN0VXNlcnNSZXF1ZXN0GhwubWVtb3MuYXBpLkxpc3RVc2Vyc1Jlc3BvbnNlIhKC0+STAgwSCi9hcGkvdXNlcnMSWQoHR2V0VXNlchIZLm1lbW9zLmFwaS5HZXRVc2VyUmVxdWVzdBoPLm1lbW9zLmFwaS5Vc2VyIiLaQQRuYW1lgtPkkwIVEhMvYXBpL3tuYW1lPXVzZXJzLyp9EnIKDUJhdGNoR2V0VXNlcnMSHy5tZW1vcy5hcGkuQmF0Y2hHZXRVc2Vyc1JlcXVlc3QaIC5tZW1vcy5hcGkuQmF0Y2hHZXRVc2Vyc1Jlc3BvbnNlIh6C0+STAhg6ASoiEy9hcGkvdXNlcnM6YmF0Y2hHZXQSZAoKQ3JlYXRlVXNlchIcLm1lbW9zLmFwaS5DcmVhdGVVc2VyUmVxdWVzdBoPLm1lbW9zLmFwaS5Vc2VyIifaQQx1c2VyLHVzZXJfaWSC0+STAhI6BHVzZXIiCi9hcGkvdXNlcnMSdgoKVXBkYXRlVXNlchIcLm1lbW9zLmFwaS5VcGRhdGVVc2VyUmVxdWVzdBoPLm1lbW9zLmFwaS5Vc2VyIjnaQRB1c2VyLHVwZGF0ZV9tYXNrgtPkkwIgOgR1c2VyMhgvYXBpL3t1c2VyLm5hbWU9dXNlcnMvKn0SZgoKRGVsZXRlVXNlchIcLm1lbW9zLmFwaS5EZWxldGVVc2VyUmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSIi2kEEbmFtZYLT5JMCFSoTL2FwaS97bmFtZT11c2Vycy8qfRKMAQoQTGlzdFVzZXJTZXR0aW5ncxIiLm1lbW9zLmFwaS5MaXN0VXNlclNldHRpbmdzUmVxdWVzdBojLm1lbW9zLmFwaS5MaXN0VXNlclNldHRpbmdzUmVzcG9uc2UiL9pBBnBhcmVudILT5JMCIBIeL2FwaS97cGFyZW50PXVzZXJzLyp9L3NldHRpbmdzEnkKDkdldFVzZXJTZXR0aW5nEiAubWVtb3MuYXBpLkdldFVzZXJTZXR0aW5nUmVxdWVzdBoWLm1lbW9zLmFwaS5Vc2VyU2V0dGluZyIt2kEEbmFtZYLT5JMCIBIeL2FwaS97bmFtZT11c2Vycy8qL3NldHRpbmdzLyp9Eq4BChFVcGRhdGVVc2VyU2V0dGluZxIjLm1lbW9zLmFwaS5VcGRhdGVVc2VyU2V0dGluZ1JlcXVlc3QaFi5tZW1vcy5hcGkuVXNlclNldHRpbmciXNpBGHVzZXJfc2V0dGluZyx1cGRhdGVfbWFza4LT5JMCOzoMdXNlcl9zZXR0aW5nMisvYXBpL3t1c2VyX3NldHRpbmcubmFtZT11c2Vycy8qL3NldHRpbmdzLyp9EoABCg1MaXN0VXNlclN0YXRzEh8ubWVtb3MuYXBpLkxpc3RVc2VyU3RhdHNSZXF1ZXN0GiAubWVtb3MuYXBpLkxpc3RVc2VyU3RhdHNSZXNwb25zZSIs2kEGcGFyZW50gtPkkwIdEhsvYXBpL3twYXJlbnQ9dXNlcnMvKn0vc3RhdHMScQoMR2V0VXNlclN0YXRzEh4ubWVtb3MuYXBpLkdldFVzZXJTdGF0c1JlcXVlc3QaFC5tZW1vcy5hcGkuVXNlclN0YXRzIivaQQRuYW1lgtPkkwIeEhwvYXBpL3tuYW1lPXVzZXJzLyp9OmdldFN0YXRzEm4KDEdldFVzZXJVc2FnZRIeLm1lbW9zLmFwaS5HZXRVc2VyVXNhZ2VSZXF1ZXN0GhQubWVtb3MuYXBpLlVzZXJVc2FnZSIo2kEEbmFtZYLT5JMCGxIZL2FwaS97bmFtZT11c2Vycy8qL3VzYWdlfRKAAQoNTGlzdE1lbW9WaWV3cxIfLm1lbW9zLmFwaS5MaXN0TWVtb1ZpZXdzUmVxdWVzdBogLm1lbW9zLmFwaS5MaXN0TWVtb1ZpZXdzUmVzcG9uc2UiLNpBBnBhcmVudILT5JMCHRIbL2FwaS97cGFyZW50PXVzZXJzLyp9L3ZpZXdzEm0KC0dldE1lbW9WaWV3Eh0ubWVtb3MuYXBpLkdldE1lbW9WaWV3UmVxdWVzdBoTLm1lbW9zLmFwaS5NZW1vVmlldyIq2kEEbmFtZYLT5JMCHRIbL2FwaS97bmFtZT11c2Vycy8qL3ZpZXdzLyp9EooBCg5DcmVhdGVNZW1vVmlldxIgLm1lbW9zLmFwaS5DcmVhdGVNZW1vVmlld1JlcXVlc3QaEy5tZW1vcy5hcGkuTWVtb1ZpZXciQdpBEHBhcmVudCxtZW1vX3ZpZXeC0+STAig6CW1lbW9fdmlldyIbL2FwaS97cGFyZW50PXVzZXJzLyp9L3ZpZXdzEpkBCg5VcGRhdGVNZW1vVmlldxIgLm1lbW9zLmFwaS5VcGRhdGVNZW1vVmlld1JlcXVlc3QaEy5tZW1vcy5hcGkuTWVtb1ZpZXciUNpBFW1lbW9fdmlldyx1cGRhdGVfbWFza4LT5JMCMjoJbWVtb192aWV3MiUvYXBpL3ttZW1vX3ZpZXcubmFtZT11c2Vycy8qL3ZpZXdzLyp9EnYKDkRlbGV0ZU1lbW9WaWV3EiAubWVtb3MuYXBpLkRlbGV0ZU1lbW9WaWV3UmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSIq2kEEbmFtZYLT5JMCHSobL2FwaS97bmFtZT11c2Vycy8qL3ZpZXdzLyp9EqABChVMaXN0VXNlck5vdGlmaWNhdGlvbnMSJy5tZW1vcy5hcGkuTGlzdFVzZXJOb3RpZmljYXRpb25zUmVxdWVzdBooLm1lbW9zLmFwaS5MaXN0VXNlck5vdGlmaWNhdGlvbnNSZXNwb25zZSI02kEGcGFyZW50gtPkkwIlEiMvYXBpL3twYXJlbnQ9dXNlcnMvKn0vbm90aWZpY2F0aW9ucxLCAQoWVXBkYXRlVXNlck5vdGlmaWNhdGlvbhIoLm1lbW9zLmFwaS5VcGRhdGVVc2VyTm90aWZpY2F0aW9uUmVxdWVzdBobLm1lbW9zLmFwaS5Vc2VyTm90aWZpY2F0aW9uImHaQRhub3RpZmljYXRpb24sdXBkYXRlX21hc2uC0+STAkA6DG5vdGlmaWNhdGlvbjIwL2FwaS97bm90aWZpY2F0aW9uLm5hbWU9dXNlcnMvKi9ub3RpZmljYXRpb25zLyp9Eo4BChZEZWxldGVVc2VyTm90aWZpY2F0aW9uEigubWVtb3MuYXBpLkRlbGV0ZVVzZXJOb3RpZmljYXRpb25SZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IjLaQQRuYW1lgtPkkwIlKiMvYXBpL3tuYW1lPXVzZXJzLyovbm90aWZpY2F0aW9ucy8qfRKMAQoQTGlzdFVzZXJXZWJob29rcxIiLm1lbW9zLmFwaS5MaXN0VXNlcldlYmhvb2tzUmVxdWVzdBojLm1lbW9zLmFwaS5MaXN0VXNlcldlYmhvb2tzUmVzcG9uc2UiL9pBBnBhcmVudILT5JMCIBIeL2FwaS97cGFyZW50PXVzZXJzLyp9L3dlYmhvb2tzEpIBChFDcmVhdGVVc2VyV2ViaG9vaxIjLm1lbW9zLmFwaS5DcmVhdGVVc2VyV2ViaG9va1JlcXVlc3QaFi5tZW1vcy5hcGkuVXNlcldlYmhvb2siQNpBDnBhcmVudCx3ZWJob29rgtPkkwIpOgd3ZWJob29rIh4vYXBpL3twYXJlbnQ9dXNlcnMvKn0vd2ViaG9va3MSnwEKEVVwZGF0ZVVzZXJXZWJob29rEiMubWVtb3MuYXBpLlVwZGF0ZVVzZXJXZWJob29rUmVxdWVzdBoWLm1lbW9zLmFwaS5Vc2VyV2ViaG9vayJN2kETd2ViaG9vayx1cGRhdGVfbWFza4LT5JMCMToHd2ViaG9vazImL2FwaS97d2ViaG9vay5uYW1lPXVzZXJzLyovd2ViaG9va3MvKn0SfwoRRGVsZXRlVXNlcldlYmhvb2sSIy5tZW1vcy5hcGkuRGVsZXRlVXNlcldlYmhvb2tSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5Ii3aQQRuYW1lgtPkkwIgKh4vYXBpL3tuYW1lPXVzZXJzLyovd2ViaG9va3MvKn0SvAEKG0dldFVzZXJXZWJob29rU2lnbmluZ1NlY3JldBItLm1lbW9zLmFwaS5HZXRVc2VyV2ViaG9va1NpZ25pbmdTZWNyZXRSZXF1ZXN0Gi4ubWVtb3MuYXBpLkdldFVzZXJXZWJob29rU2lnbmluZ1NlY3JldFJlc3BvbnNlIj7aQQRuYW1lgtPkkwIxEi8vYXBpL3tuYW1lPXVzZXJzLyovd2ViaG9va3MvKn06Z2V0U2lnbmluZ1NlY3JldBKgAQoUTGlzdExpbmtlZElkZW50aXRpZXMSJi5tZW1vcy5hcGkuTGlzdExpbmtlZElkZW50aXRpZXNSZXF1ZXN0GicubWVtb3MuYXBpLkxpc3RMaW5rZWRJZGVudGl0aWVzUmVzcG9uc2UiN9pBBnBhcmVudILT5JMCKBImL2FwaS97cGFyZW50PXVzZXJzLyp9L2xpbmtlZElkZW50aXRpZXMSigEKEUdldExpbmtlZElkZW50aXR5EiMubWVtb3MuYXBpLkdldExpbmtlZElkZW50aXR5UmVxdWVzdBoZLm1lbW9zLmFwaS5MaW5rZWRJZGVudGl0eSI12kEEbmFtZYLT5JMCKBImL2FwaS97bmFtZT11c2Vycy8qL2xpbmtlZElkZW50aXRpZXMvKn0SpwEKFENyZWF0ZUxpbmtlZElkZW50aXR5EiYubWVtb3MuYXBpLkNyZWF0ZUxpbmtlZElkZW50aXR5UmVxdWVzdBoZLm1lbW9zLmFwaS5MaW5rZWRJZGVudGl0eSJM2kEYcGFyZW50LGlkZW50aXR5X3Byb3ZpZGVygtPkkwIrOgEqIiYvYXBpL3twYXJlbnQ9dXNlcnMvKn0vbGlua2VkSWRlbnRpdGllcxKNAQoURGVsZXRlTGlua2VkSWRlbnRpdHkSJi5tZW1vcy5hcGkuRGVsZXRlTGlua2VkSWRlbnRpdHlSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IjXaQQRuYW1lgtPkkwIoKiYvYXBpL3tuYW1lPXVzZXJzLyovbGlua2VkSWRlbnRpdGllcy8qfRKwAQoYTGlzdFBlcnNvbmFsQWNjZXNzVG9rZW5zEioubWVtb3MuYXBpLkxpc3RQZXJzb25hbEFjY2Vzc1Rva2Vuc1JlcXVlc3QaKy5tZW1vcy5hcGkuTGlzdFBlcnNvbmFsQWNjZXNzVG9rZW5zUmVzcG9uc2UiO9pBBnBhcmVudILT5JMCLBIqL2FwaS97cGFyZW50PXVzZXJzLyp9L3BlcnNvbmFsQWNjZXNzVG9rZW5zEq0BChlDcmVhdGVQZXJzb25hbEFjY2Vzc1Rva2VuEisubWVtb3MuYXBpLkNyZWF0ZVBlcnNvbmFsQWNjZXNzVG9rZW5SZXF1ZXN0GiwubWVtb3MuYXBpLkNyZWF0ZVBlcnNvbmFsQWNjZXNzVG9rZW5SZXNwb25zZSI1gtPkkwIvOgEqIiovYXBpL3twYXJlbnQ9dXNlcnMvKn0vcGVyc29uYWxBY2Nlc3NUb2tlbnMSmwEKGURlbGV0ZVBlcnNvbmFsQWNjZXNzVG9rZW4SKy5tZW1vcy5hcGkuRGVsZXRlUGVyc29uYWxBY2Nlc3NUb2tlblJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiOdpBBG5hbWWC0+STAiwqKi9hcGkve25hbWU9dXNlcnMvKi9wZXJzb25hbEFjY2Vzc1Rva2Vucy8qfRJyCgtFeHBvcnRNZW1vcxIdLm1lbW9zLmFwaS5FeHBvcnRNZW1vc1JlcXVlc3QaFC5nb29nbGUuYXBpLkh0dHBCb2R5Ii7aQQRuYW1lgtPkkwIhEh8vYXBpL3tuYW1lPXVzZXJzLyp9OmV4cG9ydE1lbW9zEngKC0ltcG9ydE1lbW9zEh0ubWVtb3MuYXBpLkltcG9ydE1lbW9zUmVxdWVzdBoeLm1lbW9zLmFwaS5JbXBvcnRNZW1vc1Jlc3BvbnNlIiqC0+STAiQ6ASoiHy9hcGkve25hbWU9dXNlcnMvKn06aW1wb3J0TWVtb3NCjwEKDWNvbS5tZW1vcy5hcGlCEFVzZXJTZXJ2aWNlUHJvdG9QAVonZ2l0aHViLmNvbS91c2VtZW1vcy9tZW1vcy9wcm90by9nZW4vYXBpogIDTUFYqgIJTWVtb3MuQXBpygIJTWVtb3NcQXBp4gIVTWVtb3NcQXBpXEdQQk1ldGFkYXRh6gIKTWVtb3M6OkFwaWIGcHJvdG8z", [file_api_common, file_api_space_service, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_httpbody, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_google_type_color]); /** * User is an account on the instance. @@ -458,6 +458,14 @@ export type UserSetting = Message<"memos.api.UserSetting"> & { */ value: UserSetting_TagsSetting; case: "tagsSetting"; + } | { + /** + * The value of the EDITOR setting. + * + * @generated from field: memos.api.UserSetting.EditorSetting editor_setting = 5; + */ + value: UserSetting_EditorSetting; + case: "editorSetting"; } | { case: undefined; value?: undefined }; }; @@ -585,6 +593,29 @@ export type UserSetting_TagMetadata = Message<"memos.api.UserSetting.TagMetadata export const UserSetting_TagMetadataSchema: GenMessage = /*@__PURE__*/ messageDesc(file_api_user_service, 9, 3); +/** + * EditorSetting holds the user's memo editor preferences. + * + * @generated from message memos.api.UserSetting.EditorSetting + */ +export type UserSetting_EditorSetting = Message<"memos.api.UserSetting.EditorSetting"> & { + /** + * Optional. Whether the official client's memo editor uses source mode, + * which shows and edits memos as Markdown text instead of formatted text. + * The official client calls this "Markdown mode". + * + * @generated from field: bool source_mode = 1; + */ + sourceMode: boolean; +}; + +/** + * Describes the message memos.api.UserSetting.EditorSetting. + * Use `create(UserSetting_EditorSettingSchema)` to create a new message. + */ +export const UserSetting_EditorSettingSchema: GenMessage = /*@__PURE__*/ + messageDesc(file_api_user_service, 9, 4); + /** * Key identifies a user setting. * @@ -616,6 +647,13 @@ export enum UserSetting_Key { * @generated from enum value: TAGS = 3; */ TAGS = 3, + + /** + * Memo editor preferences. + * + * @generated from enum value: EDITOR = 4; + */ + EDITOR = 4, } /** diff --git a/web/tests/memo-editor-paste-files.test.tsx b/web/tests/memo-editor-paste-files.test.tsx index 4ee86f973..3509d4ed4 100644 --- a/web/tests/memo-editor-paste-files.test.tsx +++ b/web/tests/memo-editor-paste-files.test.tsx @@ -8,7 +8,11 @@ vi.mock("@/utils/i18n", async (importOriginal) => ({ ...(await importOriginal()), useTranslate: () => (key: string) => key, })); -vi.mock("@/hooks/useUserQueries", () => ({ useTagCounts: () => ({ data: {} }), useUsersByUsernames: () => ({ data: undefined }) })); +vi.mock("@/hooks/useUserQueries", () => ({ + useTagCounts: () => ({ data: {} }), + useUsersByUsernames: () => ({ data: undefined }), + useUpdateUserEditorSetting: () => ({ mutate: vi.fn() }), +})); vi.mock("@/hooks/useCurrentUser", () => ({ default: () => ({ name: "users/1" }) })); vi.mock("@/contexts/AuthContext", () => ({ useAuth: () => ({ userGeneralSetting: {} }) })); vi.mock("@/contexts/InstanceContext", () => ({ diff --git a/web/tests/memo-editor-source-mode.test.tsx b/web/tests/memo-editor-source-mode.test.tsx index 76cbf5e8f..6047a6bb6 100644 --- a/web/tests/memo-editor-source-mode.test.tsx +++ b/web/tests/memo-editor-source-mode.test.tsx @@ -10,9 +10,40 @@ vi.mock("@/utils/i18n", async (importOriginal) => ({ ...(await importOriginal()), useTranslate: () => (key: string) => key, })); -vi.mock("@/hooks/useUserQueries", () => ({ useTagCounts: () => ({ data: {} }), useUsersByUsernames: () => ({ data: undefined }) })); +// The account's EDITOR setting, shared by every useAuth caller the way AuthContext shares it. +const editorSetting = vi.hoisted(() => { + let value: { sourceMode: boolean } | undefined; + const listeners = new Set<() => void>(); + return { + get: () => value, + set: (next: { sourceMode: boolean } | undefined) => { + value = next; + for (const listener of listeners) listener(); + }, + subscribe: (listener: () => void) => { + listeners.add(listener); + return () => listeners.delete(listener); + }, + }; +}); +const updateEditorSetting = vi.hoisted(() => vi.fn()); +vi.mock("@/hooks/useUserQueries", () => ({ + useTagCounts: () => ({ data: {} }), + useUsersByUsernames: () => ({ data: undefined }), + useUpdateUserEditorSetting: () => ({ mutate: updateEditorSetting }), +})); vi.mock("@/hooks/useCurrentUser", () => ({ default: () => ({ name: "users/1" }) })); -vi.mock("@/contexts/AuthContext", () => ({ useAuth: () => ({ userGeneralSetting: {} }) })); +vi.mock("@/contexts/AuthContext", async () => { + const { useSyncExternalStore } = await import("react"); + return { + useAuth: () => ({ + userGeneralSetting: {}, + userEditorSetting: useSyncExternalStore(editorSetting.subscribe, editorSetting.get), + setUserEditorSetting: editorSetting.set, + }), + }; +}); +vi.mock("react-hot-toast", () => ({ toast: { error: vi.fn(), success: vi.fn() } })); vi.mock("@/contexts/InstanceContext", () => ({ useInstance: () => ({ aiSetting: { providers: [], transcription: undefined }, fetchSetting: vi.fn().mockResolvedValue(undefined) }), })); @@ -39,7 +70,6 @@ beforeAll(async () => { Element.prototype.releasePointerCapture = vi.fn(); }); -const MODE_KEY = "memos-editor-mode"; const CACHE_KEY = "source-mode-test"; const mount = (suggestions?: readonly MemoSuggestion[]) => @@ -55,34 +85,48 @@ const sourceLines = (container: HTMLElement) => Array.from(container.querySelectorAll(".mbe-source .mbe-source-line"), (line) => line.textContent).join("\n"); afterEach(() => { - localStorage.clear(); + editorSetting.set(undefined); + updateEditorSetting.mockReset(); cacheService.clearAll(); }); +const toggleSourceMode = () => { + fireEvent.click(screen.getByRole("button", { name: "common.add" })); + fireEvent.click(screen.getByRole("menuitemcheckbox", { name: "editor.markdown-mode" })); +}; + describe("MemoEditor source mode", () => { it("shows the Markdown label only while source mode is on", () => { const { container } = mount(); expect(sourceText(container)).toBeNull(); expect(screen.queryByText("Markdown", { exact: true })).not.toBeInTheDocument(); - fireEvent.click(screen.getByRole("button", { name: "common.add" })); - fireEvent.click(screen.getByRole("menuitemcheckbox", { name: "editor.markdown-mode" })); + toggleSourceMode(); expect(sourceText(container)).not.toBeNull(); - expect(localStorage.getItem(MODE_KEY)).toBe(JSON.stringify("source")); + expect(updateEditorSetting).toHaveBeenLastCalledWith(expect.objectContaining({ sourceMode: true }), expect.anything()); expect(screen.getByText("Markdown", { exact: true })).toHaveAttribute("aria-label", "editor.markdown-mode"); expect(container.querySelector(".memo-editor-content")).toHaveAttribute("data-source-mode"); - fireEvent.click(screen.getByRole("button", { name: "common.add" })); - fireEvent.click(screen.getByRole("menuitemcheckbox", { name: "editor.markdown-mode" })); + toggleSourceMode(); expect(sourceText(container)).toBeNull(); expect(screen.queryByText("Markdown", { exact: true })).not.toBeInTheDocument(); - expect(localStorage.getItem(MODE_KEY)).toBe(JSON.stringify("rich")); + expect(updateEditorSetting).toHaveBeenLastCalledWith(expect.objectContaining({ sourceMode: false }), expect.anything()); }); - it("opens in the mode remembered on this device", () => { - localStorage.setItem(MODE_KEY, JSON.stringify("source")); + it("switches back when saving the mode fails", () => { + updateEditorSetting.mockImplementation((_setting, options) => options.onError(new Error("unavailable"))); + const { container } = mount(); + + toggleSourceMode(); + + expect(sourceText(container)).toBeNull(); + expect(screen.queryByText("Markdown", { exact: true })).not.toBeInTheDocument(); + }); + + it("opens in the mode saved on the account", () => { + editorSetting.set({ sourceMode: true }); const { container } = mount(); expect(sourceText(container)).not.toBeNull(); @@ -98,25 +142,21 @@ describe("MemoEditor source mode", () => { attachments: [], }); const { container } = mount(); - const toggle = () => { - fireEvent.click(screen.getByRole("button", { name: "common.add" })); - fireEvent.click(screen.getByRole("menuitemcheckbox", { name: "editor.markdown-mode" })); - }; - toggle(); + toggleSourceMode(); expect(sourceLines(container)).toBe(markdown); - toggle(); + toggleSourceMode(); expect(sourceText(container)).toBeNull(); expect(screen.getByRole("heading", { level: 1 })).toHaveTextContent("Plan"); // Rich mode shows no Markdown string, so the source text after a third switch is the round trip's result. - toggle(); + toggleSourceMode(); expect(sourceLines(container)).toBe(markdown); }); it.each(["rich", "source"])("offers the checklist suggestion in %s mode and applies it there", async (mode) => { - localStorage.setItem(MODE_KEY, JSON.stringify(mode)); + editorSetting.set({ sourceMode: mode === "source" }); cacheService.saveNow(cacheService.key("users/1", draftKeyFor({ kind: "new", scope: CACHE_KEY })), { content: "Groceries", attachments: [], diff --git a/web/tests/memo-editor-transcription.test.tsx b/web/tests/memo-editor-transcription.test.tsx index 7e6292f65..1ecde5710 100644 --- a/web/tests/memo-editor-transcription.test.tsx +++ b/web/tests/memo-editor-transcription.test.tsx @@ -8,7 +8,11 @@ import { memoKeys } from "@/hooks/useMemoQueries"; import { AttachmentSchema } from "@/types/proto/api/attachment_service_pb"; import { MemoSchema, Visibility } from "@/types/proto/api/memo_service_pb"; -vi.mock("@/hooks/useUserQueries", () => ({ useTagCounts: () => ({ data: {} }), useUsersByUsernames: () => ({ data: undefined }) })); +vi.mock("@/hooks/useUserQueries", () => ({ + useTagCounts: () => ({ data: {} }), + useUsersByUsernames: () => ({ data: undefined }), + useUpdateUserEditorSetting: () => ({ mutate: vi.fn() }), +})); vi.mock("@/hooks/useCurrentUser", () => ({ default: () => ({ name: "users/1" }) })); vi.mock("@/contexts/AuthContext", () => ({ useAuth: () => ({ userGeneralSetting: {} }) })); vi.mock("@/contexts/InstanceContext", () => ({