Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
refactor: update resource id naming
Steven7cc8b951a3e0
diff --git a/internal/util/resource_name.go b/internal/util/resource_name.goindex 6fc10c666..f7a1124a9 100644--- a/internal/util/resource_name.go+++ b/internal/util/resource_name.go@@ -3,5 +3,5 @@ package utilimport "regexp"var (- ResourceNameMatcher = regexp.MustCompile("^[a-zA-Z0-9]([a-zA-Z0-9-]{1,30}[a-zA-Z0-9])$")+ UIDMatcher = regexp.MustCompile("^[a-zA-Z0-9]([a-zA-Z0-9-]{1,30}[a-zA-Z0-9])$"))diff --git a/proto/api/v2/memo_service.proto b/proto/api/v2/memo_service.protoindex 829b5d9d7..ff09649a4 100644--- a/proto/api/v2/memo_service.proto+++ b/proto/api/v2/memo_service.proto@@ -122,15 +122,17 @@ enum Visibility {message Memo {// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}+ // id is the system generated id.string name = 1;- string resource_id = 2;+ // The user defined id of the memo.+ string uid = 2;RowStatus row_status = 3;// The name of the creator.- // Format: users/{uid}+ // Format: users/{id}string creator = 4;google.protobuf.Timestamp create_time = 5;@@ -197,7 +199,7 @@ message SearchMemosResponse {message GetMemoRequest {// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}string name = 1;}@@ -217,7 +219,7 @@ message UpdateMemoResponse {message DeleteMemoRequest {// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}string name = 1;}@@ -234,7 +236,7 @@ message ExportMemosResponse {message SetMemoResourcesRequest {// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}string name = 1;repeated Resource resources = 2;@@ -244,7 +246,7 @@ message SetMemoResourcesResponse {}message ListMemoResourcesRequest {// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}string name = 1;}@@ -254,7 +256,7 @@ message ListMemoResourcesResponse {message SetMemoRelationsRequest {// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}string name = 1;repeated MemoRelation relations = 2;@@ -264,7 +266,7 @@ message SetMemoRelationsResponse {}message ListMemoRelationsRequest {// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}string name = 1;}@@ -274,7 +276,7 @@ message ListMemoRelationsResponse {message CreateMemoCommentRequest {// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}string name = 1;CreateMemoRequest comment = 2;@@ -286,7 +288,7 @@ message CreateMemoCommentResponse {message ListMemoCommentsRequest {// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}string name = 1;}@@ -296,7 +298,7 @@ message ListMemoCommentsResponse {message GetUserMemosStatsRequest {// name is the name of the user to get stats for.- // Format: users/{uid}+ // Format: users/{id}string name = 1;// timezone location@@ -316,7 +318,7 @@ message GetUserMemosStatsResponse {message ListMemoReactionsRequest {// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}string name = 1;}@@ -326,7 +328,7 @@ message ListMemoReactionsResponse {message UpsertMemoReactionRequest {// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}string name = 1;Reaction reaction = 2;@@ -338,7 +340,7 @@ message UpsertMemoReactionResponse {message DeleteMemoReactionRequest {// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}string name = 1;int32 reaction_id = 2;diff --git a/proto/api/v2/reaction_service.proto b/proto/api/v2/reaction_service.protoindex 276539ccf..c1c7159f6 100644--- a/proto/api/v2/reaction_service.proto+++ b/proto/api/v2/reaction_service.proto@@ -8,7 +8,7 @@ message Reaction {int32 id = 1;// The name of the creator.- // Format: users/{uid}+ // Format: users/{id}string creator = 2;string content_id = 3;diff --git a/proto/api/v2/tag_service.proto b/proto/api/v2/tag_service.protoindex 833155539..a50cf4d08 100644--- a/proto/api/v2/tag_service.proto+++ b/proto/api/v2/tag_service.proto@@ -37,7 +37,7 @@ service TagService {message Tag {string name = 1;// The creator of tags.- // Format: users/{uid}+ // Format: users/{id}string creator = 2;}@@ -57,7 +57,7 @@ message BatchUpsertTagResponse {}message ListTagsRequest {// The creator of tags.- // Format: users/{uid}+ // Format: users/{id}string user = 1;}@@ -67,7 +67,7 @@ message ListTagsResponse {message RenameTagRequest {// The creator of tags.- // Format: users/{uid}+ // Format: users/{id}string user = 1;string old_name = 2;string new_name = 3;@@ -85,7 +85,7 @@ message DeleteTagResponse {}message GetTagSuggestionsRequest {// The creator of tags.- // Format: users/{uid}+ // Format: users/{id}string user = 1;}diff --git a/proto/api/v2/user_service.proto b/proto/api/v2/user_service.protoindex af55188ad..d5558e537 100644--- a/proto/api/v2/user_service.proto+++ b/proto/api/v2/user_service.proto@@ -91,7 +91,7 @@ service UserService {message User {// The name of the user.- // Format: users/{uid}+ // Format: users/{id}string name = 1;// The system generated uid of the user.@@ -140,7 +140,7 @@ message SearchUsersResponse {message GetUserRequest {// The name of the user.- // Format: users/{uid}+ // Format: users/{id}string name = 1;}@@ -168,7 +168,7 @@ message UpdateUserResponse {message DeleteUserRequest {// The name of the user.- // Format: users/{uid}+ // Format: users/{id}string name = 1;}@@ -176,7 +176,7 @@ message DeleteUserResponse {}message UserSetting {// The name of the user.- // Format: users/{uid}+ // Format: users/{id}string name = 1;// The preferred locale of the user.string locale = 2;@@ -190,7 +190,7 @@ message UserSetting {message GetUserSettingRequest {// The name of the user.- // Format: users/{uid}+ // Format: users/{id}string name = 1;}@@ -217,7 +217,7 @@ message UserAccessToken {message ListUserAccessTokensRequest {// The name of the user.- // Format: users/{uid}+ // Format: users/{id}string name = 1;}@@ -227,7 +227,7 @@ message ListUserAccessTokensResponse {message CreateUserAccessTokenRequest {// The name of the user.- // Format: users/{uid}+ // Format: users/{id}string name = 1;string description = 2;@@ -241,7 +241,7 @@ message CreateUserAccessTokenResponse {message DeleteUserAccessTokenRequest {// The name of the user.- // Format: users/{uid}+ // Format: users/{id}string name = 1;// access_token is the access token to delete.string access_token = 2;diff --git a/proto/gen/api/v2/README.md b/proto/gen/api/v2/README.mdindex ac7a76c5f..a7ba32fe6 100644--- a/proto/gen/api/v2/README.md+++ b/proto/gen/api/v2/README.md@@ -389,7 +389,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the user. Format: users/{uid} |+| name | [string](#string) | | The name of the user. Format: users/{id} || description | [string](#string) | | || expires_at | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | optional | |@@ -451,7 +451,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the user. Format: users/{uid} |+| name | [string](#string) | | The name of the user. Format: users/{id} || access_token | [string](#string) | | access_token is the access token to delete. |@@ -477,7 +477,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the user. Format: users/{uid} |+| name | [string](#string) | | The name of the user. Format: users/{id} |@@ -502,7 +502,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the user. Format: users/{uid} |+| name | [string](#string) | | The name of the user. Format: users/{id} |@@ -532,7 +532,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the user. Format: users/{uid} |+| name | [string](#string) | | The name of the user. Format: users/{id} |@@ -562,7 +562,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the user. Format: users/{uid} |+| name | [string](#string) | | The name of the user. Format: users/{id} |@@ -709,7 +709,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the user. Format: users/{uid} |+| name | [string](#string) | | The name of the user. Format: users/{id} || id | [int32](#int32) | | The system generated uid of the user. || role | [User.Role](#memos-api-v2-User-Role) | | || username | [string](#string) | | |@@ -753,7 +753,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the user. Format: users/{uid} |+| name | [string](#string) | | The name of the user. Format: users/{id} || locale | [string](#string) | | The preferred locale of the user. || appearance | [string](#string) | | The preferred appearance of the user. || memo_visibility | [string](#string) | | The default visibility of the memo. |@@ -1273,7 +1273,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- || id | [int32](#int32) | | |-| creator | [string](#string) | | The name of the creator. Format: users/{uid} |+| creator | [string](#string) | | The name of the creator. Format: users/{id} || content_id | [string](#string) | | || reaction_type | [Reaction.Type](#memos-api-v2-Reaction-Type) | | |@@ -1556,7 +1556,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the memo. Format: memos/{uid} |+| name | [string](#string) | | The name of the memo. Format: memos/{id} || comment | [CreateMemoRequest](#memos-api-v2-CreateMemoRequest) | | |@@ -1618,7 +1618,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the memo. Format: memos/{uid} |+| name | [string](#string) | | The name of the memo. Format: memos/{id} || reaction_id | [int32](#int32) | | |@@ -1644,7 +1644,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the memo. Format: memos/{uid} |+| name | [string](#string) | | The name of the memo. Format: memos/{id} |@@ -1699,7 +1699,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the memo. Format: memos/{uid} |+| name | [string](#string) | | The name of the memo. Format: memos/{id} |@@ -1729,7 +1729,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | name is the name of the user to get stats for. Format: users/{uid} |+| name | [string](#string) | | name is the name of the user to get stats for. Format: users/{id} || timezone | [string](#string) | | timezone location Format: uses tz identifier https://en.wikipedia.org/wiki/List_of_tz_database_time_zones || filter | [string](#string) | | Same as ListMemosRequest.filter |@@ -1777,7 +1777,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the memo. Format: memos/{uid} |+| name | [string](#string) | | The name of the memo. Format: memos/{id} |@@ -1807,7 +1807,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the memo. Format: memos/{uid} |+| name | [string](#string) | | The name of the memo. Format: memos/{id} |@@ -1837,7 +1837,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the memo. Format: memos/{uid} |+| name | [string](#string) | | The name of the memo. Format: memos/{id} |@@ -1867,7 +1867,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the memo. Format: memos/{uid} |+| name | [string](#string) | | The name of the memo. Format: memos/{id} |@@ -1930,10 +1930,10 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the memo. Format: memos/{uid} |-| resource_id | [string](#string) | | |+| name | [string](#string) | | The name of the memo. Format: memos/{id} id is the system generated id. |+| uid | [string](#string) | | The user defined id of the memo. || row_status | [RowStatus](#memos-api-v2-RowStatus) | | |-| creator | [string](#string) | | The name of the creator. Format: users/{uid} |+| creator | [string](#string) | | The name of the creator. Format: users/{id} || create_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | || update_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | || display_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | |@@ -1988,7 +1988,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the memo. Format: memos/{uid} |+| name | [string](#string) | | The name of the memo. Format: memos/{id} || relations | [MemoRelation](#memos-api-v2-MemoRelation) | repeated | |@@ -2014,7 +2014,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the memo. Format: memos/{uid} |+| name | [string](#string) | | The name of the memo. Format: memos/{id} || resources | [Resource](#memos-api-v2-Resource) | repeated | |@@ -2071,7 +2071,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the memo. Format: memos/{uid} |+| name | [string](#string) | | The name of the memo. Format: memos/{id} || reaction | [Reaction](#memos-api-v2-Reaction) | | |@@ -2208,7 +2208,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| user | [string](#string) | | The creator of tags. Format: users/{uid} |+| user | [string](#string) | | The creator of tags. Format: users/{id} |@@ -2238,7 +2238,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| user | [string](#string) | | The creator of tags. Format: users/{uid} |+| user | [string](#string) | | The creator of tags. Format: users/{id} |@@ -2268,7 +2268,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| user | [string](#string) | | The creator of tags. Format: users/{uid} |+| user | [string](#string) | | The creator of tags. Format: users/{id} || old_name | [string](#string) | | || new_name | [string](#string) | | |@@ -2301,7 +2301,7 @@ Used internally for obfuscating the page token.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- || name | [string](#string) | | |-| creator | [string](#string) | | The creator of tags. Format: users/{uid} |+| creator | [string](#string) | | The creator of tags. Format: users/{id} |diff --git a/proto/gen/api/v2/memo_service.pb.go b/proto/gen/api/v2/memo_service.pb.goindex a49077499..f4924f3f7 100644--- a/proto/gen/api/v2/memo_service.pb.go+++ b/proto/gen/api/v2/memo_service.pb.go@@ -81,12 +81,14 @@ type Memo struct {unknownFields protoimpl.UnknownFields// The name of the memo.- // Format: memos/{uid}- Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`- ResourceId string `protobuf:"bytes,2,opt,name=resource_id,json=resourceId,proto3" json:"resource_id,omitempty"`- RowStatus RowStatus `protobuf:"varint,3,opt,name=row_status,json=rowStatus,proto3,enum=memos.api.v2.RowStatus" json:"row_status,omitempty"`+ // Format: memos/{id}+ // id is the system generated id.+ Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`+ // The user defined id of the memo.+ Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid,omitempty"`+ RowStatus RowStatus `protobuf:"varint,3,opt,name=row_status,json=rowStatus,proto3,enum=memos.api.v2.RowStatus" json:"row_status,omitempty"`// The name of the creator.- // Format: users/{uid}+ // Format: users/{id}Creator string `protobuf:"bytes,4,opt,name=creator,proto3" json:"creator,omitempty"`CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`@@ -139,9 +141,9 @@ func (x *Memo) GetName() string {return ""}-func (x *Memo) GetResourceId() string {+func (x *Memo) GetUid() string {if x != nil {- return x.ResourceId+ return x.Uid}return ""}@@ -559,7 +561,7 @@ type GetMemoRequest struct {unknownFields protoimpl.UnknownFields// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`}@@ -757,7 +759,7 @@ type DeleteMemoRequest struct {unknownFields protoimpl.UnknownFields// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`}@@ -939,7 +941,7 @@ type SetMemoResourcesRequest struct {unknownFields protoimpl.UnknownFields// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`Resources []*Resource `protobuf:"bytes,2,rep,name=resources,proto3" json:"resources,omitempty"`}@@ -1034,7 +1036,7 @@ type ListMemoResourcesRequest struct {unknownFields protoimpl.UnknownFields// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`}@@ -1130,7 +1132,7 @@ type SetMemoRelationsRequest struct {unknownFields protoimpl.UnknownFields// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`Relations []*MemoRelation `protobuf:"bytes,2,rep,name=relations,proto3" json:"relations,omitempty"`}@@ -1225,7 +1227,7 @@ type ListMemoRelationsRequest struct {unknownFields protoimpl.UnknownFields// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`}@@ -1321,7 +1323,7 @@ type CreateMemoCommentRequest struct {unknownFields protoimpl.UnknownFields// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`Comment *CreateMemoRequest `protobuf:"bytes,2,opt,name=comment,proto3" json:"comment,omitempty"`}@@ -1425,7 +1427,7 @@ type ListMemoCommentsRequest struct {unknownFields protoimpl.UnknownFields// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`}@@ -1521,7 +1523,7 @@ type GetUserMemosStatsRequest struct {unknownFields protoimpl.UnknownFields// name is the name of the user to get stats for.- // Format: users/{uid}+ // Format: users/{id}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`// timezone location// Format: uses tz identifier@@ -1639,7 +1641,7 @@ type ListMemoReactionsRequest struct {unknownFields protoimpl.UnknownFields// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`}@@ -1735,7 +1737,7 @@ type UpsertMemoReactionRequest struct {unknownFields protoimpl.UnknownFields// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`Reaction *Reaction `protobuf:"bytes,2,opt,name=reaction,proto3" json:"reaction,omitempty"`}@@ -1839,7 +1841,7 @@ type DeleteMemoReactionRequest struct {unknownFields protoimpl.UnknownFields// The name of the memo.- // Format: memos/{uid}+ // Format: memos/{id}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`ReactionId int32 `protobuf:"varint,2,opt,name=reaction_id,json=reactionId,proto3" json:"reaction_id,omitempty"`}@@ -1950,365 +1952,364 @@ var file_api_v2_memo_service_proto_rawDesc = []byte{0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f,0x6d, 0x61, 0x73, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67,0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65,- 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x9c, 0x05, 0x0a, 0x04,+ 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8d, 0x05, 0x0a, 0x04,0x4d, 0x65, 0x6d, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,- 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x6f,- 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x72,- 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x36, 0x0a, 0x0a, 0x72, 0x6f, 0x77,- 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e,- 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x6f, 0x77,- 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x09, 0x72, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x74, 0x75,- 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x04, 0x20, 0x01,- 0x28, 0x09, 0x52, 0x07, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x3b, 0x0a, 0x0b, 0x63,- 0x72, 0x65, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b,- 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,- 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0a, 0x63, 0x72,- 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x3b, 0x0a, 0x0b, 0x75, 0x70, 0x64, 0x61,- 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e,- 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,- 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74,- 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x3d, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79,- 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x4e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f,- 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69,- 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79,- 0x54, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18,- 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x38,- 0x0a, 0x0a, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x09, 0x20, 0x01,- 0x28, 0x0e, 0x32, 0x18, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,- 0x32, 0x2e, 0x56, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x52, 0x0a, 0x76, 0x69,- 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x69, 0x6e, 0x6e,- 0x65, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x70, 0x69, 0x6e, 0x6e, 0x65, 0x64,- 0x12, 0x25, 0x0a, 0x09, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x0b, 0x20,- 0x01, 0x28, 0x05, 0x42, 0x03, 0xe0, 0x41, 0x03, 0x48, 0x00, 0x52, 0x08, 0x70, 0x61, 0x72, 0x65,- 0x6e, 0x74, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x39, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75,- 0x72, 0x63, 0x65, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x65, 0x6d,- 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72,- 0x63, 0x65, 0x42, 0x03, 0xe0, 0x41, 0x03, 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,- 0x65, 0x73, 0x12, 0x3d, 0x0a, 0x09, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,- 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70,- 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f,- 0x6e, 0x42, 0x03, 0xe0, 0x41, 0x03, 0x52, 0x09, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e,- 0x73, 0x12, 0x39, 0x0a, 0x09, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0e,- 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69,- 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x03, 0xe0, 0x41,- 0x03, 0x52, 0x09, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x0c, 0x0a, 0x0a,- 0x5f, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x22, 0x67, 0x0a, 0x11, 0x43, 0x72,- 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,- 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,- 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x38, 0x0a, 0x0a, 0x76, 0x69, 0x73,- 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x18, 0x2e,- 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x69, 0x73,- 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x52, 0x0a, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c,- 0x69, 0x74, 0x79, 0x22, 0x3c, 0x0a, 0x12, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d,+ 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,+ 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x36, 0x0a, 0x0a, 0x72, 0x6f,+ 0x77, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x17,+ 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x6f,+ 0x77, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x09, 0x72, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x74,+ 0x75, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x04, 0x20,+ 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x3b, 0x0a, 0x0b,+ 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,+ 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,+ 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0a, 0x63,+ 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x3b, 0x0a, 0x0b, 0x75, 0x70, 0x64,+ 0x61, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,+ 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,+ 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61,+ 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x3d, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61,+ 0x79, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x4e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67,+ 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54,+ 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61,+ 0x79, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74,+ 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12,+ 0x38, 0x0a, 0x0a, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x09, 0x20,+ 0x01, 0x28, 0x0e, 0x32, 0x18, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e,+ 0x76, 0x32, 0x2e, 0x56, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x52, 0x0a, 0x76,+ 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x69, 0x6e,+ 0x6e, 0x65, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x70, 0x69, 0x6e, 0x6e, 0x65,+ 0x64, 0x12, 0x25, 0x0a, 0x09, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x0b,+ 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xe0, 0x41, 0x03, 0x48, 0x00, 0x52, 0x08, 0x70, 0x61, 0x72,+ 0x65, 0x6e, 0x74, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x39, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f,+ 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x65,+ 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75,+ 0x72, 0x63, 0x65, 0x42, 0x03, 0xe0, 0x41, 0x03, 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,+ 0x63, 0x65, 0x73, 0x12, 0x3d, 0x0a, 0x09, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,+ 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61,+ 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69,+ 0x6f, 0x6e, 0x42, 0x03, 0xe0, 0x41, 0x03, 0x52, 0x09, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f,+ 0x6e, 0x73, 0x12, 0x39, 0x0a, 0x09, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,+ 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70,+ 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x03, 0xe0,+ 0x41, 0x03, 0x52, 0x09, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x0c, 0x0a,+ 0x0a, 0x5f, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x22, 0x67, 0x0a, 0x11, 0x43,+ 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,+ 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,+ 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x38, 0x0a, 0x0a, 0x76, 0x69,+ 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x18,+ 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x69,+ 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x52, 0x0a, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69,+ 0x6c, 0x69, 0x74, 0x79, 0x22, 0x3c, 0x0a, 0x12, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65,+ 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x26, 0x0a, 0x04, 0x6d, 0x65,+ 0x6d, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73,+ 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x04, 0x6d, 0x65,+ 0x6d, 0x6f, 0x22, 0x66, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52,+ 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x73,+ 0x69, 0x7a, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53,+ 0x69, 0x7a, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65,+ 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b,+ 0x65, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01,+ 0x28, 0x09, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x22, 0x65, 0x0a, 0x11, 0x4c, 0x69,+ 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,+ 0x28, 0x0a, 0x05, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12,+ 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4d, 0x65,+ 0x6d, 0x6f, 0x52, 0x05, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x12, 0x26, 0x0a, 0x0f, 0x6e, 0x65, 0x78,+ 0x74, 0x5f, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01,+ 0x28, 0x09, 0x52, 0x0d, 0x6e, 0x65, 0x78, 0x74, 0x50, 0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b, 0x65,+ 0x6e, 0x22, 0x2c, 0x0a, 0x12, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x65, 0x6d, 0x6f, 0x73,+ 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65,+ 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x22,+ 0x3f, 0x0a, 0x13, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52, 0x65,+ 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x18,+ 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70,+ 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x05, 0x6d, 0x65, 0x6d, 0x6f, 0x73,+ 0x22, 0x24, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65,+ 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,+ 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x39, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x4d, 0x65, 0x6d,0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x26, 0x0a, 0x04, 0x6d, 0x65, 0x6d,0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e,0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x04, 0x6d, 0x65, 0x6d,- 0x6f, 0x22, 0x66, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52, 0x65,- 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x69,- 0x7a, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69,- 0x7a, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e,- 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b, 0x65,- 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28,- 0x09, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x22, 0x65, 0x0a, 0x11, 0x4c, 0x69, 0x73,- 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28,- 0x0a, 0x05, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e,- 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4d, 0x65, 0x6d,- 0x6f, 0x52, 0x05, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x12, 0x26, 0x0a, 0x0f, 0x6e, 0x65, 0x78, 0x74,- 0x5f, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,- 0x09, 0x52, 0x0d, 0x6e, 0x65, 0x78, 0x74, 0x50, 0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e,- 0x22, 0x2c, 0x0a, 0x12, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52,- 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,- 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x22, 0x3f,- 0x0a, 0x13, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52, 0x65, 0x73,- 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x18, 0x01,- 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69,- 0x2e, 0x76, 0x32, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x05, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x22,- 0x24, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,- 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,- 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x39, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f,- 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x26, 0x0a, 0x04, 0x6d, 0x65, 0x6d, 0x6f,- 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61,- 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x04, 0x6d, 0x65, 0x6d, 0x6f,- 0x22, 0x78, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65,- 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x18, 0x01, 0x20,- 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e,- 0x76, 0x32, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x12, 0x3b, 0x0a,- 0x0b, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x6d, 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x01,- 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,- 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4d, 0x61, 0x73, 0x6b, 0x52, 0x0a,- 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x61, 0x73, 0x6b, 0x22, 0x3c, 0x0a, 0x12, 0x55, 0x70,- 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,- 0x12, 0x26, 0x0a, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12,- 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4d, 0x65,- 0x6d, 0x6f, 0x52, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x22, 0x27, 0x0a, 0x11, 0x44, 0x65, 0x6c, 0x65,- 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a,- 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,- 0x65, 0x22, 0x14, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52,- 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2c, 0x0a, 0x12, 0x45, 0x78, 0x70, 0x6f, 0x72,- 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a,- 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66,- 0x69, 0x6c, 0x74, 0x65, 0x72, 0x22, 0x2f, 0x0a, 0x13, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x4d,- 0x65, 0x6d, 0x6f, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07,- 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x63,- 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x22, 0x63, 0x0a, 0x17, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d,- 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,- 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,- 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x34, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,- 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73,+ 0x6f, 0x22, 0x78, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52,+ 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x18, 0x01,+ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69,+ 0x2e, 0x76, 0x32, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x12, 0x3b,+ 0x0a, 0x0b, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x6d, 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20,+ 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,+ 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4d, 0x61, 0x73, 0x6b, 0x52,+ 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x61, 0x73, 0x6b, 0x22, 0x3c, 0x0a, 0x12, 0x55,+ 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,+ 0x65, 0x12, 0x26, 0x0a, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,+ 0x12, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4d,+ 0x65, 0x6d, 0x6f, 0x52, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x22, 0x27, 0x0a, 0x11, 0x44, 0x65, 0x6c,+ 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12,+ 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,+ 0x6d, 0x65, 0x22, 0x14, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f,+ 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2c, 0x0a, 0x12, 0x45, 0x78, 0x70, 0x6f,+ 0x72, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16,+ 0x0a, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,+ 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x22, 0x2f, 0x0a, 0x13, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74,+ 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a,+ 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07,+ 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x22, 0x63, 0x0a, 0x17, 0x53, 0x65, 0x74, 0x4d, 0x65,+ 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,+ 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,+ 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x34, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,+ 0x63, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x65, 0x6d, 0x6f,+ 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,+ 0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x22, 0x1a, 0x0a, 0x18,+ 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,+ 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2e, 0x0a, 0x18, 0x4c, 0x69, 0x73, 0x74,+ 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71,+ 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,+ 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x51, 0x0a, 0x19, 0x4c, 0x69, 0x73, 0x74,+ 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73,+ 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x34, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,+ 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73,0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,- 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x22, 0x1a, 0x0a, 0x18, 0x53,- 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52,- 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2e, 0x0a, 0x18, 0x4c, 0x69, 0x73, 0x74, 0x4d,- 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75,+ 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x22, 0x67, 0x0a, 0x17, 0x53,+ 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52,+ 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x38, 0x0a, 0x09, 0x72, 0x65,+ 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e,+ 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4d, 0x65, 0x6d,+ 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x72, 0x65, 0x6c, 0x61, 0x74,+ 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x1a, 0x0a, 0x18, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52,+ 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,+ 0x22, 0x2e, 0x0a, 0x18, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61,+ 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04,+ 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,+ 0x22, 0x55, 0x0a, 0x19, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61,+ 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x38, 0x0a,+ 0x09, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,+ 0x32, 0x1a, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,+ 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x72, 0x65,+ 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x69, 0x0a, 0x18, 0x43, 0x72, 0x65, 0x61, 0x74,+ 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75,0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,- 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x51, 0x0a, 0x19, 0x4c, 0x69, 0x73, 0x74, 0x4d,- 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70,- 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x34, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,- 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e,- 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52,- 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x22, 0x67, 0x0a, 0x17, 0x53, 0x65,- 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65,- 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,- 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x38, 0x0a, 0x09, 0x72, 0x65, 0x6c,- 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d,- 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4d, 0x65, 0x6d, 0x6f,- 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69,- 0x6f, 0x6e, 0x73, 0x22, 0x1a, 0x0a, 0x18, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65,- 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,- 0x2e, 0x0a, 0x18, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74,- 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e,- 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22,- 0x55, 0x0a, 0x19, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74,- 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x38, 0x0a, 0x09,- 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,- 0x1a, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4d,- 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x72, 0x65, 0x6c,- 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x69, 0x0a, 0x18, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,- 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65,+ 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x39, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65,+ 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73,+ 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65,+ 0x6d, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65,+ 0x6e, 0x74, 0x22, 0x43, 0x0a, 0x19, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f,+ 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,+ 0x26, 0x0a, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e,+ 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4d, 0x65, 0x6d,+ 0x6f, 0x52, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x22, 0x2d, 0x0a, 0x17, 0x4c, 0x69, 0x73, 0x74, 0x4d,+ 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,- 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x39, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e,- 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e,- 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d,- 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e,- 0x74, 0x22, 0x43, 0x0a, 0x19, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x43,- 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x26,- 0x0a, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d,- 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4d, 0x65, 0x6d, 0x6f,- 0x52, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x22, 0x2d, 0x0a, 0x17, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65,- 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,- 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,- 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x44, 0x0a, 0x18, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d,- 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,- 0x65, 0x12, 0x28, 0x0a, 0x05, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,- 0x32, 0x12, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,- 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x05, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x22, 0x62, 0x0a, 0x18, 0x47,- 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x53, 0x74, 0x61, 0x74, 0x73,- 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,- 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x74,- 0x69, 0x6d, 0x65, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74,- 0x69, 0x6d, 0x65, 0x7a, 0x6f, 0x6e, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65,- 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x22,- 0x9f, 0x01, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x6d, 0x6f, 0x73,- 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x48, 0x0a,- 0x05, 0x73, 0x74, 0x61, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x6d,- 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x74, 0x55,- 0x73, 0x65, 0x72, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73,- 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,- 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x74, 0x61, 0x74, 0x73,- 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,- 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,- 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,- 0x01, 0x22, 0x2e, 0x0a, 0x18, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61,- 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a,- 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,- 0x65, 0x22, 0x51, 0x0a, 0x19, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61,- 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x34,- 0x0a, 0x09, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,- 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,- 0x2e, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x72, 0x65, 0x61, 0x63, 0x74,- 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x63, 0x0a, 0x19, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, 0x4d, 0x65,- 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,- 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,- 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x32, 0x0a, 0x08, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f,- 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e,- 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52,- 0x08, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x50, 0x0a, 0x1a, 0x55, 0x70, 0x73,- 0x65, 0x72, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52,- 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x32, 0x0a, 0x08, 0x72, 0x65, 0x61, 0x63, 0x74,- 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x65, 0x6d, 0x6f,- 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f,- 0x6e, 0x52, 0x08, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x50, 0x0a, 0x19, 0x44,- 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f,- 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,- 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b,- 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,- 0x05, 0x52, 0x0a, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x1c, 0x0a,- 0x1a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74,- 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2a, 0x50, 0x0a, 0x0a, 0x56,- 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x1a, 0x0a, 0x16, 0x56, 0x49, 0x53,- 0x49, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46,- 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, 0x45,- 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x50, 0x52, 0x4f, 0x54, 0x45, 0x43, 0x54, 0x45, 0x44, 0x10,- 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x10, 0x03, 0x32, 0xba, 0x12,- 0x0a, 0x0b, 0x4d, 0x65, 0x6d, 0x6f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x69, 0x0a,- 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x12, 0x1f, 0x2e, 0x6d, 0x65,- 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74,- 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x6d,+ 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x44, 0x0a, 0x18, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65,+ 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,+ 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,+ 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,+ 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x05, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x22, 0x62, 0x0a, 0x18,+ 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x53, 0x74, 0x61, 0x74,+ 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08,+ 0x74, 0x69, 0x6d, 0x65, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,+ 0x74, 0x69, 0x6d, 0x65, 0x7a, 0x6f, 0x6e, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x6c, 0x74,+ 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,+ 0x22, 0x9f, 0x01, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x6d, 0x6f,+ 0x73, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x48,+ 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e,+ 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x74,+ 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65,+ 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72,+ 0x79, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x74, 0x61, 0x74,+ 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,+ 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,+ 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,+ 0x38, 0x01, 0x22, 0x2e, 0x0a, 0x18, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65,+ 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12,+ 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,+ 0x6d, 0x65, 0x22, 0x51, 0x0a, 0x19, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65,+ 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,+ 0x34, 0x0a, 0x09, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03,+ 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,+ 0x32, 0x2e, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x72, 0x65, 0x61, 0x63,+ 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x63, 0x0a, 0x19, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, 0x4d,+ 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,+ 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,+ 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x32, 0x0a, 0x08, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69,+ 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73,+ 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,+ 0x52, 0x08, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x50, 0x0a, 0x1a, 0x55, 0x70,+ 0x73, 0x65, 0x72, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,+ 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x32, 0x0a, 0x08, 0x72, 0x65, 0x61, 0x63,+ 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x65, 0x6d,+ 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69,+ 0x6f, 0x6e, 0x52, 0x08, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x50, 0x0a, 0x19,+ 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69,+ 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,+ 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a,+ 0x0b, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,+ 0x28, 0x05, 0x52, 0x0a, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x1c,+ 0x0a, 0x1a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63,+ 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2a, 0x50, 0x0a, 0x0a,+ 0x56, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x1a, 0x0a, 0x16, 0x56, 0x49,+ 0x53, 0x49, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49,+ 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54,+ 0x45, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x50, 0x52, 0x4f, 0x54, 0x45, 0x43, 0x54, 0x45, 0x44,+ 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x10, 0x03, 0x32, 0xba,+ 0x12, 0x0a, 0x0b, 0x4d, 0x65, 0x6d, 0x6f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x69,+ 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x12, 0x1f, 0x2e, 0x6d,0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x72, 0x65, 0x61,- 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x18,- 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x12, 0x3a, 0x01, 0x2a, 0x22, 0x0d, 0x2f, 0x61, 0x70, 0x69, 0x2f,- 0x76, 0x32, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x12, 0x63, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74,- 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x12, 0x1e, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70,- 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52, 0x65,- 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70,- 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52, 0x65,- 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x15, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0f, 0x12, 0x0d,- 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x12, 0x70, 0x0a,- 0x0b, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x12, 0x20, 0x2e, 0x6d,- 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x65, 0x61, 0x72,- 0x63, 0x68, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21,- 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x65,- 0x61, 0x72, 0x63, 0x68, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,- 0x65, 0x22, 0x1c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x12, 0x14, 0x2f, 0x61, 0x70, 0x69, 0x2f,- 0x76, 0x32, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x3a, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x12,- 0x6d, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x12, 0x1c, 0x2e, 0x6d, 0x65, 0x6d,- 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x65, 0x6d,- 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73,- 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52,- 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x25, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65,- 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x18, 0x12, 0x16, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f,- 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x12, 0x8d,- 0x01, 0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x12, 0x1f, 0x2e,- 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x55, 0x70, 0x64,- 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20,- 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x55, 0x70,- 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,- 0x22, 0x3c, 0xda, 0x41, 0x10, 0x6d, 0x65, 0x6d, 0x6f, 0x2c, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65,- 0x5f, 0x6d, 0x61, 0x73, 0x6b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x3a, 0x04, 0x6d, 0x65, 0x6d,- 0x6f, 0x32, 0x1b, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x7b, 0x6d, 0x65, 0x6d, 0x6f,- 0x2e, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x12, 0x76,- 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x12, 0x1f, 0x2e, 0x6d,- 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, 0x6c, 0x65,0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e,+ 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x72, 0x65,+ 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,+ 0x18, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x12, 0x3a, 0x01, 0x2a, 0x22, 0x0d, 0x2f, 0x61, 0x70, 0x69,+ 0x2f, 0x76, 0x32, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x12, 0x63, 0x0a, 0x09, 0x4c, 0x69, 0x73,+ 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x12, 0x1e, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61,+ 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52,+ 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61,+ 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52,+ 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x15, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0f, 0x12,+ 0x0d, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x12, 0x70,+ 0x0a, 0x0b, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x12, 0x20, 0x2e,+ 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x65, 0x61,+ 0x72, 0x63, 0x68, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,+ 0x21, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x53,+ 0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,+ 0x73, 0x65, 0x22, 0x1c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x12, 0x14, 0x2f, 0x61, 0x70, 0x69,+ 0x2f, 0x76, 0x32, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x3a, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68,+ 0x12, 0x6d, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x12, 0x1c, 0x2e, 0x6d, 0x65,+ 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x65,+ 0x6d, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x6d, 0x65, 0x6d, 0x6f,+ 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f,+ 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x25, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d,+ 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x18, 0x12, 0x16, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32,+ 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x12,+ 0x8d, 0x01, 0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x12, 0x1f,+ 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x55, 0x70,+ 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,+ 0x20, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x55,+ 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,+ 0x65, 0x22, 0x3c, 0xda, 0x41, 0x10, 0x6d, 0x65, 0x6d, 0x6f, 0x2c, 0x75, 0x70, 0x64, 0x61, 0x74,+ 0x65, 0x5f, 0x6d, 0x61, 0x73, 0x6b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x3a, 0x04, 0x6d, 0x65,+ 0x6d, 0x6f, 0x32, 0x1b, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x7b, 0x6d, 0x65, 0x6d,+ 0x6f, 0x2e, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x12,+ 0x76, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x12, 0x1f, 0x2e,0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, 0x6c,- 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,- 0x25, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x18, 0x2a, 0x16,- 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65,- 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x12, 0x70, 0x0a, 0x0b, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74,- 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x12, 0x20, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70,- 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x73,- 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e,- 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x6d,- 0x6f, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1c, 0x82, 0xd3, 0xe4, 0x93,- 0x02, 0x16, 0x22, 0x14, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x6d, 0x65, 0x6d, 0x6f,- 0x73, 0x3a, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x95, 0x01, 0x0a, 0x10, 0x53, 0x65, 0x74,- 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x25, 0x2e,- 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x65, 0x74,- 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71,- 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69,- 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75,- 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x32, 0xda, 0x41,- 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x25, 0x3a, 0x01, 0x2a, 0x22, 0x20,- 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65,- 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,- 0x12, 0x95, 0x01, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73,- 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x26, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61,- 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65,- 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27,- 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69,- 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52,- 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65,- 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x12, 0x20, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f,- 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x72,- 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x95, 0x01, 0x0a, 0x10, 0x53, 0x65, 0x74,- 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x25, 0x2e,- 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x65, 0x74,- 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71,- 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69,- 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74,- 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x32, 0xda, 0x41,- 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x25, 0x3a, 0x01, 0x2a, 0x22, 0x20,- 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65,- 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,- 0x12, 0x95, 0x01, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c,- 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x26, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61,- 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65,- 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27,- 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69,- 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52,- 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65,- 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x12, 0x20, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f,- 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x72,- 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x94, 0x01, 0x0a, 0x11, 0x43, 0x72, 0x65,- 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x26,- 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x72,- 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52,- 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61,- 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f,- 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,- 0x2e, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x22, 0x1f,- 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65,- 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12,- 0x91, 0x01, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d,- 0x65, 0x6e, 0x74, 0x73, 0x12, 0x25, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69,- 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d,- 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x6d, 0x65,- 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d,- 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,- 0x6e, 0x73, 0x65, 0x22, 0x2e, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93,- 0x02, 0x21, 0x12, 0x1f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x7b, 0x6e, 0x61, 0x6d,- 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65,- 0x6e, 0x74, 0x73, 0x12, 0x8c, 0x01, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x4d,- 0x65, 0x6d, 0x6f, 0x73, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x26, 0x2e, 0x6d, 0x65, 0x6d, 0x6f,- 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72,- 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,+ 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20,+ 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65,+ 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,+ 0x22, 0x25, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x18, 0x2a,+ 0x16, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d,+ 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x12, 0x70, 0x0a, 0x0b, 0x45, 0x78, 0x70, 0x6f, 0x72,+ 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x12, 0x20, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61,+ 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x6d, 0x6f,+ 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73,+ 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65,+ 0x6d, 0x6f, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1c, 0x82, 0xd3, 0xe4,+ 0x93, 0x02, 0x16, 0x22, 0x14, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x6d, 0x65, 0x6d,+ 0x6f, 0x73, 0x3a, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x95, 0x01, 0x0a, 0x10, 0x53, 0x65,+ 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x25,+ 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x65,+ 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65,+ 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70,+ 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f,+ 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x32, 0xda,+ 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x25, 0x3a, 0x01, 0x2a, 0x22,+ 0x20, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d,+ 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,+ 0x73, 0x12, 0x95, 0x01, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65,+ 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x26, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e,+ 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52,+ 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,+ 0x27, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c,+ 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,+ 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d,+ 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x12, 0x20, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32,+ 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f,+ 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x95, 0x01, 0x0a, 0x10, 0x53, 0x65,+ 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x25,+ 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x65,+ 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65,+ 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70,+ 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61,+ 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x32, 0xda,+ 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x25, 0x3a, 0x01, 0x2a, 0x22,+ 0x20, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d,+ 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e,+ 0x73, 0x12, 0x95, 0x01, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65,+ 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x26, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e,+ 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52,+ 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,+ 0x27, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c,+ 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,+ 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d,+ 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x12, 0x20, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32,+ 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f,+ 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x94, 0x01, 0x0a, 0x11, 0x43, 0x72,+ 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12,+ 0x26, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43,+ 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74,+ 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e,+ 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6d,+ 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,+ 0x22, 0x2e, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x22,+ 0x1f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d,+ 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73,+ 0x12, 0x91, 0x01, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d,+ 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x25, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70,+ 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d,+ 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x6d,+ 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74,+ 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70,+ 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2e, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4,+ 0x93, 0x02, 0x21, 0x12, 0x1f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x7b, 0x6e, 0x61,+ 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x63, 0x6f, 0x6d, 0x6d,+ 0x65, 0x6e, 0x74, 0x73, 0x12, 0x8c, 0x01, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72,+ 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x26, 0x2e, 0x6d, 0x65, 0x6d,+ 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65,+ 0x72, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,+ 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,+ 0x32, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x53, 0x74,+ 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0xda, 0x41, 0x08,+ 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13,+ 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x73, 0x74,+ 0x61, 0x74, 0x73, 0x12, 0x95, 0x01, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f,+ 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x26, 0x2e, 0x6d, 0x65, 0x6d, 0x6f,+ 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d,+ 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,0x74, 0x1a, 0x27, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,- 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x53, 0x74, 0x61,- 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0xda, 0x41, 0x08, 0x75,- 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f,- 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x73, 0x74, 0x61,- 0x74, 0x73, 0x12, 0x95, 0x01, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52,- 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x26, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73,- 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f,- 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,- 0x1a, 0x27, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,- 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,- 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0xda, 0x41, 0x04, 0x6e, 0x61,- 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x12, 0x20, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76,- 0x32, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d,- 0x2f, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x98, 0x01, 0x0a, 0x12, 0x55,- 0x70, 0x73, 0x65, 0x72, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f,- 0x6e, 0x12, 0x27, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,- 0x2e, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74,- 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x6d, 0x65, 0x6d,- 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74,- 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,- 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4,- 0x93, 0x02, 0x22, 0x22, 0x20, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x7b, 0x6e, 0x61,- 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x72, 0x65, 0x61, 0x63,- 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0xb2, 0x01, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,- 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x27, 0x2e, 0x6d,- 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, 0x6c, 0x65,- 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,- 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70,- 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52,- 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,- 0x49, 0xda, 0x41, 0x10, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f,- 0x6e, 0x5f, 0x69, 0x64, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x30, 0x2a, 0x2e, 0x2f, 0x61, 0x70, 0x69,- 0x2f, 0x76, 0x32, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f,- 0x2a, 0x7d, 0x2f, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x7b, 0x72, 0x65,- 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x7d, 0x42, 0xa8, 0x01, 0x0a, 0x10, 0x63,- 0x6f, 0x6d, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x42,- 0x10, 0x4d, 0x65, 0x6d, 0x6f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74,- 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,- 0x75, 0x73, 0x65, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x70,- 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x3b,- 0x61, 0x70, 0x69, 0x76, 0x32, 0xa2, 0x02, 0x03, 0x4d, 0x41, 0x58, 0xaa, 0x02, 0x0c, 0x4d, 0x65,- 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x70, 0x69, 0x2e, 0x56, 0x32, 0xca, 0x02, 0x0c, 0x4d, 0x65, 0x6d,- 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x32, 0xe2, 0x02, 0x18, 0x4d, 0x65, 0x6d, 0x6f,- 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x32, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61,- 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x41, 0x70,- 0x69, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,+ 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f,+ 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0xda, 0x41, 0x04, 0x6e,+ 0x61, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x12, 0x20, 0x2f, 0x61, 0x70, 0x69, 0x2f,+ 0x76, 0x32, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a,+ 0x7d, 0x2f, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x98, 0x01, 0x0a, 0x12,+ 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69,+ 0x6f, 0x6e, 0x12, 0x27, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,+ 0x32, 0x2e, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63,+ 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x6d, 0x65,+ 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x55, 0x70, 0x73, 0x65, 0x72,+ 0x74, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,+ 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x82, 0xd3,+ 0xe4, 0x93, 0x02, 0x22, 0x22, 0x20, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x7b, 0x6e,+ 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x2a, 0x7d, 0x2f, 0x72, 0x65, 0x61,+ 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0xb2, 0x01, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74,+ 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x27, 0x2e,+ 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, 0x6c,+ 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52,+ 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61,+ 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x6f,+ 0x52, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,+ 0x22, 0x49, 0xda, 0x41, 0x10, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69,+ 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x30, 0x2a, 0x2e, 0x2f, 0x61, 0x70,+ 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x6d, 0x65, 0x6d, 0x6f, 0x73,+ 0x2f, 0x2a, 0x7d, 0x2f, 0x72, 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x7b, 0x72,+ 0x65, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x7d, 0x42, 0xa8, 0x01, 0x0a, 0x10,+ 0x63, 0x6f, 0x6d, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,+ 0x42, 0x10, 0x4d, 0x65, 0x6d, 0x6f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f,+ 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,+ 0x2f, 0x75, 0x73, 0x65, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f,+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32,+ 0x3b, 0x61, 0x70, 0x69, 0x76, 0x32, 0xa2, 0x02, 0x03, 0x4d, 0x41, 0x58, 0xaa, 0x02, 0x0c, 0x4d,+ 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x70, 0x69, 0x2e, 0x56, 0x32, 0xca, 0x02, 0x0c, 0x4d, 0x65,+ 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x32, 0xe2, 0x02, 0x18, 0x4d, 0x65, 0x6d,+ 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x32, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74,+ 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x41,+ 0x70, 0x69, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,}var (diff --git a/proto/gen/api/v2/reaction_service.pb.go b/proto/gen/api/v2/reaction_service.pb.goindex 658165b66..1e3b56bc0 100644--- a/proto/gen/api/v2/reaction_service.pb.go+++ b/proto/gen/api/v2/reaction_service.pb.go@@ -106,7 +106,7 @@ type Reaction struct {Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`// The name of the creator.- // Format: users/{uid}+ // Format: users/{id}Creator string `protobuf:"bytes,2,opt,name=creator,proto3" json:"creator,omitempty"`ContentId string `protobuf:"bytes,3,opt,name=content_id,json=contentId,proto3" json:"content_id,omitempty"`ReactionType Reaction_Type `protobuf:"varint,4,opt,name=reaction_type,json=reactionType,proto3,enum=memos.api.v2.Reaction_Type" json:"reaction_type,omitempty"`diff --git a/proto/gen/api/v2/tag_service.pb.go b/proto/gen/api/v2/tag_service.pb.goindex 3a0a6e45d..4cf47b293 100644--- a/proto/gen/api/v2/tag_service.pb.go+++ b/proto/gen/api/v2/tag_service.pb.go@@ -28,7 +28,7 @@ type Tag struct {Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`// The creator of tags.- // Format: users/{uid}+ // Format: users/{id}Creator string `protobuf:"bytes,2,opt,name=creator,proto3" json:"creator,omitempty"`}@@ -263,7 +263,7 @@ type ListTagsRequest struct {unknownFields protoimpl.UnknownFields// The creator of tags.- // Format: users/{uid}+ // Format: users/{id}User string `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"`}@@ -359,7 +359,7 @@ type RenameTagRequest struct {unknownFields protoimpl.UnknownFields// The creator of tags.- // Format: users/{uid}+ // Format: users/{id}User string `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"`OldName string `protobuf:"bytes,2,opt,name=old_name,json=oldName,proto3" json:"old_name,omitempty"`NewName string `protobuf:"bytes,3,opt,name=new_name,json=newName,proto3" json:"new_name,omitempty"`@@ -556,7 +556,7 @@ type GetTagSuggestionsRequest struct {unknownFields protoimpl.UnknownFields// The creator of tags.- // Format: users/{uid}+ // Format: users/{id}User string `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"`}diff --git a/proto/gen/api/v2/user_service.pb.go b/proto/gen/api/v2/user_service.pb.goindex 444049a89..1ab48a831 100644--- a/proto/gen/api/v2/user_service.pb.go+++ b/proto/gen/api/v2/user_service.pb.go@@ -81,7 +81,7 @@ type User struct {unknownFields protoimpl.UnknownFields// The name of the user.- // Format: users/{uid}+ // Format: users/{id}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`// The system generated uid of the user.Id int32 `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"`@@ -398,7 +398,7 @@ type GetUserRequest struct {unknownFields protoimpl.UnknownFields// The name of the user.- // Format: users/{uid}+ // Format: users/{id}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`}@@ -690,7 +690,7 @@ type DeleteUserRequest struct {unknownFields protoimpl.UnknownFields// The name of the user.- // Format: users/{uid}+ // Format: users/{id}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`}@@ -777,7 +777,7 @@ type UserSetting struct {unknownFields protoimpl.UnknownFields// The name of the user.- // Format: users/{uid}+ // Format: users/{id}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`// The preferred locale of the user.Locale string `protobuf:"bytes,2,opt,name=locale,proto3" json:"locale,omitempty"`@@ -862,7 +862,7 @@ type GetUserSettingRequest struct {unknownFields protoimpl.UnknownFields// The name of the user.- // Format: users/{uid}+ // Format: users/{id}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`}@@ -1131,7 +1131,7 @@ type ListUserAccessTokensRequest struct {unknownFields protoimpl.UnknownFields// The name of the user.- // Format: users/{uid}+ // Format: users/{id}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`}@@ -1227,7 +1227,7 @@ type CreateUserAccessTokenRequest struct {unknownFields protoimpl.UnknownFields// The name of the user.- // Format: users/{uid}+ // Format: users/{id}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`ExpiresAt *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=expires_at,json=expiresAt,proto3,oneof" json:"expires_at,omitempty"`@@ -1339,7 +1339,7 @@ type DeleteUserAccessTokenRequest struct {unknownFields protoimpl.UnknownFields// The name of the user.- // Format: users/{uid}+ // Format: users/{id}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`// access_token is the access token to delete.AccessToken string `protobuf:"bytes,2,opt,name=access_token,json=accessToken,proto3" json:"access_token,omitempty"`diff --git a/server/integration/telegram.go b/server/integration/telegram.goindex 20f85ac89..c19e7cbb0 100644--- a/server/integration/telegram.go+++ b/server/integration/telegram.go@@ -74,9 +74,9 @@ func (t *TelegramHandler) MessageHandle(ctx context.Context, bot *telegram.Bot,}create := &store.Memo{- ResourceName: shortuuid.New(),- CreatorID: creatorID,- Visibility: store.Private,+ UID: shortuuid.New(),+ CreatorID: creatorID,+ Visibility: store.Private,}if message.Text != nil {create.Content = convertToMarkdown(*message.Text, message.Entities)@@ -121,12 +121,12 @@ func (t *TelegramHandler) MessageHandle(ctx context.Context, bot *telegram.Bot,for _, attachment := range attachments {// Fill the common field of createcreate := store.Resource{- ResourceName: shortuuid.New(),- CreatorID: creatorID,- Filename: filepath.Base(attachment.FileName),- Type: attachment.GetMimeType(),- Size: attachment.FileSize,- MemoID: &memoMessage.ID,+ UID: shortuuid.New(),+ CreatorID: creatorID,+ Filename: filepath.Base(attachment.FileName),+ Type: attachment.GetMimeType(),+ Size: attachment.FileSize,+ MemoID: &memoMessage.ID,}err := apiv1.SaveResourceBlob(ctx, t.store, &create, bytes.NewReader(attachment.Data))diff --git a/server/route/api/v1/auth.go b/server/route/api/v1/auth.goindex 0dcaf2829..e6f50d5de 100644--- a/server/route/api/v1/auth.go+++ b/server/route/api/v1/auth.go@@ -269,7 +269,7 @@ func (s *APIV1Service) SignUp(c echo.Context) error {if err != nil {return echo.NewHTTPError(http.StatusBadRequest, "Failed to find users").SetInternal(err)}- if !util.ResourceNameMatcher.MatchString(strings.ToLower(signup.Username)) {+ if !util.UIDMatcher.MatchString(strings.ToLower(signup.Username)) {return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid username %s", signup.Username)).SetInternal(err)}diff --git a/server/route/api/v1/memo.go b/server/route/api/v1/memo.goindex 90f01f084..08003ea01 100644--- a/server/route/api/v1/memo.go+++ b/server/route/api/v1/memo.go@@ -827,7 +827,7 @@ func (s *APIV1Service) UpdateMemo(c echo.Context) error {func (s *APIV1Service) convertMemoFromStore(ctx context.Context, memo *store.Memo) (*Memo, error) {memoMessage := &Memo{ID: memo.ID,- Name: memo.ResourceName,+ Name: memo.UID,RowStatus: RowStatus(memo.RowStatus.String()),CreatorID: memo.CreatorID,CreatedTs: memo.CreatedTs,@@ -921,11 +921,11 @@ func convertCreateMemoRequestToMemoMessage(memoCreate *CreateMemoRequest) *storecreatedTs = *memoCreate.CreatedTs}return &store.Memo{- ResourceName: shortuuid.New(),- CreatorID: memoCreate.CreatorID,- CreatedTs: createdTs,- Content: memoCreate.Content,- Visibility: store.Visibility(memoCreate.Visibility),+ UID: shortuuid.New(),+ CreatorID: memoCreate.CreatorID,+ CreatedTs: createdTs,+ Content: memoCreate.Content,+ Visibility: store.Visibility(memoCreate.Visibility),}}diff --git a/server/route/api/v1/resource.go b/server/route/api/v1/resource.goindex 6f5116953..edbe943da 100644--- a/server/route/api/v1/resource.go+++ b/server/route/api/v1/resource.go@@ -138,7 +138,7 @@ func (s *APIV1Service) CreateResource(c echo.Context) error {}create := &store.Resource{- ResourceName: shortuuid.New(),+ UID: shortuuid.New(),CreatorID: userID,Filename: request.Filename,ExternalLink: request.ExternalLink,@@ -220,11 +220,11 @@ func (s *APIV1Service) UploadResource(c echo.Context) error {defer sourceFile.Close()create := &store.Resource{- ResourceName: shortuuid.New(),- CreatorID: userID,- Filename: file.Filename,- Type: file.Header.Get("Content-Type"),- Size: file.Size,+ UID: shortuuid.New(),+ CreatorID: userID,+ Filename: file.Filename,+ Type: file.Header.Get("Content-Type"),+ Size: file.Size,}err = SaveResourceBlob(ctx, s.Store, create, sourceFile)if err != nil {@@ -371,7 +371,7 @@ func replacePathTemplate(path, filename string) string {func convertResourceFromStore(resource *store.Resource) *Resource {return &Resource{ID: resource.ID,- Name: resource.ResourceName,+ Name: resource.UID,CreatorID: resource.CreatorID,CreatedTs: resource.CreatedTs,UpdatedTs: resource.UpdatedTs,diff --git a/server/route/api/v1/user.go b/server/route/api/v1/user.goindex c70ffb0f2..f613203cd 100644--- a/server/route/api/v1/user.go+++ b/server/route/api/v1/user.go@@ -157,7 +157,7 @@ func (s *APIV1Service) CreateUser(c echo.Context) error {if err := userCreate.Validate(); err != nil {return echo.NewHTTPError(http.StatusBadRequest, "Invalid user create format").SetInternal(err)}- if !util.ResourceNameMatcher.MatchString(strings.ToLower(userCreate.Username)) {+ if !util.UIDMatcher.MatchString(strings.ToLower(userCreate.Username)) {return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid username %s", userCreate.Username)).SetInternal(err)}// Disallow host user to be created.@@ -377,7 +377,7 @@ func (s *APIV1Service) UpdateUser(c echo.Context) error {}}if request.Username != nil {- if !util.ResourceNameMatcher.MatchString(strings.ToLower(*request.Username)) {+ if !util.UIDMatcher.MatchString(strings.ToLower(*request.Username)) {return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid username %s", *request.Username)).SetInternal(err)}userUpdate.Username = request.Usernamediff --git a/server/route/api/v2/apidocs.swagger.md b/server/route/api/v2/apidocs.swagger.mdindex a486ebe3b..ef6f955b2 100644--- a/server/route/api/v2/apidocs.swagger.md+++ b/server/route/api/v2/apidocs.swagger.md@@ -152,7 +152,7 @@ GetMemo gets a memo.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| name_1 | path | The name of the memo. Format: memos/{uid} | Yes | string |+| name_1 | path | The name of the memo. Format: memos/{id} | Yes | string |##### Responses@@ -252,7 +252,7 @@ GetUserMemosStats gets stats of memos for a user.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| name | query | name is the name of the user to get stats for. Format: users/{uid} | No | string |+| name | query | name is the name of the user to get stats for. Format: users/{id} | No | string || timezone | query | timezone location Format: uses tz identifier https://en.wikipedia.org/wiki/List_of_tz_database_time_zones | No | string || filter | query | Same as ListMemosRequest.filter | No | string |@@ -314,8 +314,8 @@ UpdateMemo updates a memo.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| memo.name | path | The name of the memo. Format: memos/{uid} | Yes | string |-| memo | body | | Yes | { **"resourceId"**: string, **"rowStatus"**: [apiv2RowStatus](#apiv2rowstatus), **"creator"**: string, **"createTime"**: dateTime, **"updateTime"**: dateTime, **"displayTime"**: dateTime, **"content"**: string, **"visibility"**: [v2Visibility](#v2visibility), **"pinned"**: boolean, **"parentId"**: integer, **"resources"**: [ [v2Resource](#v2resource) ], **"relations"**: [ [v2MemoRelation](#v2memorelation) ], **"reactions"**: [ [apiv2Reaction](#apiv2reaction) ] } |+| memo.name | path | The name of the memo. Format: memos/{id} id is the system generated id. | Yes | string |+| memo | body | | Yes | { **"uid"**: string, **"rowStatus"**: [apiv2RowStatus](#apiv2rowstatus), **"creator"**: string, **"createTime"**: dateTime, **"updateTime"**: dateTime, **"displayTime"**: dateTime, **"content"**: string, **"visibility"**: [v2Visibility](#v2visibility), **"pinned"**: boolean, **"parentId"**: integer, **"resources"**: [ [v2Resource](#v2resource) ], **"relations"**: [ [v2MemoRelation](#v2memorelation) ], **"reactions"**: [ [apiv2Reaction](#apiv2reaction) ] } |##### Responses@@ -335,7 +335,7 @@ GetMemo gets a memo.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| name_1 | path | The name of the memo. Format: memos/{uid} | Yes | string |+| name_1 | path | The name of the memo. Format: memos/{id} | Yes | string |##### Responses@@ -373,7 +373,7 @@ DeleteMemo deletes a memo.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| name_2 | path | The name of the memo. Format: memos/{uid} | Yes | string |+| name_2 | path | The name of the memo. Format: memos/{id} | Yes | string |##### Responses@@ -393,7 +393,7 @@ ListMemoComments lists comments for a memo.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| name | path | The name of the memo. Format: memos/{uid} | Yes | string |+| name | path | The name of the memo. Format: memos/{id} | Yes | string |##### Responses@@ -411,7 +411,7 @@ CreateMemoComment creates a comment for a memo.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| name | path | The name of the memo. Format: memos/{uid} | Yes | string |+| name | path | The name of the memo. Format: memos/{id} | Yes | string || comment.content | query | | No | string || comment.visibility | query | | No | string |@@ -433,7 +433,7 @@ ListMemoReactions lists reactions for a memo.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| name | path | The name of the memo. Format: memos/{uid} | Yes | string |+| name | path | The name of the memo. Format: memos/{id} | Yes | string |##### Responses@@ -451,9 +451,9 @@ UpsertMemoReaction upserts a reaction for a memo.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| name | path | The name of the memo. Format: memos/{uid} | Yes | string |+| name | path | The name of the memo. Format: memos/{id} | Yes | string || reaction.id | query | | No | integer |-| reaction.creator | query | The name of the creator. Format: users/{uid} | No | string |+| reaction.creator | query | The name of the creator. Format: users/{id} | No | string || reaction.contentId | query | | No | string || reaction.reactionType | query | | No | string |@@ -475,7 +475,7 @@ DeleteMemoReaction deletes a reaction for a memo.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| name | path | The name of the memo. Format: memos/{uid} | Yes | string |+| name | path | The name of the memo. Format: memos/{id} | Yes | string || reactionId | path | | Yes | integer |##### Responses@@ -496,7 +496,7 @@ ListMemoRelations lists relations for a memo.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| name | path | The name of the memo. Format: memos/{uid} | Yes | string |+| name | path | The name of the memo. Format: memos/{id} | Yes | string |##### Responses@@ -514,7 +514,7 @@ SetMemoRelations sets relations for a memo.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| name | path | The name of the memo. Format: memos/{uid} | Yes | string |+| name | path | The name of the memo. Format: memos/{id} | Yes | string || body | body | | Yes | [MemoServiceSetMemoRelationsBody](#memoservicesetmemorelationsbody) |##### Responses@@ -535,7 +535,7 @@ ListMemoResources lists resources for a memo.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| name | path | The name of the memo. Format: memos/{uid} | Yes | string |+| name | path | The name of the memo. Format: memos/{id} | Yes | string |##### Responses@@ -553,7 +553,7 @@ SetMemoResources sets resources for a memo.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| name | path | The name of the memo. Format: memos/{uid} | Yes | string |+| name | path | The name of the memo. Format: memos/{id} | Yes | string || body | body | | Yes | [MemoServiceSetMemoResourcesBody](#memoservicesetmemoresourcesbody) |##### Responses@@ -694,7 +694,7 @@ ListTags lists tags.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| user | query | The creator of tags. Format: users/{uid} | No | string |+| user | query | The creator of tags. Format: users/{id} | No | string |##### Responses@@ -713,7 +713,7 @@ DeleteTag deletes a tag.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ || tag.name | query | | No | string |-| tag.creator | query | The creator of tags. Format: users/{uid} | No | string |+| tag.creator | query | The creator of tags. Format: users/{id} | No | string |##### Responses@@ -751,7 +751,7 @@ GetTagSuggestions gets tag suggestions from the user's memos.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| user | query | The creator of tags. Format: users/{uid} | No | string |+| user | query | The creator of tags. Format: users/{id} | No | string |##### Responses@@ -786,7 +786,7 @@ All related memos will be updated.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| user | query | The creator of tags. Format: users/{uid} | No | string |+| user | query | The creator of tags. Format: users/{id} | No | string || oldName | query | | No | string || newName | query | | No | string |@@ -863,7 +863,7 @@ GetUser gets a user by name.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| name | path | The name of the user. Format: users/{uid} | Yes | string |+| name | path | The name of the user. Format: users/{id} | Yes | string |##### Responses@@ -881,7 +881,7 @@ DeleteUser deletes a user.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| name | path | The name of the user. Format: users/{uid} | Yes | string |+| name | path | The name of the user. Format: users/{id} | Yes | string |##### Responses@@ -901,7 +901,7 @@ ListUserAccessTokens returns a list of access tokens for a user.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| name | path | The name of the user. Format: users/{uid} | Yes | string |+| name | path | The name of the user. Format: users/{id} | Yes | string |##### Responses@@ -919,7 +919,7 @@ CreateUserAccessToken creates a new access token for a user.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| name | path | The name of the user. Format: users/{uid} | Yes | string |+| name | path | The name of the user. Format: users/{id} | Yes | string || body | body | | Yes | [UserServiceCreateUserAccessTokenBody](#userservicecreateuseraccesstokenbody) |##### Responses@@ -940,7 +940,7 @@ DeleteUserAccessToken deletes an access token for a user.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| name | path | The name of the user. Format: users/{uid} | Yes | string |+| name | path | The name of the user. Format: users/{id} | Yes | string || accessToken | path | access_token is the access token to delete. | Yes | string |##### Responses@@ -961,7 +961,7 @@ GetUserSetting gets the setting of a user.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| name | path | The name of the user. Format: users/{uid} | Yes | string |+| name | path | The name of the user. Format: users/{id} | Yes | string |##### Responses@@ -981,7 +981,7 @@ UpdateUserSetting updates the setting of a user.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| setting.name | path | The name of the user. Format: users/{uid} | Yes | string |+| setting.name | path | The name of the user. Format: users/{id} | Yes | string || setting | body | | Yes | { **"locale"**: string, **"appearance"**: string, **"memoVisibility"**: string, **"telegramUserId"**: string } |##### Responses@@ -1002,7 +1002,7 @@ UpdateUser updates a user.| Name | Located in | Description | Required | Schema || ---- | ---------- | ----------- | -------- | ------ |-| user.name | path | The name of the user. Format: users/{uid} | Yes | string |+| user.name | path | The name of the user. Format: users/{id} | Yes | string || user | body | | Yes | { **"id"**: integer, **"role"**: [UserRole](#userrole), **"username"**: string, **"email"**: string, **"nickname"**: string, **"avatarUrl"**: string, **"description"**: string, **"password"**: string, **"rowStatus"**: [apiv2RowStatus](#apiv2rowstatus), **"createTime"**: dateTime, **"updateTime"**: dateTime } |##### Responses@@ -1620,8 +1620,8 @@ GetActivity returns the activity with the given id.| Name | Type | Description | Required || ---- | ---- | ----------- | -------- |-| name | string | | No |-| resourceId | string | | No |+| name | string | The name of the memo. Format: memos/{id} id is the system generated id. | No |+| uid | string | The user defined id of the memo. | No || rowStatus | [apiv2RowStatus](#apiv2rowstatus) | | No || creator | string | | No || createTime | dateTime | | No |diff --git a/server/route/api/v2/apidocs.swagger.yaml b/server/route/api/v2/apidocs.swagger.yamlindex afab175bc..46c4ca035 100644--- a/server/route/api/v2/apidocs.swagger.yaml+++ b/server/route/api/v2/apidocs.swagger.yaml@@ -243,7 +243,7 @@ paths:- name: namedescription: |-name is the name of the user to get stats for.- Format: users/{uid}+ Format: users/{id}in: queryrequired: falsetype: string@@ -477,7 +477,7 @@ paths:- name: userdescription: |-The creator of tags.- Format: users/{uid}+ Format: users/{id}in: queryrequired: falsetype: string@@ -503,7 +503,7 @@ paths:- name: tag.creatordescription: |-The creator of tags.- Format: users/{uid}+ Format: users/{id}in: queryrequired: falsetype: string@@ -545,7 +545,7 @@ paths:- name: userdescription: |-The creator of tags.- Format: users/{uid}+ Format: users/{id}in: queryrequired: falsetype: string@@ -585,7 +585,7 @@ paths:- name: userdescription: |-The creator of tags.- Format: users/{uid}+ Format: users/{id}in: queryrequired: falsetype: string@@ -915,7 +915,8 @@ paths:- name: memo.namedescription: |-The name of the memo.- Format: memos/{uid}+ Format: memos/{id}+ id is the system generated id.in: pathrequired: truetype: string@@ -926,15 +927,16 @@ paths:schema:type: objectproperties:- resourceId:+ uid:type: string+ description: The user defined id of the memo.rowStatus:$ref: '#/definitions/apiv2RowStatus'creator:type: stringtitle: |-The name of the creator.- Format: users/{uid}+ Format: users/{id}createTime:type: stringformat: date-time@@ -991,7 +993,7 @@ paths:- name: name_1description: |-The name of the memo.- Format: memos/{uid}+ Format: memos/{id}in: pathrequired: truetype: string@@ -1038,7 +1040,7 @@ paths:- name: name_2description: |-The name of the memo.- Format: memos/{uid}+ Format: memos/{id}in: pathrequired: truetype: string@@ -1062,7 +1064,7 @@ paths:- name: namedescription: |-The name of the user.- Format: users/{uid}+ Format: users/{id}in: pathrequired: truetype: string@@ -1085,7 +1087,7 @@ paths:- name: namedescription: |-The name of the user.- Format: users/{uid}+ Format: users/{id}in: pathrequired: truetype: string@@ -1109,7 +1111,7 @@ paths:- name: namedescription: |-The name of the user.- Format: users/{uid}+ Format: users/{id}in: pathrequired: truetype: string@@ -1132,7 +1134,7 @@ paths:- name: namedescription: |-The name of the user.- Format: users/{uid}+ Format: users/{id}in: pathrequired: truetype: string@@ -1161,7 +1163,7 @@ paths:- name: namedescription: |-The name of the user.- Format: users/{uid}+ Format: users/{id}in: pathrequired: truetype: string@@ -1190,7 +1192,7 @@ paths:- name: namedescription: |-The name of the memo.- Format: memos/{uid}+ Format: memos/{id}in: pathrequired: truetype: string@@ -1213,7 +1215,7 @@ paths:- name: namedescription: |-The name of the memo.- Format: memos/{uid}+ Format: memos/{id}in: pathrequired: truetype: string@@ -1251,7 +1253,7 @@ paths:- name: namedescription: |-The name of the memo.- Format: memos/{uid}+ Format: memos/{id}in: pathrequired: truetype: string@@ -1274,7 +1276,7 @@ paths:- name: namedescription: |-The name of the memo.- Format: memos/{uid}+ Format: memos/{id}in: pathrequired: truetype: string@@ -1287,7 +1289,7 @@ paths:- name: reaction.creatordescription: |-The name of the creator.- Format: users/{uid}+ Format: users/{id}in: queryrequired: falsetype: string@@ -1333,7 +1335,7 @@ paths:- name: namedescription: |-The name of the memo.- Format: memos/{uid}+ Format: memos/{id}in: pathrequired: truetype: string@@ -1362,7 +1364,7 @@ paths:- name: namedescription: |-The name of the memo.- Format: memos/{uid}+ Format: memos/{id}in: pathrequired: truetype: string@@ -1385,7 +1387,7 @@ paths:- name: namedescription: |-The name of the memo.- Format: memos/{uid}+ Format: memos/{id}in: pathrequired: truetype: string@@ -1414,7 +1416,7 @@ paths:- name: namedescription: |-The name of the memo.- Format: memos/{uid}+ Format: memos/{id}in: pathrequired: truetype: string@@ -1437,7 +1439,7 @@ paths:- name: namedescription: |-The name of the memo.- Format: memos/{uid}+ Format: memos/{id}in: pathrequired: truetype: string@@ -1466,7 +1468,7 @@ paths:- name: namedescription: |-The name of the user.- Format: users/{uid}+ Format: users/{id}in: pathrequired: truetype: string@@ -1490,7 +1492,7 @@ paths:- name: setting.namedescription: |-The name of the user.- Format: users/{uid}+ Format: users/{id}in: pathrequired: truetype: string@@ -1532,7 +1534,7 @@ paths:- name: user.namedescription: |-The name of the user.- Format: users/{uid}+ Format: users/{id}in: pathrequired: truetype: string@@ -1656,7 +1658,7 @@ definitions:type: stringtitle: |-The name of the creator.- Format: users/{uid}+ Format: users/{id}contentId:type: stringreactionType:@@ -1692,7 +1694,7 @@ definitions:type: stringtitle: |-The name of the user.- Format: users/{uid}+ Format: users/{id}locale:type: stringdescription: The preferred locale of the user.@@ -2078,18 +2080,20 @@ definitions:properties:name:type: string- title: |-+ description: |-The name of the memo.- Format: memos/{uid}- resourceId:+ Format: memos/{id}+ id is the system generated id.+ uid:type: string+ description: The user defined id of the memo.rowStatus:$ref: '#/definitions/apiv2RowStatus'creator:type: stringtitle: |-The name of the creator.- Format: users/{uid}+ Format: users/{id}createTime:type: stringformat: date-time@@ -2230,7 +2234,7 @@ definitions:type: stringtitle: |-The creator of tags.- Format: users/{uid}+ Format: users/{id}v2UpdateInboxResponse:type: objectproperties:@@ -2283,7 +2287,7 @@ definitions:type: stringtitle: |-The name of the user.- Format: users/{uid}+ Format: users/{id}id:type: integerformat: int32diff --git a/server/route/api/v2/auth_service.go b/server/route/api/v2/auth_service.goindex dd1959e57..c97cc626c 100644--- a/server/route/api/v2/auth_service.go+++ b/server/route/api/v2/auth_service.go@@ -189,7 +189,7 @@ func (s *APIV2Service) SignUp(ctx context.Context, request *apiv2pb.SignUpRequesNickname: request.Username,PasswordHash: string(passwordHash),}- if !util.ResourceNameMatcher.MatchString(strings.ToLower(create.Username)) {+ if !util.UIDMatcher.MatchString(strings.ToLower(create.Username)) {return nil, status.Errorf(codes.InvalidArgument, "invalid username: %s", create.Username)}diff --git a/server/route/api/v2/memo_service.go b/server/route/api/v2/memo_service.goindex 18ab5ccb9..225b5c9ca 100644--- a/server/route/api/v2/memo_service.go+++ b/server/route/api/v2/memo_service.go@@ -44,10 +44,10 @@ func (s *APIV2Service) CreateMemo(ctx context.Context, request *apiv2pb.CreateMe}create := &store.Memo{- ResourceName: shortuuid.New(),- CreatorID: user.ID,- Content: request.Content,- Visibility: convertVisibilityToStore(request.Visibility),+ UID: shortuuid.New(),+ CreatorID: user.ID,+ Content: request.Content,+ Visibility: convertVisibilityToStore(request.Visibility),}// Find disable public memos system setting.disablePublicMemosSystem, err := s.getDisablePublicMemosSystemSettingValue(ctx)@@ -231,9 +231,9 @@ func (s *APIV2Service) UpdateMemo(ctx context.Context, request *apiv2pb.UpdateMefor _, path := range request.UpdateMask.Paths {if path == "content" {update.Content = &request.Memo.Content- } else if path == "resource_name" {- update.ResourceName = &request.Memo.Name- if !util.ResourceNameMatcher.MatchString(*update.ResourceName) {+ } else if path == "uid" {+ update.UID = &request.Memo.Name+ if !util.UIDMatcher.MatchString(*update.UID) {return nil, status.Errorf(codes.InvalidArgument, "invalid resource name")}} else if path == "visibility" {@@ -555,7 +555,7 @@ func (s *APIV2Service) convertMemoFromStore(ctx context.Context, memo *store.Memreturn &apiv2pb.Memo{Name: name,- ResourceId: memo.ResourceName,+ Uid: memo.UID,RowStatus: convertRowStatusFromStore(memo.RowStatus),Creator: fmt.Sprintf("%s%d", UserNamePrefix, creator.ID),CreateTime: timestamppb.New(time.Unix(memo.CreatedTs, 0)),@@ -690,8 +690,8 @@ func (s *APIV2Service) buildMemoFindWithFilter(ctx context.Context, find *store.}find.CreatorID = &user.ID}- if filter.ResourceName != nil {- find.ResourceName = filter.ResourceName+ if filter.UID != nil {+ find.UID = filter.UID}if filter.RowStatus != nil {find.RowStatus = filter.RowStatus@@ -728,7 +728,7 @@ var SearchMemosFilterCELAttributes = []cel.EnvOption{cel.Variable("display_time_before", cel.IntType),cel.Variable("display_time_after", cel.IntType),cel.Variable("creator", cel.StringType),- cel.Variable("resource_name", cel.StringType),+ cel.Variable("uid", cel.StringType),cel.Variable("row_status", cel.StringType),}@@ -739,7 +739,7 @@ type SearchMemosFilter struct {DisplayTimeBefore *int64DisplayTimeAfter *int64Creator *string- ResourceName *string+ UID *stringRowStatus *store.RowStatus}@@ -792,9 +792,9 @@ func findSearchMemosField(callExpr *expr.Expr_Call, filter *SearchMemosFilter) {} else if idExpr.Name == "creator" {creator := callExpr.Args[1].GetConstExpr().GetStringValue()filter.Creator = &creator- } else if idExpr.Name == "resource_name" {- resourceName := callExpr.Args[1].GetConstExpr().GetStringValue()- filter.ResourceName = &resourceName+ } else if idExpr.Name == "uid" {+ uid := callExpr.Args[1].GetConstExpr().GetStringValue()+ filter.UID = &uid} else if idExpr.Name == "row_status" {rowStatus := store.RowStatus(callExpr.Args[1].GetConstExpr().GetStringValue())filter.RowStatus = &rowStatusdiff --git a/server/route/api/v2/resource_service.go b/server/route/api/v2/resource_service.goindex 88c25690f..12b01ef50 100644--- a/server/route/api/v2/resource_service.go+++ b/server/route/api/v2/resource_service.go@@ -31,7 +31,7 @@ func (s *APIV2Service) CreateResource(ctx context.Context, request *apiv2pb.Crea}create := &store.Resource{- ResourceName: shortuuid.New(),+ UID: shortuuid.New(),CreatorID: user.ID,Filename: request.Filename,ExternalLink: request.ExternalLink,@@ -87,7 +87,7 @@ func (s *APIV2Service) GetResource(ctx context.Context, request *apiv2pb.GetResofunc (s *APIV2Service) GetResourceByName(ctx context.Context, request *apiv2pb.GetResourceByNameRequest) (*apiv2pb.GetResourceByNameResponse, error) {resource, err := s.Store.GetResource(ctx, &store.FindResource{- ResourceName: &request.Name,+ UID: &request.Name,})if err != nil {return nil, status.Errorf(codes.Internal, "failed to get resource: %v", err)@@ -165,7 +165,7 @@ func (s *APIV2Service) convertResourceFromStore(ctx context.Context, resource *sreturn &apiv2pb.Resource{Id: resource.ID,- Name: resource.ResourceName,+ Name: resource.UID,CreateTime: timestamppb.New(time.Unix(resource.CreatedTs, 0)),Filename: resource.Filename,ExternalLink: resource.ExternalLink,diff --git a/server/route/api/v2/user_service.go b/server/route/api/v2/user_service.goindex 0e5ab7ca5..da5e71e7a 100644--- a/server/route/api/v2/user_service.go+++ b/server/route/api/v2/user_service.go@@ -105,7 +105,7 @@ func (s *APIV2Service) CreateUser(ctx context.Context, request *apiv2pb.CreateUsif currentUser.Role != store.RoleHost {return nil, status.Errorf(codes.PermissionDenied, "permission denied")}- if !util.ResourceNameMatcher.MatchString(strings.ToLower(request.User.Username)) {+ if !util.UIDMatcher.MatchString(strings.ToLower(request.User.Username)) {return nil, status.Errorf(codes.InvalidArgument, "invalid username: %s", request.User.Username)}passwordHash, err := bcrypt.GenerateFromPassword([]byte(request.User.Password), bcrypt.DefaultCost)@@ -161,7 +161,7 @@ func (s *APIV2Service) UpdateUser(ctx context.Context, request *apiv2pb.UpdateUs}for _, field := range request.UpdateMask.Paths {if field == "username" {- if !util.ResourceNameMatcher.MatchString(strings.ToLower(request.User.Username)) {+ if !util.UIDMatcher.MatchString(strings.ToLower(request.User.Username)) {return nil, status.Errorf(codes.InvalidArgument, "invalid username: %s", request.User.Username)}update.Username = &request.User.Usernamediff --git a/server/route/frontend/frontend.go b/server/route/frontend/frontend.goindex 02c56860d..ecc5607d3 100644--- a/server/route/frontend/frontend.go+++ b/server/route/frontend/frontend.go@@ -53,11 +53,11 @@ func (s *FrontendService) Serve(ctx context.Context, e *echo.Echo) {func (s *FrontendService) registerRoutes(e *echo.Echo) {rawIndexHTML := getRawIndexHTML()- e.GET("/m/:name", func(c echo.Context) error {+ e.GET("/m/:uid", func(c echo.Context) error {ctx := c.Request().Context()- resourceName := c.Param("name")+ uid := c.Param("uid")memo, err := s.Store.GetMemo(ctx, &store.FindMemo{- ResourceName: &resourceName,+ UID: &uid,})if err != nil {return c.HTML(http.StatusOK, rawIndexHTML)@@ -108,7 +108,7 @@ Sitemap: %s/sitemap.xml`, instanceURL, instanceURL)return err}for _, memo := range memoList {- urlsets = append(urlsets, fmt.Sprintf(`<url><loc>%s</loc></url>`, fmt.Sprintf("%s/m/%s", instanceURL, memo.ResourceName)))+ urlsets = append(urlsets, fmt.Sprintf(`<url><loc>%s</loc></url>`, fmt.Sprintf("%s/m/%s", instanceURL, memo.UID)))}sitemap := fmt.Sprintf(`<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:news="http://www.google.com/schemas/sitemap-news/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:mobile="http://www.google.com/schemas/sitemap-mobile/1.0" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1" xmlns:video="http://www.google.com/schemas/sitemap-video/1.1">%s</urlset>`, strings.Join(urlsets, "\n"))return c.XMLBlob(http.StatusOK, []byte(sitemap))diff --git a/server/route/resource/resource.go b/server/route/resource/resource.goindex 7e977f904..9c83a4538 100644--- a/server/route/resource/resource.go+++ b/server/route/resource/resource.go@@ -42,22 +42,22 @@ func NewResourceService(profile *profile.Profile, store *store.Store) *ResourceS}func (s *ResourceService) RegisterRoutes(g *echo.Group) {- g.GET("/r/:resourceName", s.streamResource)- g.GET("/r/:resourceName/*", s.streamResource)+ g.GET("/r/:uid", s.streamResource)+ g.GET("/r/:uid/*", s.streamResource)}func (s *ResourceService) streamResource(c echo.Context) error {ctx := c.Request().Context()- resourceName := c.Param("resourceName")+ uid := c.Param("uid")resource, err := s.Store.GetResource(ctx, &store.FindResource{- ResourceName: &resourceName,- GetBlob: true,+ UID: &uid,+ GetBlob: true,})if err != nil {- return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find resource by id: %s", resourceName)).SetInternal(err)+ return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find resource by uid: %s", uid)).SetInternal(err)}if resource == nil {- return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Resource not found: %s", resourceName))+ return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Resource not found: %s", uid))}// Check the related memo visibility.if resource.MemoID != nil {diff --git a/server/route/rss/rss.go b/server/route/rss/rss.goindex 9b1745ee3..adebc0c03 100644--- a/server/route/rss/rss.go+++ b/server/route/rss/rss.go@@ -112,7 +112,7 @@ func (s *RSSService) generateRSSFromMemoList(ctx context.Context, memoList []*st}feed.Items[i] = &feeds.Item{Title: getRSSItemTitle(memo.Content),- Link: &feeds.Link{Href: baseURL + "/m/" + memo.ResourceName},+ Link: &feeds.Link{Href: baseURL + "/m/" + memo.UID},Description: description,Created: time.Unix(memo.CreatedTs, 0),}@@ -128,7 +128,7 @@ func (s *RSSService) generateRSSFromMemoList(ctx context.Context, memoList []*stif resource.ExternalLink != "" {enclosure.Url = resource.ExternalLink} else {- enclosure.Url = baseURL + "/o/r/" + resource.ResourceName+ enclosure.Url = baseURL + "/o/r/" + resource.UID}enclosure.Length = strconv.Itoa(int(resource.Size))enclosure.Type = resource.Typediff --git a/store/db/mysql/memo.go b/store/db/mysql/memo.goindex 5b2e05355..4ed837d4e 100644--- a/store/db/mysql/memo.go+++ b/store/db/mysql/memo.go@@ -12,9 +12,9 @@ import ()func (d *DB) CreateMemo(ctx context.Context, create *store.Memo) (*store.Memo, error) {- fields := []string{"`resource_name`", "`creator_id`", "`content`", "`visibility`"}+ fields := []string{"`uid`", "`creator_id`", "`content`", "`visibility`"}placeholder := []string{"?", "?", "?", "?"}- args := []any{create.ResourceName, create.CreatorID, create.Content, create.Visibility}+ args := []any{create.UID, create.CreatorID, create.Content, create.Visibility}stmt := "INSERT INTO `memo` (" + strings.Join(fields, ", ") + ") VALUES (" + strings.Join(placeholder, ", ") + ")"result, err := d.db.ExecContext(ctx, stmt, args...)@@ -43,8 +43,8 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memoif v := find.ID; v != nil {where, args = append(where, "`memo`.`id` = ?"), append(args, *v)}- if v := find.ResourceName; v != nil {- where, args = append(where, "`memo`.`resource_name` = ?"), append(args, *v)+ if v := find.UID; v != nil {+ where, args = append(where, "`memo`.`uid` = ?"), append(args, *v)}if v := find.CreatorID; v != nil {where, args = append(where, "`memo`.`creator_id` = ?"), append(args, *v)@@ -94,7 +94,7 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memofields := []string{"`memo`.`id` AS `id`",- "`memo`.`resource_name` AS `resource_name`",+ "`memo`.`uid` AS `uid`","`memo`.`creator_id` AS `creator_id`","UNIX_TIMESTAMP(`memo`.`created_ts`) AS `created_ts`","UNIX_TIMESTAMP(`memo`.`updated_ts`) AS `updated_ts`",@@ -126,7 +126,7 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memovar memo store.Memodests := []any{&memo.ID,- &memo.ResourceName,+ &memo.UID,&memo.CreatorID,&memo.CreatedTs,&memo.UpdatedTs,@@ -166,8 +166,8 @@ func (d *DB) GetMemo(ctx context.Context, find *store.FindMemo) (*store.Memo, erfunc (d *DB) UpdateMemo(ctx context.Context, update *store.UpdateMemo) error {set, args := []string{}, []any{}- if v := update.ResourceName; v != nil {- set, args = append(set, "`resource_name` = ?"), append(args, *v)+ if v := update.UID; v != nil {+ set, args = append(set, "`uid` = ?"), append(args, *v)}if v := update.CreatedTs; v != nil {set, args = append(set, "`created_ts` = FROM_UNIXTIME(?)"), append(args, *v)diff --git a/store/db/mysql/migration/dev/LATEST__SCHEMA.sql b/store/db/mysql/migration/dev/LATEST__SCHEMA.sqlindex 770fc5560..c25caa06a 100644--- a/store/db/mysql/migration/dev/LATEST__SCHEMA.sql+++ b/store/db/mysql/migration/dev/LATEST__SCHEMA.sql@@ -37,7 +37,7 @@ CREATE TABLE `user_setting` (-- memoCREATE TABLE `memo` (`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY,- `resource_name` VARCHAR(256) NOT NULL UNIQUE,+ `uid` VARCHAR(256) NOT NULL UNIQUE,`creator_id` INT NOT NULL,`created_ts` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,`updated_ts` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,@@ -65,7 +65,7 @@ CREATE TABLE `memo_relation` (-- resourceCREATE TABLE `resource` (`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY,- `resource_name` VARCHAR(256) NOT NULL UNIQUE,+ `uid` VARCHAR(256) NOT NULL UNIQUE,`creator_id` INT NOT NULL,`created_ts` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,`updated_ts` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,diff --git a/store/db/mysql/resource.go b/store/db/mysql/resource.goindex e2c570eae..fffb7827f 100644--- a/store/db/mysql/resource.go+++ b/store/db/mysql/resource.go@@ -10,9 +10,9 @@ import ()func (d *DB) CreateResource(ctx context.Context, create *store.Resource) (*store.Resource, error) {- fields := []string{"`resource_name`", "`filename`", "`blob`", "`external_link`", "`type`", "`size`", "`creator_id`", "`internal_path`", "`memo_id`"}+ fields := []string{"`uid`", "`filename`", "`blob`", "`external_link`", "`type`", "`size`", "`creator_id`", "`internal_path`", "`memo_id`"}placeholder := []string{"?", "?", "?", "?", "?", "?", "?", "?", "?"}- args := []any{create.ResourceName, create.Filename, create.Blob, create.ExternalLink, create.Type, create.Size, create.CreatorID, create.InternalPath, create.MemoID}+ args := []any{create.UID, create.Filename, create.Blob, create.ExternalLink, create.Type, create.Size, create.CreatorID, create.InternalPath, create.MemoID}stmt := "INSERT INTO `resource` (" + strings.Join(fields, ", ") + ") VALUES (" + strings.Join(placeholder, ", ") + ")"result, err := d.db.ExecContext(ctx, stmt, args...)@@ -35,8 +35,8 @@ func (d *DB) ListResources(ctx context.Context, find *store.FindResource) ([]*stif v := find.ID; v != nil {where, args = append(where, "`id` = ?"), append(args, *v)}- if v := find.ResourceName; v != nil {- where, args = append(where, "`resource_name` = ?"), append(args, *v)+ if v := find.UID; v != nil {+ where, args = append(where, "`uid` = ?"), append(args, *v)}if v := find.CreatorID; v != nil {where, args = append(where, "`creator_id` = ?"), append(args, *v)@@ -51,7 +51,7 @@ func (d *DB) ListResources(ctx context.Context, find *store.FindResource) ([]*stwhere = append(where, "`memo_id` IS NOT NULL")}- fields := []string{"`id`", "`resource_name`", "`filename`", "`external_link`", "`type`", "`size`", "`creator_id`", "UNIX_TIMESTAMP(`created_ts`)", "UNIX_TIMESTAMP(`updated_ts`)", "`internal_path`", "`memo_id`"}+ fields := []string{"`id`", "`uid`", "`filename`", "`external_link`", "`type`", "`size`", "`creator_id`", "UNIX_TIMESTAMP(`created_ts`)", "UNIX_TIMESTAMP(`updated_ts`)", "`internal_path`", "`memo_id`"}if find.GetBlob {fields = append(fields, "`blob`")}@@ -76,7 +76,7 @@ func (d *DB) ListResources(ctx context.Context, find *store.FindResource) ([]*stvar memoID sql.NullInt32dests := []any{&resource.ID,- &resource.ResourceName,+ &resource.UID,&resource.Filename,&resource.ExternalLink,&resource.Type,@@ -121,8 +121,8 @@ func (d *DB) GetResource(ctx context.Context, find *store.FindResource) (*store.func (d *DB) UpdateResource(ctx context.Context, update *store.UpdateResource) (*store.Resource, error) {set, args := []string{}, []any{}- if v := update.ResourceName; v != nil {- set, args = append(set, "`resource_name` = ?"), append(args, *v)+ if v := update.UID; v != nil {+ set, args = append(set, "`uid` = ?"), append(args, *v)}if v := update.UpdatedTs; v != nil {set, args = append(set, "`updated_ts` = FROM_UNIXTIME(?)"), append(args, *v)diff --git a/store/db/postgres/memo.go b/store/db/postgres/memo.goindex 772191226..bfae66ebe 100644--- a/store/db/postgres/memo.go+++ b/store/db/postgres/memo.go@@ -12,8 +12,8 @@ import ()func (d *DB) CreateMemo(ctx context.Context, create *store.Memo) (*store.Memo, error) {- fields := []string{"resource_name", "creator_id", "content", "visibility"}- args := []any{create.ResourceName, create.CreatorID, create.Content, create.Visibility}+ fields := []string{"uid", "creator_id", "content", "visibility"}+ args := []any{create.UID, create.CreatorID, create.Content, create.Visibility}stmt := "INSERT INTO memo (" + strings.Join(fields, ", ") + ") VALUES (" + placeholders(len(args)) + ") RETURNING id, created_ts, updated_ts, row_status"if err := d.db.QueryRowContext(ctx, stmt, args...).Scan(@@ -34,8 +34,8 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memoif v := find.ID; v != nil {where, args = append(where, "memo.id = "+placeholder(len(args)+1)), append(args, *v)}- if v := find.ResourceName; v != nil {- where, args = append(where, "memo.resource_name = "+placeholder(len(args)+1)), append(args, *v)+ if v := find.UID; v != nil {+ where, args = append(where, "memo.uid = "+placeholder(len(args)+1)), append(args, *v)}if v := find.CreatorID; v != nil {where, args = append(where, "memo.creator_id = "+placeholder(len(args)+1)), append(args, *v)@@ -85,7 +85,7 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memofields := []string{`memo.id AS id`,- `memo.resource_name AS resource_name`,+ `memo.uid AS uid`,`memo.creator_id AS creator_id`,`memo.created_ts AS created_ts`,`memo.updated_ts AS updated_ts`,@@ -122,7 +122,7 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memovar memo store.Memodests := []any{&memo.ID,- &memo.ResourceName,+ &memo.UID,&memo.CreatorID,&memo.CreatedTs,&memo.UpdatedTs,@@ -162,8 +162,8 @@ func (d *DB) GetMemo(ctx context.Context, find *store.FindMemo) (*store.Memo, erfunc (d *DB) UpdateMemo(ctx context.Context, update *store.UpdateMemo) error {set, args := []string{}, []any{}- if v := update.ResourceName; v != nil {- set, args = append(set, "resource_name = "+placeholder(len(args)+1)), append(args, *v)+ if v := update.UID; v != nil {+ set, args = append(set, "uid = "+placeholder(len(args)+1)), append(args, *v)}if v := update.CreatedTs; v != nil {set, args = append(set, "created_ts = "+placeholder(len(args)+1)), append(args, *v)diff --git a/store/db/postgres/migration/dev/LATEST__SCHEMA.sql b/store/db/postgres/migration/dev/LATEST__SCHEMA.sqlindex 3d611c2b7..06c422b9f 100644--- a/store/db/postgres/migration/dev/LATEST__SCHEMA.sql+++ b/store/db/postgres/migration/dev/LATEST__SCHEMA.sql@@ -37,7 +37,7 @@ CREATE TABLE user_setting (-- memoCREATE TABLE memo (id SERIAL PRIMARY KEY,- resource_name TEXT NOT NULL UNIQUE,+ uid TEXT NOT NULL UNIQUE,creator_id INTEGER NOT NULL,created_ts BIGINT NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW()),updated_ts BIGINT NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW()),@@ -65,7 +65,7 @@ CREATE TABLE memo_relation (-- resourceCREATE TABLE resource (id SERIAL PRIMARY KEY,- resource_name TEXT NOT NULL UNIQUE,+ uid TEXT NOT NULL UNIQUE,creator_id INTEGER NOT NULL,created_ts BIGINT NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW()),updated_ts BIGINT NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW()),diff --git a/store/db/postgres/resource.go b/store/db/postgres/resource.goindex 3ced74615..63e7e267f 100644--- a/store/db/postgres/resource.go+++ b/store/db/postgres/resource.go@@ -10,8 +10,8 @@ import ()func (d *DB) CreateResource(ctx context.Context, create *store.Resource) (*store.Resource, error) {- fields := []string{"resource_name", "filename", "blob", "external_link", "type", "size", "creator_id", "internal_path", "memo_id"}- args := []any{create.ResourceName, create.Filename, create.Blob, create.ExternalLink, create.Type, create.Size, create.CreatorID, create.InternalPath, create.MemoID}+ fields := []string{"uid", "filename", "blob", "external_link", "type", "size", "creator_id", "internal_path", "memo_id"}+ args := []any{create.UID, create.Filename, create.Blob, create.ExternalLink, create.Type, create.Size, create.CreatorID, create.InternalPath, create.MemoID}stmt := "INSERT INTO resource (" + strings.Join(fields, ", ") + ") VALUES (" + placeholders(len(args)) + ") RETURNING id, created_ts, updated_ts"if err := d.db.QueryRowContext(ctx, stmt, args...).Scan(&create.ID, &create.CreatedTs, &create.UpdatedTs); err != nil {@@ -26,8 +26,8 @@ func (d *DB) ListResources(ctx context.Context, find *store.FindResource) ([]*stif v := find.ID; v != nil {where, args = append(where, "id = "+placeholder(len(args)+1)), append(args, *v)}- if v := find.ResourceName; v != nil {- where, args = append(where, "resource_name = "+placeholder(len(args)+1)), append(args, *v)+ if v := find.UID; v != nil {+ where, args = append(where, "uid = "+placeholder(len(args)+1)), append(args, *v)}if v := find.CreatorID; v != nil {where, args = append(where, "creator_id = "+placeholder(len(args)+1)), append(args, *v)@@ -42,7 +42,7 @@ func (d *DB) ListResources(ctx context.Context, find *store.FindResource) ([]*stwhere = append(where, "memo_id IS NOT NULL")}- fields := []string{"id", "resource_name", "filename", "external_link", "type", "size", "creator_id", "created_ts", "updated_ts", "internal_path", "memo_id"}+ fields := []string{"id", "uid", "filename", "external_link", "type", "size", "creator_id", "created_ts", "updated_ts", "internal_path", "memo_id"}if find.GetBlob {fields = append(fields, "blob")}@@ -73,7 +73,7 @@ func (d *DB) ListResources(ctx context.Context, find *store.FindResource) ([]*stvar memoID sql.NullInt32dests := []any{&resource.ID,- &resource.ResourceName,+ &resource.UID,&resource.Filename,&resource.ExternalLink,&resource.Type,@@ -106,8 +106,8 @@ func (d *DB) ListResources(ctx context.Context, find *store.FindResource) ([]*stfunc (d *DB) UpdateResource(ctx context.Context, update *store.UpdateResource) (*store.Resource, error) {set, args := []string{}, []any{}- if v := update.ResourceName; v != nil {- set, args = append(set, "resource_name = "+placeholder(len(args)+1)), append(args, *v)+ if v := update.UID; v != nil {+ set, args = append(set, "uid = "+placeholder(len(args)+1)), append(args, *v)}if v := update.UpdatedTs; v != nil {set, args = append(set, "updated_ts = "+placeholder(len(args)+1)), append(args, *v)@@ -128,13 +128,13 @@ func (d *DB) UpdateResource(ctx context.Context, update *store.UpdateResource) (set, args = append(set, "blob = "+placeholder(len(args)+1)), append(args, v)}- fields := []string{"id", "resource_name", "filename", "external_link", "type", "size", "creator_id", "created_ts", "updated_ts", "internal_path"}+ fields := []string{"id", "uid", "filename", "external_link", "type", "size", "creator_id", "created_ts", "updated_ts", "internal_path"}stmt := `UPDATE resource SET ` + strings.Join(set, ", ") + ` WHERE id = ` + placeholder(len(args)+1) + ` RETURNING ` + strings.Join(fields, ", ")args = append(args, update.ID)resource := store.Resource{}dests := []any{&resource.ID,- &resource.ResourceName,+ &resource.UID,&resource.Filename,&resource.ExternalLink,&resource.Type,diff --git a/store/db/sqlite/memo.go b/store/db/sqlite/memo.goindex 2257a0e58..38b633184 100644--- a/store/db/sqlite/memo.go+++ b/store/db/sqlite/memo.go@@ -10,9 +10,9 @@ import ()func (d *DB) CreateMemo(ctx context.Context, create *store.Memo) (*store.Memo, error) {- fields := []string{"`resource_name`", "`creator_id`", "`content`", "`visibility`"}+ fields := []string{"`uid`", "`creator_id`", "`content`", "`visibility`"}placeholder := []string{"?", "?", "?", "?"}- args := []any{create.ResourceName, create.CreatorID, create.Content, create.Visibility}+ args := []any{create.UID, create.CreatorID, create.Content, create.Visibility}stmt := "INSERT INTO `memo` (" + strings.Join(fields, ", ") + ") VALUES (" + strings.Join(placeholder, ", ") + ") RETURNING `id`, `created_ts`, `updated_ts`, `row_status`"if err := d.db.QueryRowContext(ctx, stmt, args...).Scan(@@ -33,8 +33,8 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memoif v := find.ID; v != nil {where, args = append(where, "`memo`.`id` = ?"), append(args, *v)}- if v := find.ResourceName; v != nil {- where, args = append(where, "`memo`.`resource_name` = ?"), append(args, *v)+ if v := find.UID; v != nil {+ where, args = append(where, "`memo`.`uid` = ?"), append(args, *v)}if v := find.CreatorID; v != nil {where, args = append(where, "`memo`.`creator_id` = ?"), append(args, *v)@@ -84,7 +84,7 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memofields := []string{"`memo`.`id` AS `id`",- "`memo`.`resource_name` AS `resource_name`",+ "`memo`.`uid` AS `uid`","`memo`.`creator_id` AS `creator_id`","`memo`.`created_ts` AS `created_ts`","`memo`.`updated_ts` AS `updated_ts`",@@ -120,7 +120,7 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memovar memo store.Memodests := []any{&memo.ID,- &memo.ResourceName,+ &memo.UID,&memo.CreatorID,&memo.CreatedTs,&memo.UpdatedTs,@@ -147,8 +147,8 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memofunc (d *DB) UpdateMemo(ctx context.Context, update *store.UpdateMemo) error {set, args := []string{}, []any{}- if v := update.ResourceName; v != nil {- set, args = append(set, "`resource_name` = ?"), append(args, *v)+ if v := update.UID; v != nil {+ set, args = append(set, "`uid` = ?"), append(args, *v)}if v := update.CreatedTs; v != nil {set, args = append(set, "`created_ts` = ?"), append(args, *v)diff --git a/store/db/sqlite/migration/dev/LATEST__SCHEMA.sql b/store/db/sqlite/migration/dev/LATEST__SCHEMA.sqlindex f1114df7d..def1d7dcc 100644--- a/store/db/sqlite/migration/dev/LATEST__SCHEMA.sql+++ b/store/db/sqlite/migration/dev/LATEST__SCHEMA.sql@@ -40,7 +40,7 @@ CREATE TABLE user_setting (-- memoCREATE TABLE memo (id INTEGER PRIMARY KEY AUTOINCREMENT,- resource_name TEXT NOT NULL UNIQUE,+ uid TEXT NOT NULL UNIQUE,creator_id INTEGER NOT NULL,created_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now')),updated_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now')),@@ -72,7 +72,7 @@ CREATE TABLE memo_relation (-- resourceCREATE TABLE resource (id INTEGER PRIMARY KEY AUTOINCREMENT,- resource_name TEXT NOT NULL UNIQUE,+ uid TEXT NOT NULL UNIQUE,creator_id INTEGER NOT NULL,created_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now')),updated_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now')),diff --git a/store/db/sqlite/resource.go b/store/db/sqlite/resource.goindex bb0d6ee78..c0a5b973b 100644--- a/store/db/sqlite/resource.go+++ b/store/db/sqlite/resource.go@@ -10,9 +10,9 @@ import ()func (d *DB) CreateResource(ctx context.Context, create *store.Resource) (*store.Resource, error) {- fields := []string{"`resource_name`", "`filename`", "`blob`", "`external_link`", "`type`", "`size`", "`creator_id`", "`internal_path`", "`memo_id`"}+ fields := []string{"`uid`", "`filename`", "`blob`", "`external_link`", "`type`", "`size`", "`creator_id`", "`internal_path`", "`memo_id`"}placeholder := []string{"?", "?", "?", "?", "?", "?", "?", "?", "?"}- args := []any{create.ResourceName, create.Filename, create.Blob, create.ExternalLink, create.Type, create.Size, create.CreatorID, create.InternalPath, create.MemoID}+ args := []any{create.UID, create.Filename, create.Blob, create.ExternalLink, create.Type, create.Size, create.CreatorID, create.InternalPath, create.MemoID}stmt := "INSERT INTO `resource` (" + strings.Join(fields, ", ") + ") VALUES (" + strings.Join(placeholder, ", ") + ") RETURNING `id`, `created_ts`, `updated_ts`"if err := d.db.QueryRowContext(ctx, stmt, args...).Scan(&create.ID, &create.CreatedTs, &create.UpdatedTs); err != nil {@@ -28,8 +28,8 @@ func (d *DB) ListResources(ctx context.Context, find *store.FindResource) ([]*stif v := find.ID; v != nil {where, args = append(where, "`id` = ?"), append(args, *v)}- if v := find.ResourceName; v != nil {- where, args = append(where, "`resource_name` = ?"), append(args, *v)+ if v := find.UID; v != nil {+ where, args = append(where, "`uid` = ?"), append(args, *v)}if v := find.CreatorID; v != nil {where, args = append(where, "`creator_id` = ?"), append(args, *v)@@ -44,7 +44,7 @@ func (d *DB) ListResources(ctx context.Context, find *store.FindResource) ([]*stwhere = append(where, "`memo_id` IS NOT NULL")}- fields := []string{"`id`", "`resource_name`", "`filename`", "`external_link`", "`type`", "`size`", "`creator_id`", "`created_ts`", "`updated_ts`", "`internal_path`", "`memo_id`"}+ fields := []string{"`id`", "`uid`", "`filename`", "`external_link`", "`type`", "`size`", "`creator_id`", "`created_ts`", "`updated_ts`", "`internal_path`", "`memo_id`"}if find.GetBlob {fields = append(fields, "`blob`")}@@ -69,7 +69,7 @@ func (d *DB) ListResources(ctx context.Context, find *store.FindResource) ([]*stvar memoID sql.NullInt32dests := []any{&resource.ID,- &resource.ResourceName,+ &resource.UID,&resource.Filename,&resource.ExternalLink,&resource.Type,@@ -102,8 +102,8 @@ func (d *DB) ListResources(ctx context.Context, find *store.FindResource) ([]*stfunc (d *DB) UpdateResource(ctx context.Context, update *store.UpdateResource) (*store.Resource, error) {set, args := []string{}, []any{}- if v := update.ResourceName; v != nil {- set, args = append(set, "`resource_name` = ?"), append(args, *v)+ if v := update.UID; v != nil {+ set, args = append(set, "`uid` = ?"), append(args, *v)}if v := update.UpdatedTs; v != nil {set, args = append(set, "`updated_ts` = ?"), append(args, *v)@@ -125,12 +125,12 @@ func (d *DB) UpdateResource(ctx context.Context, update *store.UpdateResource) (}args = append(args, update.ID)- fields := []string{"`id`", "`resource_name`", "`filename`", "`external_link`", "`type`", "`size`", "`creator_id`", "`created_ts`", "`updated_ts`", "`internal_path`"}+ fields := []string{"`id`", "`uid`", "`filename`", "`external_link`", "`type`", "`size`", "`creator_id`", "`created_ts`", "`updated_ts`", "`internal_path`"}stmt := "UPDATE `resource` SET " + strings.Join(set, ", ") + " WHERE `id` = ? RETURNING " + strings.Join(fields, ", ")resource := store.Resource{}dests := []any{&resource.ID,- &resource.ResourceName,+ &resource.UID,&resource.Filename,&resource.ExternalLink,&resource.Type,diff --git a/store/db/sqlite/seed/10002__memo.sql b/store/db/sqlite/seed/10002__memo.sqlindex f905eed4c..ec05c6781 100644--- a/store/db/sqlite/seed/10002__memo.sql+++ b/store/db/sqlite/seed/10002__memo.sql@@ -1,7 +1,7 @@INSERT INTOmemo (`id`,- `resource_name`,+ `uid`,`content`,`creator_id`)@@ -16,7 +16,7 @@ VALUESINSERT INTOmemo (`id`,- `resource_name`,+ `uid`,`content`,`creator_id`,`visibility`@@ -36,7 +36,7 @@ VALUESINSERT INTOmemo (`id`,- `resource_name`,+ `uid`,`content`,`creator_id`,`visibility`@@ -54,7 +54,7 @@ VALUESINSERT INTOmemo (`id`,- `resource_name`,+ `uid`,`content`,`creator_id`,`visibility`@@ -74,7 +74,7 @@ VALUESINSERT INTOmemo (`id`,- `resource_name`,+ `uid`,`content`,`creator_id`,`visibility`diff --git a/store/db/sqlite/seed/10006__resource.sql b/store/db/sqlite/seed/10006__resource.sqlindex a810b75ff..255838f1b 100644--- a/store/db/sqlite/seed/10006__resource.sql+++ b/store/db/sqlite/seed/10006__resource.sql@@ -1,4 +1,4 @@INSERT INTO- resource (`resource_name`, `creator_id`, `filename`, `external_link`, `type`, `memo_id`)+ resource (`uid`, `creator_id`, `filename`, `external_link`, `type`, `memo_id`)VALUES("Pw2awZvxxLK4sPRtHmYuS7", 101, 'slash-demo.png', 'https://github.com/yourselfhosted/slash/blob/main/docs/assets/demo.png?raw=true', 'image/png', 3);diff --git a/store/memo.go b/store/memo.goindex 4d0953ab5..77c6985b8 100644--- a/store/memo.go+++ b/store/memo.go@@ -32,8 +32,10 @@ func (v Visibility) String() string {}type Memo struct {- ID int32- ResourceName string+ // ID is the system generated unique identifier for the memo.+ ID int32+ // UID is the user defined unique identifier for the memo.+ UID string// Standard fieldsRowStatus RowStatus@@ -51,8 +53,8 @@ type Memo struct {}type FindMemo struct {- ID *int32- ResourceName *string+ ID *int32+ UID *string// Standard fieldsRowStatus *RowStatus@@ -76,13 +78,13 @@ type FindMemo struct {}type UpdateMemo struct {- ID int32- ResourceName *string- CreatedTs *int64- UpdatedTs *int64- RowStatus *RowStatus- Content *string- Visibility *Visibility+ ID int32+ UID *string+ CreatedTs *int64+ UpdatedTs *int64+ RowStatus *RowStatus+ Content *string+ Visibility *Visibility}type DeleteMemo struct {@@ -90,8 +92,8 @@ type DeleteMemo struct {}func (s *Store) CreateMemo(ctx context.Context, create *Memo) (*Memo, error) {- if !util.ResourceNameMatcher.MatchString(create.ResourceName) {- return nil, errors.New("resource name is invalid")+ if !util.UIDMatcher.MatchString(create.UID) {+ return nil, errors.New("invalid uid")}return s.driver.CreateMemo(ctx, create)}@@ -114,8 +116,8 @@ func (s *Store) GetMemo(ctx context.Context, find *FindMemo) (*Memo, error) {}func (s *Store) UpdateMemo(ctx context.Context, update *UpdateMemo) error {- if update.ResourceName != nil && !util.ResourceNameMatcher.MatchString(*update.ResourceName) {- return errors.New("resource name is invalid")+ if update.UID != nil && !util.UIDMatcher.MatchString(*update.UID) {+ return errors.New("invalid uid")}return s.driver.UpdateMemo(ctx, update)}diff --git a/store/resource.go b/store/resource.goindex fae1cd1b5..02cc97519 100644--- a/store/resource.go+++ b/store/resource.go@@ -17,8 +17,10 @@ const ()type Resource struct {- ID int32- ResourceName string+ // ID is the system generated unique identifier for the resource.+ ID int32+ // UID is the user defined unique identifier for the resource.+ UID string// Standard fieldsCreatorID int32@@ -38,7 +40,7 @@ type Resource struct {type FindResource struct {GetBlob boolID *int32- ResourceName *string+ UID *stringCreatorID *int32Filename *stringMemoID *int32@@ -49,7 +51,7 @@ type FindResource struct {type UpdateResource struct {ID int32- ResourceName *string+ UID *stringUpdatedTs *int64Filename *stringInternalPath *string@@ -64,8 +66,8 @@ type DeleteResource struct {}func (s *Store) CreateResource(ctx context.Context, create *Resource) (*Resource, error) {- if !util.ResourceNameMatcher.MatchString(create.ResourceName) {- return nil, errors.New("invalid resource name")+ if !util.UIDMatcher.MatchString(create.UID) {+ return nil, errors.New("invalid uid")}return s.driver.CreateResource(ctx, create)}@@ -88,8 +90,8 @@ func (s *Store) GetResource(ctx context.Context, find *FindResource) (*Resource,}func (s *Store) UpdateResource(ctx context.Context, update *UpdateResource) (*Resource, error) {- if update.ResourceName != nil && !util.ResourceNameMatcher.MatchString(*update.ResourceName) {- return nil, errors.New("invalid resource name")+ if update.UID != nil && !util.UIDMatcher.MatchString(*update.UID) {+ return nil, errors.New("invalid uid")}return s.driver.UpdateResource(ctx, update)}diff --git a/test/store/memo_organizer_test.go b/test/store/memo_organizer_test.goindex 4243a01a5..8d942c787 100644--- a/test/store/memo_organizer_test.go+++ b/test/store/memo_organizer_test.go@@ -15,10 +15,10 @@ func TestMemoOrganizerStore(t *testing.T) {user, err := createTestingHostUser(ctx, ts)require.NoError(t, err)memoCreate := &store.Memo{- ResourceName: "main-memo",- CreatorID: user.ID,- Content: "main memo content",- Visibility: store.Public,+ UID: "main-memo",+ CreatorID: user.ID,+ Content: "main memo content",+ Visibility: store.Public,}memo, err := ts.CreateMemo(ctx, memoCreate)require.NoError(t, err)diff --git a/test/store/memo_relation_test.go b/test/store/memo_relation_test.goindex bf825608b..56565bf89 100644--- a/test/store/memo_relation_test.go+++ b/test/store/memo_relation_test.go@@ -15,28 +15,28 @@ func TestMemoRelationStore(t *testing.T) {user, err := createTestingHostUser(ctx, ts)require.NoError(t, err)memoCreate := &store.Memo{- ResourceName: "main-memo",- CreatorID: user.ID,- Content: "main memo content",- Visibility: store.Public,+ UID: "main-memo",+ CreatorID: user.ID,+ Content: "main memo content",+ Visibility: store.Public,}memo, err := ts.CreateMemo(ctx, memoCreate)require.NoError(t, err)require.Equal(t, memoCreate.Content, memo.Content)relatedMemoCreate := &store.Memo{- ResourceName: "related-memo",- CreatorID: user.ID,- Content: "related memo content",- Visibility: store.Public,+ UID: "related-memo",+ CreatorID: user.ID,+ Content: "related memo content",+ Visibility: store.Public,}relatedMemo, err := ts.CreateMemo(ctx, relatedMemoCreate)require.NoError(t, err)require.Equal(t, relatedMemoCreate.Content, relatedMemo.Content)commentMemoCreate := &store.Memo{- ResourceName: "comment-memo",- CreatorID: user.ID,- Content: "comment memo content",- Visibility: store.Public,+ UID: "comment-memo",+ CreatorID: user.ID,+ Content: "comment memo content",+ Visibility: store.Public,}commentMemo, err := ts.CreateMemo(ctx, commentMemoCreate)require.NoError(t, err)diff --git a/test/store/memo_test.go b/test/store/memo_test.goindex c9a929ba6..48f6f9569 100644--- a/test/store/memo_test.go+++ b/test/store/memo_test.go@@ -15,10 +15,10 @@ func TestMemoStore(t *testing.T) {user, err := createTestingHostUser(ctx, ts)require.NoError(t, err)memoCreate := &store.Memo{- ResourceName: "test-resource-name",- CreatorID: user.ID,- Content: "test_content",- Visibility: store.Public,+ UID: "test-resource-name",+ CreatorID: user.ID,+ Content: "test_content",+ Visibility: store.Public,}memo, err := ts.CreateMemo(ctx, memoCreate)require.NoError(t, err)@@ -68,10 +68,10 @@ func TestDeleteMemoStore(t *testing.T) {user, err := createTestingHostUser(ctx, ts)require.NoError(t, err)memoCreate := &store.Memo{- ResourceName: "test-resource-name",- CreatorID: user.ID,- Content: "test_content",- Visibility: store.Public,+ UID: "test-resource-name",+ CreatorID: user.ID,+ Content: "test_content",+ Visibility: store.Public,}memo, err := ts.CreateMemo(ctx, memoCreate)require.NoError(t, err)diff --git a/test/store/resource_test.go b/test/store/resource_test.goindex 90d66490a..2c759dfb9 100644--- a/test/store/resource_test.go+++ b/test/store/resource_test.go@@ -14,7 +14,7 @@ func TestResourceStore(t *testing.T) {ctx := context.Background()ts := NewTestingStore(ctx, t)_, err := ts.CreateResource(ctx, &store.Resource{- ResourceName: shortuuid.New(),+ UID: shortuuid.New(),CreatorID: 101,Filename: "test.epub",Blob: []byte("test"),diff --git a/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx b/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsxindex baa761264..07e2cae97 100644--- a/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx+++ b/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx@@ -17,11 +17,11 @@ const EmbeddedMemo = ({ resourceId, params: paramsStr }: Props) => {const context = useContext(RendererContext);const loadingState = useLoading();const memoStore = useMemoStore();- const memo = memoStore.getMemoByResourceId(resourceId);+ const memo = memoStore.getMemoByUid(resourceId);const resourceName = `memos/${resourceId}`;useEffect(() => {- memoStore.searchMemos(`resource_name == "${resourceId}"`).finally(() => loadingState.setFinish());+ memoStore.searchMemos(`uid == "${resourceId}"`).finally(() => loadingState.setFinish());}, [resourceId]);if (loadingState.isLoading) {diff --git a/web/src/components/MemoContent/ReferencedContent/ReferencedMemo.tsx b/web/src/components/MemoContent/ReferencedContent/ReferencedMemo.tsxindex 0e8878616..57b98a8a4 100644--- a/web/src/components/MemoContent/ReferencedContent/ReferencedMemo.tsx+++ b/web/src/components/MemoContent/ReferencedContent/ReferencedMemo.tsx@@ -13,11 +13,11 @@ const ReferencedMemo = ({ resourceId, params: paramsStr }: Props) => {const navigateTo = useNavigateTo();const loadingState = useLoading();const memoStore = useMemoStore();- const memo = memoStore.getMemoByResourceId(resourceId);+ const memo = memoStore.getMemoByUid(resourceId);const params = new URLSearchParams(paramsStr);useEffect(() => {- memoStore.searchMemos(`resource_name == "${resourceId}"`).finally(() => loadingState.setFinish());+ memoStore.searchMemos(`uid == "${resourceId}"`).finally(() => loadingState.setFinish());}, [resourceId]);if (loadingState.isLoading) {diff --git a/web/src/components/MemoView.tsx b/web/src/components/MemoView.tsxindex af11ba60f..d749dacaa 100644--- a/web/src/components/MemoView.tsx+++ b/web/src/components/MemoView.tsx@@ -58,7 +58,7 @@ const MemoView: React.FC<Props> = (props: Props) => {if (event.altKey) {showChangeMemoCreatedTsDialog(extractMemoIdFromName(memo.name));} else {- navigateTo(`/m/${memo.resourceId}`);+ navigateTo(`/m/${memo.uid}`);}};@@ -119,7 +119,7 @@ const MemoView: React.FC<Props> = (props: Props) => {"flex flex-row justify-start items-center hover:opacity-70",commentAmount === 0 && "invisible group-hover:visible",)}- to={`/m/${memo.resourceId}#comments`}+ to={`/m/${memo.uid}#comments`}unstable_viewTransition><Icon.MessageCircleMore className="w-4 h-4 mx-auto text-gray-500 dark:text-gray-400" />diff --git a/web/src/pages/MemoDetail.tsx b/web/src/pages/MemoDetail.tsxindex c31b5c6eb..f7fdb6ab7 100644--- a/web/src/pages/MemoDetail.tsx+++ b/web/src/pages/MemoDetail.tsx@@ -19,8 +19,8 @@ const MemoDetail = () => {const navigateTo = useNavigateTo();const currentUser = useCurrentUser();const memoStore = useMemoStore();- const resourceId = params.resourceId;- const memo = memoStore.getMemoByResourceId(resourceId || "");+ const uid = params.uid;+ const memo = memoStore.getMemoByUid(uid || "");const [parentMemo, setParentMemo] = useState<Memo | undefined>(undefined);const commentRelations =memo?.relations.filter((relation) => relation.relatedMemo === memo.name && relation.type === MemoRelation_Type.COMMENT) || [];@@ -28,15 +28,15 @@ const MemoDetail = () => {// Prepare memo.useEffect(() => {- if (resourceId) {- memoStore.searchMemos(`resource_name == "${resourceId}"`).catch((error: ClientError) => {+ if (uid) {+ memoStore.searchMemos(`uid == "${uid}"`).catch((error: ClientError) => {toast.error(error.details);navigateTo("/403");});} else {navigateTo("/404");}- }, [resourceId]);+ }, [uid]);// Prepare memo comments.useEffect(() => {diff --git a/web/src/pages/Resources.tsx b/web/src/pages/Resources.tsxindex 14f105102..c72a449fa 100644--- a/web/src/pages/Resources.tsx+++ b/web/src/pages/Resources.tsx@@ -132,7 +132,7 @@ const Resources = () => {{relatedMemo && (<LinkclassName="shrink-0 text-xs ml-1 text-gray-400 hover:underline hover:text-blue-600"- to={`/m/${relatedMemo.resourceId}`}+ to={`/m/${relatedMemo.uid}`}>#{extractMemoIdFromName(relatedMemo.name)}</Link>diff --git a/web/src/router/index.tsx b/web/src/router/index.tsxindex dde90c78c..4dc2a42a8 100644--- a/web/src/router/index.tsx+++ b/web/src/router/index.tsx@@ -88,7 +88,7 @@ const router = createBrowserRouter([element: <Explore />,},{- path: "m/:resourceId",+ path: "m/:uid",element: <MemoDetail />,},{diff --git a/web/src/store/v1/memo.ts b/web/src/store/v1/memo.tsindex d362c9f46..d3dc41097 100644--- a/web/src/store/v1/memo.ts+++ b/web/src/store/v1/memo.ts@@ -58,9 +58,9 @@ export const useMemoStore = create(set({ memoMapByName: memoMap });return memos;},- getMemoByResourceId: (resourceId: string) => {+ getMemoByUid: (uid: string) => {const memoMap = get().memoMapByName;- return Object.values(memoMap).find((memo) => memo.resourceId === resourceId);+ return Object.values(memoMap).find((memo) => memo.uid === uid);},createMemo: async (request: CreateMemoRequest) => {const { memo } = await memoServiceClient.createMemo(request);