Fix GetConversationTypeRequest struct name

This commit is contained in:
Tulir Asokan 2023-08-27 12:35:47 +03:00
parent e4fc031c12
commit f24e8f029f
6 changed files with 123 additions and 56 deletions

View file

@ -2059,7 +2059,7 @@ func (x *UpdateConversationResponse) GetSuccess() bool {
return false return false
} }
type ConversationTypeRequest struct { type GetConversationTypeRequest struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
@ -2067,8 +2067,8 @@ type ConversationTypeRequest struct {
ConversationID string `protobuf:"bytes,2,opt,name=conversationID,proto3" json:"conversationID,omitempty"` ConversationID string `protobuf:"bytes,2,opt,name=conversationID,proto3" json:"conversationID,omitempty"`
} }
func (x *ConversationTypeRequest) Reset() { func (x *GetConversationTypeRequest) Reset() {
*x = ConversationTypeRequest{} *x = GetConversationTypeRequest{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_client_proto_msgTypes[32] mi := &file_client_proto_msgTypes[32]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -2076,13 +2076,13 @@ func (x *ConversationTypeRequest) Reset() {
} }
} }
func (x *ConversationTypeRequest) String() string { func (x *GetConversationTypeRequest) String() string {
return protoimpl.X.MessageStringOf(x) return protoimpl.X.MessageStringOf(x)
} }
func (*ConversationTypeRequest) ProtoMessage() {} func (*GetConversationTypeRequest) ProtoMessage() {}
func (x *ConversationTypeRequest) ProtoReflect() protoreflect.Message { func (x *GetConversationTypeRequest) ProtoReflect() protoreflect.Message {
mi := &file_client_proto_msgTypes[32] mi := &file_client_proto_msgTypes[32]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -2094,12 +2094,12 @@ func (x *ConversationTypeRequest) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x) return mi.MessageOf(x)
} }
// Deprecated: Use ConversationTypeRequest.ProtoReflect.Descriptor instead. // Deprecated: Use GetConversationTypeRequest.ProtoReflect.Descriptor instead.
func (*ConversationTypeRequest) Descriptor() ([]byte, []int) { func (*GetConversationTypeRequest) Descriptor() ([]byte, []int) {
return file_client_proto_rawDescGZIP(), []int{32} return file_client_proto_rawDescGZIP(), []int{32}
} }
func (x *ConversationTypeRequest) GetConversationID() string { func (x *GetConversationTypeRequest) GetConversationID() string {
if x != nil { if x != nil {
return x.ConversationID return x.ConversationID
} }
@ -3175,7 +3175,7 @@ var file_client_proto_goTypes = []interface{}{
(*ConversationAction5)(nil), // 34: client.ConversationAction5 (*ConversationAction5)(nil), // 34: client.ConversationAction5
(*UpdateConversationData)(nil), // 35: client.UpdateConversationData (*UpdateConversationData)(nil), // 35: client.UpdateConversationData
(*UpdateConversationResponse)(nil), // 36: client.UpdateConversationResponse (*UpdateConversationResponse)(nil), // 36: client.UpdateConversationResponse
(*ConversationTypeRequest)(nil), // 37: client.ConversationTypeRequest (*GetConversationTypeRequest)(nil), // 37: client.GetConversationTypeRequest
(*GetConversationTypeResponse)(nil), // 38: client.GetConversationTypeResponse (*GetConversationTypeResponse)(nil), // 38: client.GetConversationTypeResponse
(*GetConversationRequest)(nil), // 39: client.GetConversationRequest (*GetConversationRequest)(nil), // 39: client.GetConversationRequest
(*GetConversationResponse)(nil), // 40: client.GetConversationResponse (*GetConversationResponse)(nil), // 40: client.GetConversationResponse
@ -3651,7 +3651,7 @@ func file_client_proto_init() {
} }
} }
file_client_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} { file_client_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*ConversationTypeRequest); i { switch v := v.(*GetConversationTypeRequest); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:

Binary file not shown.

View file

@ -215,7 +215,7 @@ message UpdateConversationResponse {
*/ */
} }
message ConversationTypeRequest { message GetConversationTypeRequest {
string conversationID = 2; string conversationID = 2;
} }

View file

@ -174,6 +174,7 @@ type UpdateEvents struct {
// *UpdateEvents_TypingEvent // *UpdateEvents_TypingEvent
// *UpdateEvents_SettingsEvent // *UpdateEvents_SettingsEvent
// *UpdateEvents_UserAlertEvent // *UpdateEvents_UserAlertEvent
// *UpdateEvents_BrowserPresenceCheckEvent
Event isUpdateEvents_Event `protobuf_oneof:"event"` Event isUpdateEvents_Event `protobuf_oneof:"event"`
} }
@ -251,6 +252,13 @@ func (x *UpdateEvents) GetUserAlertEvent() *UserAlertEvent {
return nil return nil
} }
func (x *UpdateEvents) GetBrowserPresenceCheckEvent() *BrowserPresenceCheckEvent {
if x, ok := x.GetEvent().(*UpdateEvents_BrowserPresenceCheckEvent); ok {
return x.BrowserPresenceCheckEvent
}
return nil
}
type isUpdateEvents_Event interface { type isUpdateEvents_Event interface {
isUpdateEvents_Event() isUpdateEvents_Event()
} }
@ -275,6 +283,10 @@ type UpdateEvents_UserAlertEvent struct {
UserAlertEvent *UserAlertEvent `protobuf:"bytes,6,opt,name=userAlertEvent,proto3,oneof"` UserAlertEvent *UserAlertEvent `protobuf:"bytes,6,opt,name=userAlertEvent,proto3,oneof"`
} }
type UpdateEvents_BrowserPresenceCheckEvent struct {
BrowserPresenceCheckEvent *BrowserPresenceCheckEvent `protobuf:"bytes,7,opt,name=browserPresenceCheckEvent,proto3,oneof"`
}
func (*UpdateEvents_ConversationEvent) isUpdateEvents_Event() {} func (*UpdateEvents_ConversationEvent) isUpdateEvents_Event() {}
func (*UpdateEvents_MessageEvent) isUpdateEvents_Event() {} func (*UpdateEvents_MessageEvent) isUpdateEvents_Event() {}
@ -285,6 +297,8 @@ func (*UpdateEvents_SettingsEvent) isUpdateEvents_Event() {}
func (*UpdateEvents_UserAlertEvent) isUpdateEvents_Event() {} func (*UpdateEvents_UserAlertEvent) isUpdateEvents_Event() {}
func (*UpdateEvents_BrowserPresenceCheckEvent) isUpdateEvents_Event() {}
type ConversationEvent struct { type ConversationEvent struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
@ -473,6 +487,44 @@ func (x *UserAlertEvent) GetAlertType() AlertType {
return AlertType_ALERT_TYPE_UNKNOWN return AlertType_ALERT_TYPE_UNKNOWN
} }
type BrowserPresenceCheckEvent struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
}
func (x *BrowserPresenceCheckEvent) Reset() {
*x = BrowserPresenceCheckEvent{}
if protoimpl.UnsafeEnabled {
mi := &file_events_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *BrowserPresenceCheckEvent) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*BrowserPresenceCheckEvent) ProtoMessage() {}
func (x *BrowserPresenceCheckEvent) ProtoReflect() protoreflect.Message {
mi := &file_events_proto_msgTypes[5]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use BrowserPresenceCheckEvent.ProtoReflect.Descriptor instead.
func (*BrowserPresenceCheckEvent) Descriptor() ([]byte, []int) {
return file_events_proto_rawDescGZIP(), []int{5}
}
type TypingData struct { type TypingData struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
@ -486,7 +538,7 @@ type TypingData struct {
func (x *TypingData) Reset() { func (x *TypingData) Reset() {
*x = TypingData{} *x = TypingData{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_events_proto_msgTypes[5] mi := &file_events_proto_msgTypes[6]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -499,7 +551,7 @@ func (x *TypingData) String() string {
func (*TypingData) ProtoMessage() {} func (*TypingData) ProtoMessage() {}
func (x *TypingData) ProtoReflect() protoreflect.Message { func (x *TypingData) ProtoReflect() protoreflect.Message {
mi := &file_events_proto_msgTypes[5] mi := &file_events_proto_msgTypes[6]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -512,7 +564,7 @@ func (x *TypingData) ProtoReflect() protoreflect.Message {
// Deprecated: Use TypingData.ProtoReflect.Descriptor instead. // Deprecated: Use TypingData.ProtoReflect.Descriptor instead.
func (*TypingData) Descriptor() ([]byte, []int) { func (*TypingData) Descriptor() ([]byte, []int) {
return file_events_proto_rawDescGZIP(), []int{5} return file_events_proto_rawDescGZIP(), []int{6}
} }
func (x *TypingData) GetConversationID() string { func (x *TypingData) GetConversationID() string {
@ -548,7 +600,7 @@ type User struct {
func (x *User) Reset() { func (x *User) Reset() {
*x = User{} *x = User{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_events_proto_msgTypes[6] mi := &file_events_proto_msgTypes[7]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -561,7 +613,7 @@ func (x *User) String() string {
func (*User) ProtoMessage() {} func (*User) ProtoMessage() {}
func (x *User) ProtoReflect() protoreflect.Message { func (x *User) ProtoReflect() protoreflect.Message {
mi := &file_events_proto_msgTypes[6] mi := &file_events_proto_msgTypes[7]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -574,7 +626,7 @@ func (x *User) ProtoReflect() protoreflect.Message {
// Deprecated: Use User.ProtoReflect.Descriptor instead. // Deprecated: Use User.ProtoReflect.Descriptor instead.
func (*User) Descriptor() ([]byte, []int) { func (*User) Descriptor() ([]byte, []int) {
return file_events_proto_rawDescGZIP(), []int{6} return file_events_proto_rawDescGZIP(), []int{7}
} }
func (x *User) GetField1() int64 { func (x *User) GetField1() int64 {
@ -606,7 +658,7 @@ type RPCPairData struct {
func (x *RPCPairData) Reset() { func (x *RPCPairData) Reset() {
*x = RPCPairData{} *x = RPCPairData{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_events_proto_msgTypes[7] mi := &file_events_proto_msgTypes[8]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -619,7 +671,7 @@ func (x *RPCPairData) String() string {
func (*RPCPairData) ProtoMessage() {} func (*RPCPairData) ProtoMessage() {}
func (x *RPCPairData) ProtoReflect() protoreflect.Message { func (x *RPCPairData) ProtoReflect() protoreflect.Message {
mi := &file_events_proto_msgTypes[7] mi := &file_events_proto_msgTypes[8]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -632,7 +684,7 @@ func (x *RPCPairData) ProtoReflect() protoreflect.Message {
// Deprecated: Use RPCPairData.ProtoReflect.Descriptor instead. // Deprecated: Use RPCPairData.ProtoReflect.Descriptor instead.
func (*RPCPairData) Descriptor() ([]byte, []int) { func (*RPCPairData) Descriptor() ([]byte, []int) {
return file_events_proto_rawDescGZIP(), []int{7} return file_events_proto_rawDescGZIP(), []int{8}
} }
func (m *RPCPairData) GetEvent() isRPCPairData_Event { func (m *RPCPairData) GetEvent() isRPCPairData_Event {
@ -690,7 +742,7 @@ func file_events_proto_rawDescGZIP() []byte {
} }
var file_events_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_events_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
var file_events_proto_msgTypes = make([]protoimpl.MessageInfo, 8) var file_events_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
var file_events_proto_goTypes = []interface{}{ var file_events_proto_goTypes = []interface{}{
(AlertType)(0), // 0: events.AlertType (AlertType)(0), // 0: events.AlertType
(TypingTypes)(0), // 1: events.TypingTypes (TypingTypes)(0), // 1: events.TypingTypes
@ -699,34 +751,36 @@ var file_events_proto_goTypes = []interface{}{
(*TypingEvent)(nil), // 4: events.TypingEvent (*TypingEvent)(nil), // 4: events.TypingEvent
(*MessageEvent)(nil), // 5: events.MessageEvent (*MessageEvent)(nil), // 5: events.MessageEvent
(*UserAlertEvent)(nil), // 6: events.UserAlertEvent (*UserAlertEvent)(nil), // 6: events.UserAlertEvent
(*TypingData)(nil), // 7: events.TypingData (*BrowserPresenceCheckEvent)(nil), // 7: events.BrowserPresenceCheckEvent
(*User)(nil), // 8: events.User (*TypingData)(nil), // 8: events.TypingData
(*RPCPairData)(nil), // 9: events.RPCPairData (*User)(nil), // 9: events.User
(*Settings)(nil), // 10: settings.Settings (*RPCPairData)(nil), // 10: events.RPCPairData
(*Conversation)(nil), // 11: conversations.Conversation (*Settings)(nil), // 11: settings.Settings
(*Message)(nil), // 12: conversations.Message (*Conversation)(nil), // 12: conversations.Conversation
(*PairedData)(nil), // 13: authentication.PairedData (*Message)(nil), // 13: conversations.Message
(*RevokePairData)(nil), // 14: authentication.RevokePairData (*PairedData)(nil), // 14: authentication.PairedData
(*RevokePairData)(nil), // 15: authentication.RevokePairData
} }
var file_events_proto_depIdxs = []int32{ var file_events_proto_depIdxs = []int32{
3, // 0: events.UpdateEvents.conversationEvent:type_name -> events.ConversationEvent 3, // 0: events.UpdateEvents.conversationEvent:type_name -> events.ConversationEvent
5, // 1: events.UpdateEvents.messageEvent:type_name -> events.MessageEvent 5, // 1: events.UpdateEvents.messageEvent:type_name -> events.MessageEvent
4, // 2: events.UpdateEvents.typingEvent:type_name -> events.TypingEvent 4, // 2: events.UpdateEvents.typingEvent:type_name -> events.TypingEvent
10, // 3: events.UpdateEvents.settingsEvent:type_name -> settings.Settings 11, // 3: events.UpdateEvents.settingsEvent:type_name -> settings.Settings
6, // 4: events.UpdateEvents.userAlertEvent:type_name -> events.UserAlertEvent 6, // 4: events.UpdateEvents.userAlertEvent:type_name -> events.UserAlertEvent
11, // 5: events.ConversationEvent.data:type_name -> conversations.Conversation 7, // 5: events.UpdateEvents.browserPresenceCheckEvent:type_name -> events.BrowserPresenceCheckEvent
7, // 6: events.TypingEvent.data:type_name -> events.TypingData 12, // 6: events.ConversationEvent.data:type_name -> conversations.Conversation
12, // 7: events.MessageEvent.data:type_name -> conversations.Message 8, // 7: events.TypingEvent.data:type_name -> events.TypingData
0, // 8: events.UserAlertEvent.alertType:type_name -> events.AlertType 13, // 8: events.MessageEvent.data:type_name -> conversations.Message
8, // 9: events.TypingData.user:type_name -> events.User 0, // 9: events.UserAlertEvent.alertType:type_name -> events.AlertType
1, // 10: events.TypingData.type:type_name -> events.TypingTypes 9, // 10: events.TypingData.user:type_name -> events.User
13, // 11: events.RPCPairData.paired:type_name -> authentication.PairedData 1, // 11: events.TypingData.type:type_name -> events.TypingTypes
14, // 12: events.RPCPairData.revoked:type_name -> authentication.RevokePairData 14, // 12: events.RPCPairData.paired:type_name -> authentication.PairedData
13, // [13:13] is the sub-list for method output_type 15, // 13: events.RPCPairData.revoked:type_name -> authentication.RevokePairData
13, // [13:13] is the sub-list for method input_type 14, // [14:14] is the sub-list for method output_type
13, // [13:13] is the sub-list for extension type_name 14, // [14:14] is the sub-list for method input_type
13, // [13:13] is the sub-list for extension extendee 14, // [14:14] is the sub-list for extension type_name
0, // [0:13] is the sub-list for field type_name 14, // [14:14] is the sub-list for extension extendee
0, // [0:14] is the sub-list for field type_name
} }
func init() { file_events_proto_init() } func init() { file_events_proto_init() }
@ -799,7 +853,7 @@ func file_events_proto_init() {
} }
} }
file_events_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { file_events_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*TypingData); i { switch v := v.(*BrowserPresenceCheckEvent); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -811,7 +865,7 @@ func file_events_proto_init() {
} }
} }
file_events_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { file_events_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*User); i { switch v := v.(*TypingData); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -823,6 +877,18 @@ func file_events_proto_init() {
} }
} }
file_events_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { file_events_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*User); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_events_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RPCPairData); i { switch v := v.(*RPCPairData); i {
case 0: case 0:
return &v.state return &v.state
@ -841,8 +907,9 @@ func file_events_proto_init() {
(*UpdateEvents_TypingEvent)(nil), (*UpdateEvents_TypingEvent)(nil),
(*UpdateEvents_SettingsEvent)(nil), (*UpdateEvents_SettingsEvent)(nil),
(*UpdateEvents_UserAlertEvent)(nil), (*UpdateEvents_UserAlertEvent)(nil),
(*UpdateEvents_BrowserPresenceCheckEvent)(nil),
} }
file_events_proto_msgTypes[7].OneofWrappers = []interface{}{ file_events_proto_msgTypes[8].OneofWrappers = []interface{}{
(*RPCPairData_Paired)(nil), (*RPCPairData_Paired)(nil),
(*RPCPairData_Revoked)(nil), (*RPCPairData_Revoked)(nil),
} }
@ -852,7 +919,7 @@ func file_events_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_events_proto_rawDesc, RawDescriptor: file_events_proto_rawDesc,
NumEnums: 2, NumEnums: 2,
NumMessages: 8, NumMessages: 9,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },

Binary file not shown.

View file

@ -41,7 +41,7 @@ func (c *Client) GetOrCreateConversation(req *gmproto.GetOrCreateConversationReq
} }
func (c *Client) GetConversationType(conversationID string) (*gmproto.GetConversationTypeResponse, error) { func (c *Client) GetConversationType(conversationID string) (*gmproto.GetConversationTypeResponse, error) {
payload := &gmproto.ConversationTypeRequest{ConversationID: conversationID} payload := &gmproto.GetConversationTypeRequest{ConversationID: conversationID}
actionType := gmproto.ActionType_GET_CONVERSATION_TYPE actionType := gmproto.ActionType_GET_CONVERSATION_TYPE
return typedResponse[*gmproto.GetConversationTypeResponse](c.sessionHandler.sendMessage(actionType, payload)) return typedResponse[*gmproto.GetConversationTypeResponse](c.sessionHandler.sendMessage(actionType, payload))
} }