From f3e866bf2f0e674212db053b15343f04c011a03f Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Fri, 30 Jun 2023 16:26:46 +0300 Subject: [PATCH] Fix most variable name casing --- libgm/binary/client.pb.go | 76 ++++---- libgm/binary/conversations.pb.go | 176 +++++++++--------- libgm/binary/events.pb.go | 14 +- libgm/binary/media.pb.go | 10 +- libgm/binary/messages.pb.go | 261 +++++++++++++-------------- libgm/binary/pairing.pb.go | 142 +++++++-------- libgm/binary/raw/client.proto | 6 +- libgm/binary/raw/conversations.proto | 36 ++-- libgm/binary/raw/events.proto | 2 +- libgm/binary/raw/media.proto | 2 +- libgm/binary/raw/messages.proto | 20 +- libgm/binary/raw/pairing.proto | 8 +- libgm/binary/raw/relay.proto | 2 +- libgm/binary/relay.pb.go | 6 +- libgm/bugle_service.go | 2 +- libgm/client.go | 10 +- libgm/conversations.go | 60 +++--- libgm/crypto/cryptor.go | 25 +-- libgm/events/useralerts.go | 6 +- libgm/handler_useralert.go | 2 +- libgm/image_builder.go | 8 +- libgm/media_processor.go | 26 +-- libgm/message_builder.go | 64 +++---- libgm/msg_handler.go | 4 +- libgm/payload/getWebEncryptionKey.go | 2 +- libgm/payload/receiveMessages.go | 4 +- libgm/payload/refreshPhoneRelay.go | 2 +- libgm/payload/registerPhoneRelay.go | 2 +- libgm/payload/sendMessage.go | 12 +- libgm/qr.go | 6 +- libgm/response_handler.go | 2 +- libgm/rpc.go | 2 +- libgm/session.go | 10 +- libgm/session_handler.go | 24 +-- 34 files changed, 517 insertions(+), 517 deletions(-) diff --git a/libgm/binary/client.pb.go b/libgm/binary/client.pb.go index e9eb1fe..a85ea21 100644 --- a/libgm/binary/client.pb.go +++ b/libgm/binary/client.pb.go @@ -28,7 +28,7 @@ type SendMessage struct { PairedDevice *Device `protobuf:"bytes,1,opt,name=pairedDevice,proto3" json:"pairedDevice,omitempty"` MessageData *MessageData `protobuf:"bytes,2,opt,name=messageData,proto3" json:"messageData,omitempty"` AuthData *AuthMessage `protobuf:"bytes,3,opt,name=authData,proto3" json:"authData,omitempty"` - Ttl int64 `protobuf:"varint,5,opt,name=ttl,proto3" json:"ttl,omitempty"` + TTL int64 `protobuf:"varint,5,opt,name=TTL,proto3" json:"TTL,omitempty"` EmptyArr *EmptyArr `protobuf:"bytes,9,opt,name=emptyArr,proto3" json:"emptyArr,omitempty"` } @@ -85,9 +85,9 @@ func (x *SendMessage) GetAuthData() *AuthMessage { return nil } -func (x *SendMessage) GetTtl() int64 { +func (x *SendMessage) GetTTL() int64 { if x != nil { - return x.Ttl + return x.TTL } return 0 } @@ -167,7 +167,7 @@ type AckMessageData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - RequestId string `protobuf:"bytes,1,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"` + RequestID string `protobuf:"bytes,1,opt,name=requestID,proto3" json:"requestID,omitempty"` Device *Device `protobuf:"bytes,2,opt,name=device,proto3" json:"device,omitempty"` } @@ -203,9 +203,9 @@ func (*AckMessageData) Descriptor() ([]byte, []int) { return file_client_proto_rawDescGZIP(), []int{2} } -func (x *AckMessageData) GetRequestId() string { +func (x *AckMessageData) GetRequestID() string { if x != nil { - return x.RequestId + return x.RequestID } return "" } @@ -222,7 +222,7 @@ type ImageMetaData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ImageId string `protobuf:"bytes,1,opt,name=imageId,proto3" json:"imageId,omitempty"` + ImageID string `protobuf:"bytes,1,opt,name=imageID,proto3" json:"imageID,omitempty"` Encrypted bool `protobuf:"varint,2,opt,name=encrypted,proto3" json:"encrypted,omitempty"` } @@ -258,9 +258,9 @@ func (*ImageMetaData) Descriptor() ([]byte, []int) { return file_client_proto_rawDescGZIP(), []int{3} } -func (x *ImageMetaData) GetImageId() string { +func (x *ImageMetaData) GetImageID() string { if x != nil { - return x.ImageId + return x.ImageID } return "" } @@ -437,8 +437,8 @@ var file_client_proto_rawDesc = []byte{ 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x31, 0x0a, 0x08, 0x61, 0x75, 0x74, 0x68, 0x44, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x08, - 0x61, 0x75, 0x74, 0x68, 0x44, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x74, 0x6c, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x74, 0x74, 0x6c, 0x12, 0x2e, 0x0a, 0x08, 0x65, 0x6d, + 0x61, 0x75, 0x74, 0x68, 0x44, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x54, 0x54, 0x4c, 0x18, + 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x54, 0x54, 0x4c, 0x12, 0x2e, 0x0a, 0x08, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x41, 0x72, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x41, 0x72, 0x72, 0x52, 0x08, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x41, 0x72, 0x72, 0x22, 0x8e, 0x01, 0x0a, 0x11, 0x41, @@ -450,33 +450,33 @@ var file_client_proto_rawDesc = []byte{ 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x41, 0x72, 0x72, 0x52, 0x08, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x41, 0x72, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x43, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x0c, 0x52, 0x06, 0x6e, 0x6f, 0x43, 0x6c, 0x75, 0x65, 0x22, 0x59, 0x0a, 0x0e, 0x41, - 0x63, 0x6b, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, - 0x0a, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, - 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x6d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x06, - 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x22, 0x47, 0x0a, 0x0d, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4d, - 0x65, 0x74, 0x61, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x6d, 0x61, 0x67, 0x65, - 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x49, - 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x65, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x22, - 0x7a, 0x0a, 0x12, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x50, 0x61, - 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x31, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x44, 0x61, 0x74, - 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, - 0x2e, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x44, 0x61, 0x74, 0x61, 0x52, 0x08, - 0x6d, 0x65, 0x74, 0x61, 0x44, 0x61, 0x74, 0x61, 0x12, 0x31, 0x0a, 0x08, 0x61, 0x75, 0x74, 0x68, - 0x44, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x6d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, - 0x65, 0x52, 0x08, 0x61, 0x75, 0x74, 0x68, 0x44, 0x61, 0x74, 0x61, 0x22, 0x3c, 0x0a, 0x13, 0x42, - 0x75, 0x67, 0x6c, 0x65, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x12, 0x25, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x11, 0x2e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x2e, 0x42, 0x75, 0x67, 0x6c, 0x65, 0x43, - 0x6f, 0x64, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x1f, 0x0a, 0x09, 0x42, 0x75, 0x67, - 0x6c, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x42, 0x0e, 0x5a, 0x0c, 0x2e, 0x2e, - 0x2f, 0x2e, 0x2e, 0x2f, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x01, 0x28, 0x0c, 0x52, 0x06, 0x6e, 0x6f, 0x43, 0x6c, 0x75, 0x65, 0x22, 0x58, 0x0a, 0x0e, 0x41, + 0x63, 0x6b, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1c, 0x0a, + 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x44, 0x12, 0x28, 0x0a, 0x06, 0x64, + 0x65, 0x76, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x6d, 0x65, + 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x06, 0x64, + 0x65, 0x76, 0x69, 0x63, 0x65, 0x22, 0x47, 0x0a, 0x0d, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, + 0x74, 0x61, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x49, + 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x49, 0x44, + 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x09, 0x65, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x22, 0x7a, + 0x0a, 0x12, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x50, 0x61, 0x79, + 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x31, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x44, 0x61, 0x74, 0x61, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x2e, + 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x44, 0x61, 0x74, 0x61, 0x52, 0x08, 0x6d, + 0x65, 0x74, 0x61, 0x44, 0x61, 0x74, 0x61, 0x12, 0x31, 0x0a, 0x08, 0x61, 0x75, 0x74, 0x68, 0x44, + 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x6d, 0x65, 0x73, 0x73, + 0x61, 0x67, 0x65, 0x73, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, + 0x52, 0x08, 0x61, 0x75, 0x74, 0x68, 0x44, 0x61, 0x74, 0x61, 0x22, 0x3c, 0x0a, 0x13, 0x42, 0x75, + 0x67, 0x6c, 0x65, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x12, 0x25, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x11, 0x2e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x2e, 0x42, 0x75, 0x67, 0x6c, 0x65, 0x43, 0x6f, + 0x64, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x1f, 0x0a, 0x09, 0x42, 0x75, 0x67, 0x6c, + 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x42, 0x0e, 0x5a, 0x0c, 0x2e, 0x2e, 0x2f, + 0x2e, 0x2e, 0x2f, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/libgm/binary/conversations.pb.go b/libgm/binary/conversations.pb.go index 8802909..37c9e61 100644 --- a/libgm/binary/conversations.pb.go +++ b/libgm/binary/conversations.pb.go @@ -147,9 +147,9 @@ type SendMessagePayload struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ConversationId string `protobuf:"bytes,2,opt,name=conversationId,proto3" json:"conversationId,omitempty"` + ConversationID string `protobuf:"bytes,2,opt,name=conversationID,proto3" json:"conversationID,omitempty"` MessagePayload *MessagePayload `protobuf:"bytes,3,opt,name=messagePayload,proto3" json:"messagePayload,omitempty"` - TmpId string `protobuf:"bytes,5,opt,name=tmpId,proto3" json:"tmpId,omitempty"` + TmpID string `protobuf:"bytes,5,opt,name=tmpID,proto3" json:"tmpID,omitempty"` } func (x *SendMessagePayload) Reset() { @@ -184,9 +184,9 @@ func (*SendMessagePayload) Descriptor() ([]byte, []int) { return file_conversations_proto_rawDescGZIP(), []int{0} } -func (x *SendMessagePayload) GetConversationId() string { +func (x *SendMessagePayload) GetConversationID() string { if x != nil { - return x.ConversationId + return x.ConversationID } return "" } @@ -198,9 +198,9 @@ func (x *SendMessagePayload) GetMessagePayload() *MessagePayload { return nil } -func (x *SendMessagePayload) GetTmpId() string { +func (x *SendMessagePayload) GetTmpID() string { if x != nil { - return x.TmpId + return x.TmpID } return "" } @@ -210,12 +210,12 @@ type MessagePayload struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - TmpId string `protobuf:"bytes,1,opt,name=tmpId,proto3" json:"tmpId,omitempty"` + TmpID string `protobuf:"bytes,1,opt,name=tmpID,proto3" json:"tmpID,omitempty"` MessagePayloadContent *MessagePayloadContent `protobuf:"bytes,6,opt,name=messagePayloadContent,proto3" json:"messagePayloadContent,omitempty"` - ConversationId string `protobuf:"bytes,7,opt,name=conversationId,proto3" json:"conversationId,omitempty"` - SelfParticipantId string `protobuf:"bytes,9,opt,name=selfParticipantId,proto3" json:"selfParticipantId,omitempty"` // might be participantId + ConversationID string `protobuf:"bytes,7,opt,name=conversationID,proto3" json:"conversationID,omitempty"` + SelfParticipantID string `protobuf:"bytes,9,opt,name=selfParticipantID,proto3" json:"selfParticipantID,omitempty"` // might be participantId MessageInfo []*MessageInfo `protobuf:"bytes,10,rep,name=messageInfo,proto3" json:"messageInfo,omitempty"` - TmpId2 string `protobuf:"bytes,12,opt,name=tmpId2,proto3" json:"tmpId2,omitempty"` + TmpID2 string `protobuf:"bytes,12,opt,name=tmpID2,proto3" json:"tmpID2,omitempty"` } func (x *MessagePayload) Reset() { @@ -250,9 +250,9 @@ func (*MessagePayload) Descriptor() ([]byte, []int) { return file_conversations_proto_rawDescGZIP(), []int{1} } -func (x *MessagePayload) GetTmpId() string { +func (x *MessagePayload) GetTmpID() string { if x != nil { - return x.TmpId + return x.TmpID } return "" } @@ -264,16 +264,16 @@ func (x *MessagePayload) GetMessagePayloadContent() *MessagePayloadContent { return nil } -func (x *MessagePayload) GetConversationId() string { +func (x *MessagePayload) GetConversationID() string { if x != nil { - return x.ConversationId + return x.ConversationID } return "" } -func (x *MessagePayload) GetSelfParticipantId() string { +func (x *MessagePayload) GetSelfParticipantID() string { if x != nil { - return x.SelfParticipantId + return x.SelfParticipantID } return "" } @@ -285,9 +285,9 @@ func (x *MessagePayload) GetMessageInfo() []*MessageInfo { return nil } -func (x *MessagePayload) GetTmpId2() string { +func (x *MessagePayload) GetTmpID2() string { if x != nil { - return x.TmpId2 + return x.TmpID2 } return "" } @@ -344,7 +344,7 @@ type OpenConversationPayload struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - 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 *OpenConversationPayload) Reset() { @@ -379,9 +379,9 @@ func (*OpenConversationPayload) Descriptor() ([]byte, []int) { return file_conversations_proto_rawDescGZIP(), []int{3} } -func (x *OpenConversationPayload) GetConversationId() string { +func (x *OpenConversationPayload) GetConversationID() string { if x != nil { - return x.ConversationId + return x.ConversationID } return "" } @@ -438,7 +438,7 @@ type FetchConversationMessagesPayload struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ConversationId string `protobuf:"bytes,2,opt,name=conversationId,proto3" json:"conversationId,omitempty"` + ConversationID string `protobuf:"bytes,2,opt,name=conversationID,proto3" json:"conversationID,omitempty"` Count int64 `protobuf:"varint,3,opt,name=count,proto3" json:"count,omitempty"` Cursor *Cursor `protobuf:"bytes,5,opt,name=cursor,proto3" json:"cursor,omitempty"` } @@ -475,9 +475,9 @@ func (*FetchConversationMessagesPayload) Descriptor() ([]byte, []int) { return file_conversations_proto_rawDescGZIP(), []int{5} } -func (x *FetchConversationMessagesPayload) GetConversationId() string { +func (x *FetchConversationMessagesPayload) GetConversationID() string { if x != nil { - return x.ConversationId + return x.ConversationID } return "" } @@ -682,12 +682,12 @@ type Message struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - MessageId string `protobuf:"bytes,1,opt,name=messageId,proto3" json:"messageId,omitempty"` + MessageID string `protobuf:"bytes,1,opt,name=messageID,proto3" json:"messageID,omitempty"` From *IsFromMe `protobuf:"bytes,3,opt,name=from,proto3" json:"from,omitempty"` MessageStatus *MessageStatus `protobuf:"bytes,4,opt,name=messageStatus,proto3" json:"messageStatus,omitempty"` Timestamp int64 `protobuf:"varint,5,opt,name=timestamp,proto3" json:"timestamp,omitempty"` - ConversationId string `protobuf:"bytes,7,opt,name=conversationId,proto3" json:"conversationId,omitempty"` - ParticipantId string `protobuf:"bytes,9,opt,name=participantId,proto3" json:"participantId,omitempty"` + ConversationID string `protobuf:"bytes,7,opt,name=conversationID,proto3" json:"conversationID,omitempty"` + ParticipantID string `protobuf:"bytes,9,opt,name=participantID,proto3" json:"participantID,omitempty"` MessageInfo []*MessageInfo `protobuf:"bytes,10,rep,name=messageInfo,proto3" json:"messageInfo,omitempty"` Type MessageType `protobuf:"varint,11,opt,name=type,proto3,enum=conversations.MessageType" json:"type,omitempty"` TmpId string `protobuf:"bytes,12,opt,name=tmpId,proto3" json:"tmpId,omitempty"` @@ -725,9 +725,9 @@ func (*Message) Descriptor() ([]byte, []int) { return file_conversations_proto_rawDescGZIP(), []int{9} } -func (x *Message) GetMessageId() string { +func (x *Message) GetMessageID() string { if x != nil { - return x.MessageId + return x.MessageID } return "" } @@ -753,16 +753,16 @@ func (x *Message) GetTimestamp() int64 { return 0 } -func (x *Message) GetConversationId() string { +func (x *Message) GetConversationID() string { if x != nil { - return x.ConversationId + return x.ConversationID } return "" } -func (x *Message) GetParticipantId() string { +func (x *Message) GetParticipantID() string { if x != nil { - return x.ParticipantId + return x.ParticipantID } return "" } @@ -883,12 +883,12 @@ type ImageContent struct { unknownFields protoimpl.UnknownFields SomeNumber int64 `protobuf:"varint,1,opt,name=someNumber,proto3" json:"someNumber,omitempty"` - ImageId string `protobuf:"bytes,2,opt,name=imageId,proto3" json:"imageId,omitempty"` + ImageID string `protobuf:"bytes,2,opt,name=imageID,proto3" json:"imageID,omitempty"` ImageName string `protobuf:"bytes,4,opt,name=imageName,proto3" json:"imageName,omitempty"` Size int64 `protobuf:"varint,5,opt,name=size,proto3" json:"size,omitempty"` Pixels *ImagePixels `protobuf:"bytes,6,opt,name=pixels,proto3" json:"pixels,omitempty"` ImageData []byte `protobuf:"bytes,7,opt,name=imageData,proto3" json:"imageData,omitempty"` - ImageId2 string `protobuf:"bytes,9,opt,name=imageId2,proto3" json:"imageId2,omitempty"` + ImageID2 string `protobuf:"bytes,9,opt,name=imageID2,proto3" json:"imageID2,omitempty"` DecryptionKey []byte `protobuf:"bytes,11,opt,name=decryptionKey,proto3" json:"decryptionKey,omitempty"` DecryptionKey2 []byte `protobuf:"bytes,12,opt,name=decryptionKey2,proto3" json:"decryptionKey2,omitempty"` // same value as decryptionkey? } @@ -932,9 +932,9 @@ func (x *ImageContent) GetSomeNumber() int64 { return 0 } -func (x *ImageContent) GetImageId() string { +func (x *ImageContent) GetImageID() string { if x != nil { - return x.ImageId + return x.ImageID } return "" } @@ -967,9 +967,9 @@ func (x *ImageContent) GetImageData() []byte { return nil } -func (x *ImageContent) GetImageId2() string { +func (x *ImageContent) GetImageID2() string { if x != nil { - return x.ImageId2 + return x.ImageID2 } return "" } @@ -1259,16 +1259,16 @@ type Conversation struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ConversationId string `protobuf:"bytes,1,opt,name=conversationId,proto3" json:"conversationId,omitempty"` + ConversationID string `protobuf:"bytes,1,opt,name=conversationID,proto3" json:"conversationID,omitempty"` Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` LatestMessage *LatestMessage `protobuf:"bytes,4,opt,name=latestMessage,proto3" json:"latestMessage,omitempty"` - TimestampMs int64 `protobuf:"varint,5,opt,name=timestampMs,proto3" json:"timestampMs,omitempty"` + TimestampMS int64 `protobuf:"varint,5,opt,name=timestampMS,proto3" json:"timestampMS,omitempty"` IsGroupChat bool `protobuf:"varint,10,opt,name=isGroupChat,proto3" json:"isGroupChat,omitempty"` // not certain - SelfParticipantId string `protobuf:"bytes,11,opt,name=selfParticipantId,proto3" json:"selfParticipantId,omitempty"` + SelfParticipantID string `protobuf:"bytes,11,opt,name=selfParticipantID,proto3" json:"selfParticipantID,omitempty"` // bool bool1 = 13; Status int64 `protobuf:"varint,12,opt,name=status,proto3" json:"status,omitempty"` HashHex string `protobuf:"bytes,15,opt,name=hashHex,proto3" json:"hashHex,omitempty"` - MessageId string `protobuf:"bytes,17,opt,name=messageId,proto3" json:"messageId,omitempty"` + MessageID string `protobuf:"bytes,17,opt,name=messageID,proto3" json:"messageID,omitempty"` Participants []*Participant `protobuf:"bytes,20,rep,name=participants,proto3" json:"participants,omitempty"` OtherParticipants []string `protobuf:"bytes,21,rep,name=otherParticipants,proto3" json:"otherParticipants,omitempty"` // participant ids excluding me Type int64 `protobuf:"varint,22,opt,name=type,proto3" json:"type,omitempty"` @@ -1306,9 +1306,9 @@ func (*Conversation) Descriptor() ([]byte, []int) { return file_conversations_proto_rawDescGZIP(), []int{17} } -func (x *Conversation) GetConversationId() string { +func (x *Conversation) GetConversationID() string { if x != nil { - return x.ConversationId + return x.ConversationID } return "" } @@ -1327,9 +1327,9 @@ func (x *Conversation) GetLatestMessage() *LatestMessage { return nil } -func (x *Conversation) GetTimestampMs() int64 { +func (x *Conversation) GetTimestampMS() int64 { if x != nil { - return x.TimestampMs + return x.TimestampMS } return 0 } @@ -1341,9 +1341,9 @@ func (x *Conversation) GetIsGroupChat() bool { return false } -func (x *Conversation) GetSelfParticipantId() string { +func (x *Conversation) GetSelfParticipantID() string { if x != nil { - return x.SelfParticipantId + return x.SelfParticipantID } return "" } @@ -1362,9 +1362,9 @@ func (x *Conversation) GetHashHex() string { return "" } -func (x *Conversation) GetMessageId() string { +func (x *Conversation) GetMessageID() string { if x != nil { - return x.MessageId + return x.MessageID } return "" } @@ -1485,7 +1485,7 @@ type SmallInfo struct { Type int64 `protobuf:"varint,1,opt,name=type,proto3" json:"type,omitempty"` Number string `protobuf:"bytes,2,opt,name=number,proto3" json:"number,omitempty"` - ParticipantId string `protobuf:"bytes,3,opt,name=participantId,proto3" json:"participantId,omitempty"` + ParticipantID string `protobuf:"bytes,3,opt,name=participantID,proto3" json:"participantID,omitempty"` } func (x *SmallInfo) Reset() { @@ -1534,9 +1534,9 @@ func (x *SmallInfo) GetNumber() string { return "" } -func (x *SmallInfo) GetParticipantId() string { +func (x *SmallInfo) GetParticipantID() string { if x != nil { - return x.ParticipantId + return x.ParticipantID } return "" } @@ -1713,33 +1713,33 @@ var file_conversations_proto_rawDesc = []byte{ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0d, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x99, 0x01, 0x0a, 0x12, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x26, 0x0a, 0x0e, 0x63, - 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, + 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x49, 0x64, 0x12, 0x45, 0x0a, 0x0e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x50, 0x61, + 0x6e, 0x49, 0x44, 0x12, 0x45, 0x0a, 0x0e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x0e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6d, - 0x70, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6d, 0x70, 0x49, 0x64, + 0x70, 0x49, 0x44, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6d, 0x70, 0x49, 0x44, 0x22, 0xae, 0x02, 0x0a, 0x0e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x50, 0x61, 0x79, 0x6c, - 0x6f, 0x61, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x05, 0x74, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x5a, 0x0a, 0x15, 0x6d, 0x65, 0x73, + 0x6f, 0x61, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6d, 0x70, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x05, 0x74, 0x6d, 0x70, 0x49, 0x44, 0x12, 0x5a, 0x0a, 0x15, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x52, 0x15, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, - 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x2c, 0x0a, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, + 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x12, 0x2c, 0x0a, 0x11, 0x73, 0x65, 0x6c, 0x66, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, - 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x73, 0x65, 0x6c, 0x66, 0x50, 0x61, - 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x3c, 0x0a, 0x0b, 0x6d, + 0x49, 0x44, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x73, 0x65, 0x6c, 0x66, 0x50, 0x61, + 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x49, 0x44, 0x12, 0x3c, 0x0a, 0x0b, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0b, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x6d, 0x70, - 0x49, 0x64, 0x32, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x6d, 0x70, 0x49, 0x64, + 0x49, 0x44, 0x32, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x6d, 0x70, 0x49, 0x44, 0x32, 0x22, 0x5e, 0x0a, 0x15, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x45, 0x0a, 0x0e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, @@ -1748,17 +1748,17 @@ var file_conversations_proto_rawDesc = []byte{ 0x74, 0x52, 0x0e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x22, 0x41, 0x0a, 0x17, 0x4f, 0x70, 0x65, 0x6e, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x26, 0x0a, 0x0e, - 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, + 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x38, 0x0a, 0x1e, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, + 0x6f, 0x6e, 0x49, 0x44, 0x22, 0x38, 0x0a, 0x1e, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x70, 0x65, 0x6e, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x32, 0x22, 0x8f, 0x01, 0x0a, 0x20, 0x46, 0x65, 0x74, 0x63, 0x68, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x6f, 0x6e, - 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, + 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x6f, 0x6e, + 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2d, 0x0a, 0x06, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, @@ -1785,8 +1785,8 @@ var file_conversations_proto_rawDesc = []byte{ 0x0a, 0x0a, 0x6e, 0x65, 0x78, 0x74, 0x43, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x6e, 0x65, 0x78, 0x74, 0x43, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x22, 0x88, 0x03, 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, - 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x64, 0x12, 0x2b, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, + 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x44, 0x12, 0x2b, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x49, 0x73, 0x46, 0x72, 0x6f, 0x6d, 0x4d, 0x65, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x42, 0x0a, 0x0d, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, @@ -1796,11 +1796,11 @@ var file_conversations_proto_rawDesc = []byte{ 0x61, 0x67, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x76, 0x65, - 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0e, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, - 0x24, 0x0a, 0x0d, 0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x49, 0x64, + 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0e, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x12, + 0x24, 0x0a, 0x0d, 0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x49, 0x44, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, - 0x61, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x3c, 0x0a, 0x0b, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, + 0x61, 0x6e, 0x74, 0x49, 0x44, 0x12, 0x3c, 0x0a, 0x0b, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0b, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, @@ -1824,8 +1824,8 @@ var file_conversations_proto_rawDesc = []byte{ 0x61, 0x74, 0x61, 0x22, 0xb6, 0x02, 0x0a, 0x0c, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x6f, 0x6d, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x73, 0x6f, 0x6d, 0x65, 0x4e, 0x75, - 0x6d, 0x62, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x49, 0x64, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x49, 0x64, 0x12, 0x1c, + 0x6d, 0x62, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x49, 0x44, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, @@ -1834,8 +1834,8 @@ var file_conversations_proto_rawDesc = []byte{ 0x2e, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x50, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x52, 0x06, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x44, 0x61, - 0x74, 0x61, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x49, 0x64, 0x32, 0x18, 0x09, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x49, 0x64, 0x32, 0x12, 0x24, + 0x74, 0x61, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x49, 0x44, 0x32, 0x18, 0x09, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x49, 0x44, 0x32, 0x12, 0x24, 0x0a, 0x0d, 0x64, 0x65, 0x63, 0x72, 0x79, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x64, 0x65, 0x63, 0x72, 0x79, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x0e, 0x64, 0x65, 0x63, 0x72, 0x79, 0x70, 0x74, 0x69, @@ -1862,26 +1862,26 @@ var file_conversations_proto_rawDesc = []byte{ 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xd2, 0x03, 0x0a, 0x0c, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, - 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, - 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x44, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x42, 0x0a, 0x0d, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x4c, 0x61, 0x74, 0x65, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x0d, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x69, 0x6d, - 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x4d, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, - 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x4d, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x69, + 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x4d, 0x53, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, + 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x4d, 0x53, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x73, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x43, 0x68, 0x61, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x43, 0x68, 0x61, 0x74, 0x12, 0x2c, 0x0a, 0x11, 0x73, 0x65, 0x6c, 0x66, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, - 0x49, 0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x73, 0x65, 0x6c, 0x66, 0x50, 0x61, - 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, + 0x49, 0x44, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x73, 0x65, 0x6c, 0x66, 0x50, 0x61, + 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x61, 0x73, 0x68, 0x48, 0x65, 0x78, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x68, 0x61, 0x73, 0x68, 0x48, 0x65, 0x78, 0x12, 0x1c, 0x0a, - 0x09, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x09, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x64, 0x12, 0x3e, 0x0a, 0x0c, 0x70, + 0x09, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x44, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x09, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x44, 0x12, 0x3e, 0x0a, 0x0c, 0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x52, 0x0c, 0x70, @@ -1907,8 +1907,8 @@ var file_conversations_proto_rawDesc = []byte{ 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x70, 0x61, - 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0d, 0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x49, 0x64, + 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0d, 0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x49, 0x44, 0x22, 0x63, 0x0a, 0x0d, 0x4c, 0x61, 0x74, 0x65, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 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, 0x16, 0x0a, 0x06, 0x66, diff --git a/libgm/binary/events.pb.go b/libgm/binary/events.pb.go index 939457e..9013de4 100644 --- a/libgm/binary/events.pb.go +++ b/libgm/binary/events.pb.go @@ -227,7 +227,7 @@ type UserAlertEvent struct { // 3|4 = DATA_CONNECTION (tf?) // // 10 = OBSERVER_REGISTERED (tf?) - AlertType int64 `protobuf:"varint,2,opt,name=alert_type,json=alertType,proto3" json:"alert_type,omitempty"` + AlertType int64 `protobuf:"varint,2,opt,name=alertType,proto3" json:"alertType,omitempty"` } func (x *UserAlertEvent) Reset() { @@ -296,12 +296,12 @@ var file_events_proto_rawDesc = []byte{ 0x0c, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x2a, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x4d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2f, 0x0a, 0x0e, 0x55, 0x73, 0x65, - 0x72, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x61, - 0x6c, 0x65, 0x72, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x09, 0x61, 0x6c, 0x65, 0x72, 0x74, 0x54, 0x79, 0x70, 0x65, 0x42, 0x0e, 0x5a, 0x0c, 0x2e, 0x2e, - 0x2f, 0x2e, 0x2e, 0x2f, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x61, 0x67, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x0e, 0x55, 0x73, 0x65, + 0x72, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, + 0x6c, 0x65, 0x72, 0x74, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, + 0x61, 0x6c, 0x65, 0x72, 0x74, 0x54, 0x79, 0x70, 0x65, 0x42, 0x0e, 0x5a, 0x0c, 0x2e, 0x2e, 0x2f, + 0x2e, 0x2e, 0x2f, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/libgm/binary/media.pb.go b/libgm/binary/media.pb.go index 9dc5863..48862fe 100644 --- a/libgm/binary/media.pb.go +++ b/libgm/binary/media.pb.go @@ -143,7 +143,7 @@ type Media struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - MediaId string `protobuf:"bytes,1,opt,name=mediaId,proto3" json:"mediaId,omitempty"` + MediaID string `protobuf:"bytes,1,opt,name=mediaID,proto3" json:"mediaID,omitempty"` MediaNumber int64 `protobuf:"varint,2,opt,name=mediaNumber,proto3" json:"mediaNumber,omitempty"` } @@ -179,9 +179,9 @@ func (*Media) Descriptor() ([]byte, []int) { return file_media_proto_rawDescGZIP(), []int{2} } -func (x *Media) GetMediaId() string { +func (x *Media) GetMediaID() string { if x != nil { - return x.MediaId + return x.MediaID } return "" } @@ -214,8 +214,8 @@ var file_media_proto_rawDesc = []byte{ 0x05, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x43, 0x0a, 0x05, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x64, - 0x69, 0x61, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x64, 0x69, - 0x61, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x4e, 0x75, 0x6d, 0x62, + 0x69, 0x61, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x64, 0x69, + 0x61, 0x49, 0x44, 0x12, 0x20, 0x0a, 0x0b, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x42, 0x0e, 0x5a, 0x0c, 0x2e, 0x2e, 0x2f, 0x2e, 0x2e, 0x2f, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/libgm/binary/messages.pb.go b/libgm/binary/messages.pb.go index bf6840c..8b3e732 100644 --- a/libgm/binary/messages.pb.go +++ b/libgm/binary/messages.pb.go @@ -25,10 +25,10 @@ type EncodedPayload struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - RequestId string `protobuf:"bytes,1,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"` + RequestID string `protobuf:"bytes,1,opt,name=requestID,proto3" json:"requestID,omitempty"` Opcode int64 `protobuf:"varint,2,opt,name=opcode,proto3" json:"opcode,omitempty"` EncryptedData []byte `protobuf:"bytes,5,opt,name=encryptedData,proto3" json:"encryptedData,omitempty"` - SessionId string `protobuf:"bytes,6,opt,name=session_id,json=sessionId,proto3" json:"session_id,omitempty"` + SessionID string `protobuf:"bytes,6,opt,name=sessionID,proto3" json:"sessionID,omitempty"` } func (x *EncodedPayload) Reset() { @@ -63,9 +63,9 @@ func (*EncodedPayload) Descriptor() ([]byte, []int) { return file_messages_proto_rawDescGZIP(), []int{0} } -func (x *EncodedPayload) GetRequestId() string { +func (x *EncodedPayload) GetRequestID() string { if x != nil { - return x.RequestId + return x.RequestID } return "" } @@ -84,9 +84,9 @@ func (x *EncodedPayload) GetEncryptedData() []byte { return nil } -func (x *EncodedPayload) GetSessionId() string { +func (x *EncodedPayload) GetSessionID() string { if x != nil { - return x.SessionId + return x.SessionID } return "" } @@ -96,7 +96,7 @@ type EncodedResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - RequestId string `protobuf:"bytes,1,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"` + RequestID string `protobuf:"bytes,1,opt,name=requestID,proto3" json:"requestID,omitempty"` // int64 msg = 2; UnixNano int64 `protobuf:"varint,3,opt,name=unixNano,proto3" json:"unixNano,omitempty"` Opcode int64 `protobuf:"varint,4,opt,name=opcode,proto3" json:"opcode,omitempty"` @@ -139,9 +139,9 @@ func (*EncodedResponse) Descriptor() ([]byte, []int) { return file_messages_proto_rawDescGZIP(), []int{1} } -func (x *EncodedResponse) GetRequestId() string { +func (x *EncodedResponse) GetRequestID() string { if x != nil { - return x.RequestId + return x.RequestID } return "" } @@ -193,8 +193,8 @@ type MessageData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - RequestId string `protobuf:"bytes,1,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"` - RoutingOpCode int64 `protobuf:"varint,2,opt,name=routing_op_code,json=routingOpCode,proto3" json:"routing_op_code,omitempty"` + RequestID string `protobuf:"bytes,1,opt,name=requestID,proto3" json:"requestID,omitempty"` + RoutingOpCode int64 `protobuf:"varint,2,opt,name=routingOpCode,proto3" json:"routingOpCode,omitempty"` Ts1 string `protobuf:"bytes,3,opt,name=ts1,proto3" json:"ts1,omitempty"` Field5 int64 `protobuf:"varint,5,opt,name=field5,proto3" json:"field5,omitempty"` Ts2 string `protobuf:"bytes,6,opt,name=ts2,proto3" json:"ts2,omitempty"` @@ -202,7 +202,7 @@ type MessageData struct { Mobile *Device `protobuf:"bytes,8,opt,name=mobile,proto3" json:"mobile,omitempty"` Browser *Device `protobuf:"bytes,9,opt,name=browser,proto3" json:"browser,omitempty"` EncodedData string `protobuf:"bytes,12,opt,name=encodedData,proto3" json:"encodedData,omitempty"` - EncodedRequestId string `protobuf:"bytes,17,opt,name=encoded_request_id,json=encodedRequestId,proto3" json:"encoded_request_id,omitempty"` + EncodedRequestID string `protobuf:"bytes,17,opt,name=encodedRequestID,proto3" json:"encodedRequestID,omitempty"` MsgTypeArr *MsgTypeArr `protobuf:"bytes,23,opt,name=msgTypeArr,proto3" json:"msgTypeArr,omitempty"` } @@ -238,9 +238,9 @@ func (*MessageData) Descriptor() ([]byte, []int) { return file_messages_proto_rawDescGZIP(), []int{2} } -func (x *MessageData) GetRequestId() string { +func (x *MessageData) GetRequestID() string { if x != nil { - return x.RequestId + return x.RequestID } return "" } @@ -301,9 +301,9 @@ func (x *MessageData) GetEncodedData() string { return "" } -func (x *MessageData) GetEncodedRequestId() string { +func (x *MessageData) GetEncodedRequestID() string { if x != nil { - return x.EncodedRequestId + return x.EncodedRequestID } return "" } @@ -413,7 +413,7 @@ type AuthMessage struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - RequestId string `protobuf:"bytes,1,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"` + RequestID string `protobuf:"bytes,1,opt,name=requestID,proto3" json:"requestID,omitempty"` RpcKey []byte `protobuf:"bytes,6,opt,name=rpcKey,proto3" json:"rpcKey,omitempty"` Date *Date `protobuf:"bytes,7,opt,name=date,proto3" json:"date,omitempty"` } @@ -450,9 +450,9 @@ func (*AuthMessage) Descriptor() ([]byte, []int) { return file_messages_proto_rawDescGZIP(), []int{5} } -func (x *AuthMessage) GetRequestId() string { +func (x *AuthMessage) GetRequestID() string { if x != nil { - return x.RequestId + return x.RequestID } return "" } @@ -531,7 +531,7 @@ type BaseData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Ttl int64 `protobuf:"varint,2,opt,name=Ttl,proto3" json:"Ttl,omitempty"` + TTL int64 `protobuf:"varint,2,opt,name=TTL,proto3" json:"TTL,omitempty"` EmptyArr *EmptyArr `protobuf:"bytes,6,opt,name=emptyArr,proto3" json:"emptyArr,omitempty"` } @@ -567,9 +567,9 @@ func (*BaseData) Descriptor() ([]byte, []int) { return file_messages_proto_rawDescGZIP(), []int{7} } -func (x *BaseData) GetTtl() int64 { +func (x *BaseData) GetTTL() int64 { if x != nil { - return x.Ttl + return x.TTL } return 0 } @@ -641,8 +641,8 @@ type Device struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - UserId int64 `protobuf:"varint,1,opt,name=userId,proto3" json:"userId,omitempty"` - RegistrationId string `protobuf:"bytes,2,opt,name=registrationId,proto3" json:"registrationId,omitempty"` + UserID int64 `protobuf:"varint,1,opt,name=userID,proto3" json:"userID,omitempty"` + RegistrationID string `protobuf:"bytes,2,opt,name=registrationID,proto3" json:"registrationID,omitempty"` Network string `protobuf:"bytes,3,opt,name=network,proto3" json:"network,omitempty"` } @@ -678,16 +678,16 @@ func (*Device) Descriptor() ([]byte, []int) { return file_messages_proto_rawDescGZIP(), []int{9} } -func (x *Device) GetUserId() int64 { +func (x *Device) GetUserID() int64 { if x != nil { - return x.UserId + return x.UserID } return 0 } -func (x *Device) GetRegistrationId() string { +func (x *Device) GetRegistrationID() string { if x != nil { - return x.RegistrationId + return x.RegistrationID } return "" } @@ -867,110 +867,109 @@ var File_messages_proto protoreflect.FileDescriptor var file_messages_proto_rawDesc = []byte{ 0x0a, 0x0e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x12, 0x08, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x22, 0x8c, 0x01, 0x0a, 0x0e, 0x45, - 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x64, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x1d, 0x0a, - 0x0a, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, - 0x6f, 0x70, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6f, 0x70, - 0x63, 0x6f, 0x64, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x65, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x65, - 0x64, 0x44, 0x61, 0x74, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x65, 0x6e, 0x63, - 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x65, - 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, - 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0xca, 0x01, 0x0a, 0x0f, 0x45, 0x6e, - 0x63, 0x6f, 0x64, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1d, 0x0a, - 0x0a, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, - 0x75, 0x6e, 0x69, 0x78, 0x4e, 0x61, 0x6e, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, - 0x75, 0x6e, 0x69, 0x78, 0x4e, 0x61, 0x6e, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x70, 0x63, 0x6f, - 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6f, 0x70, 0x63, 0x6f, 0x64, 0x65, - 0x12, 0x10, 0x0a, 0x03, 0x73, 0x75, 0x62, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x73, - 0x75, 0x62, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x68, 0x69, 0x72, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x05, 0x74, 0x68, 0x69, 0x72, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x65, 0x6e, 0x63, 0x72, - 0x79, 0x70, 0x74, 0x65, 0x64, 0x44, 0x61, 0x74, 0x61, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0c, 0x52, - 0x0d, 0x65, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, - 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x39, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, - 0x66, 0x69, 0x65, 0x6c, 0x64, 0x39, 0x22, 0x8c, 0x03, 0x0a, 0x0b, 0x4d, 0x65, 0x73, 0x73, 0x61, - 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x49, 0x64, 0x12, 0x26, 0x0a, 0x0f, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, - 0x5f, 0x6f, 0x70, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, - 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, - 0x03, 0x74, 0x73, 0x31, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x74, 0x73, 0x31, 0x12, - 0x16, 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x35, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x35, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x73, 0x32, 0x18, 0x06, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x74, 0x73, 0x32, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x6f, 0x6d, - 0x65, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, - 0x6f, 0x6d, 0x65, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x28, 0x0a, 0x06, 0x6d, 0x6f, 0x62, - 0x69, 0x6c, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x6d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x73, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x06, 0x6d, 0x6f, 0x62, - 0x69, 0x6c, 0x65, 0x12, 0x2a, 0x0a, 0x07, 0x62, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x18, 0x09, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, - 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x07, 0x62, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x12, - 0x20, 0x0a, 0x0b, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x64, 0x44, 0x61, 0x74, 0x61, 0x18, 0x0c, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x64, 0x44, 0x61, 0x74, - 0x61, 0x12, 0x2c, 0x0a, 0x12, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x64, 0x5f, 0x72, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x65, - 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64, 0x12, - 0x34, 0x0a, 0x0a, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x41, 0x72, 0x72, 0x18, 0x17, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x4d, - 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x41, 0x72, 0x72, 0x52, 0x0a, 0x6d, 0x73, 0x67, 0x54, 0x79, - 0x70, 0x65, 0x41, 0x72, 0x72, 0x22, 0x56, 0x0a, 0x0a, 0x4d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, - 0x41, 0x72, 0x72, 0x12, 0x2e, 0x0a, 0x08, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x41, 0x72, 0x72, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, - 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x41, 0x72, 0x72, 0x52, 0x08, 0x65, 0x6d, 0x70, 0x74, 0x79, - 0x41, 0x72, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x22, 0x0a, 0x0a, - 0x08, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x41, 0x72, 0x72, 0x22, 0x68, 0x0a, 0x0b, 0x41, 0x75, 0x74, - 0x68, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x70, 0x63, 0x4b, 0x65, - 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x72, 0x70, 0x63, 0x4b, 0x65, 0x79, 0x12, - 0x22, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, - 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x44, 0x61, 0x74, 0x65, 0x52, 0x04, 0x64, - 0x61, 0x74, 0x65, 0x22, 0xa2, 0x02, 0x0a, 0x16, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x4d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x29, - 0x0a, 0x04, 0x61, 0x75, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x6d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x4d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x52, 0x04, 0x61, 0x75, 0x74, 0x68, 0x12, 0x53, 0x0a, 0x07, 0x75, 0x6e, 0x6b, - 0x6e, 0x6f, 0x77, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x6d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x4d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x6e, 0x6b, - 0x6e, 0x6f, 0x77, 0x6e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x32, - 0x48, 0x00, 0x52, 0x07, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x88, 0x01, 0x01, 0x1a, 0x15, - 0x0a, 0x13, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x4f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x31, 0x1a, 0x65, 0x0a, 0x13, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, - 0x45, 0x6d, 0x70, 0x74, 0x79, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x32, 0x12, 0x4e, 0x0a, 0x07, - 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, - 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, - 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, + 0x12, 0x08, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x22, 0x8a, 0x01, 0x0a, 0x0e, 0x45, + 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x64, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x1c, 0x0a, + 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x6f, + 0x70, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6f, 0x70, 0x63, + 0x6f, 0x64, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x65, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, + 0x44, 0x61, 0x74, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x65, 0x6e, 0x63, 0x72, + 0x79, 0x70, 0x74, 0x65, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x65, 0x73, + 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x65, + 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x22, 0xc9, 0x01, 0x0a, 0x0f, 0x45, 0x6e, 0x63, 0x6f, + 0x64, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, + 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x44, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x6e, 0x69, + 0x78, 0x4e, 0x61, 0x6e, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x75, 0x6e, 0x69, + 0x78, 0x4e, 0x61, 0x6e, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x70, 0x63, 0x6f, 0x64, 0x65, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6f, 0x70, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, + 0x03, 0x73, 0x75, 0x62, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x73, 0x75, 0x62, 0x12, + 0x14, 0x0a, 0x05, 0x74, 0x68, 0x69, 0x72, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, + 0x74, 0x68, 0x69, 0x72, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x65, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, + 0x65, 0x64, 0x44, 0x61, 0x74, 0x61, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x65, 0x6e, + 0x63, 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x66, + 0x69, 0x65, 0x6c, 0x64, 0x39, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x66, 0x69, 0x65, + 0x6c, 0x64, 0x39, 0x22, 0x87, 0x03, 0x0a, 0x0b, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x44, + 0x61, 0x74, 0x61, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x44, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, + 0x44, 0x12, 0x24, 0x0a, 0x0d, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x4f, 0x70, 0x43, 0x6f, + 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, + 0x67, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x73, 0x31, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x74, 0x73, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x65, + 0x6c, 0x64, 0x35, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, + 0x35, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x73, 0x32, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x74, 0x73, 0x32, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x6f, 0x6d, 0x65, 0x53, 0x74, 0x72, 0x69, 0x6e, + 0x67, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x6f, 0x6d, 0x65, 0x53, 0x74, 0x72, + 0x69, 0x6e, 0x67, 0x12, 0x28, 0x0a, 0x06, 0x6d, 0x6f, 0x62, 0x69, 0x6c, 0x65, 0x18, 0x08, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x44, + 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x06, 0x6d, 0x6f, 0x62, 0x69, 0x6c, 0x65, 0x12, 0x2a, 0x0a, + 0x07, 0x62, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, + 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, + 0x52, 0x07, 0x62, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x12, 0x20, 0x0a, 0x0b, 0x65, 0x6e, 0x63, + 0x6f, 0x64, 0x65, 0x64, 0x44, 0x61, 0x74, 0x61, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, + 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2a, 0x0a, 0x10, 0x65, + 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x44, 0x18, + 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x64, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x44, 0x12, 0x34, 0x0a, 0x0a, 0x6d, 0x73, 0x67, 0x54, 0x79, + 0x70, 0x65, 0x41, 0x72, 0x72, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x65, + 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x4d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x41, 0x72, + 0x72, 0x52, 0x0a, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x41, 0x72, 0x72, 0x22, 0x56, 0x0a, + 0x0a, 0x4d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x41, 0x72, 0x72, 0x12, 0x2e, 0x0a, 0x08, 0x65, + 0x6d, 0x70, 0x74, 0x79, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, + 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x41, 0x72, + 0x72, 0x52, 0x08, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x41, 0x72, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x6d, + 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6d, 0x73, + 0x67, 0x54, 0x79, 0x70, 0x65, 0x22, 0x0a, 0x0a, 0x08, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x41, 0x72, + 0x72, 0x22, 0x67, 0x0a, 0x0b, 0x41, 0x75, 0x74, 0x68, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, + 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x44, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x44, 0x12, 0x16, + 0x0a, 0x06, 0x72, 0x70, 0x63, 0x4b, 0x65, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, + 0x72, 0x70, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x22, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x65, 0x18, 0x07, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, + 0x44, 0x61, 0x74, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x65, 0x22, 0xa2, 0x02, 0x0a, 0x16, 0x52, + 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x29, 0x0a, 0x04, 0x61, 0x75, 0x74, 0x68, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x41, + 0x75, 0x74, 0x68, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x04, 0x61, 0x75, 0x74, 0x68, + 0x12, 0x53, 0x0a, 0x07, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x34, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x52, 0x65, 0x63, + 0x65, 0x69, 0x76, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x2e, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x45, 0x6d, 0x70, 0x74, 0x79, + 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x32, 0x48, 0x00, 0x52, 0x07, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, + 0x77, 0x6e, 0x88, 0x01, 0x01, 0x1a, 0x15, 0x0a, 0x13, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, + 0x45, 0x6d, 0x70, 0x74, 0x79, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x31, 0x1a, 0x65, 0x0a, 0x13, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x4f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x31, 0x52, 0x07, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x42, 0x0a, 0x0a, 0x08, - 0x5f, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x22, 0x4c, 0x0a, 0x08, 0x42, 0x61, 0x73, 0x65, - 0x44, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x54, 0x74, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x03, 0x54, 0x74, 0x6c, 0x12, 0x2e, 0x0a, 0x08, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x41, - 0x72, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, - 0x67, 0x65, 0x73, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x41, 0x72, 0x72, 0x52, 0x08, 0x65, 0x6d, - 0x70, 0x74, 0x79, 0x41, 0x72, 0x72, 0x22, 0x52, 0x0a, 0x0b, 0x52, 0x50, 0x43, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x12, - 0x29, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, - 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, - 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x62, 0x0a, 0x06, 0x44, 0x65, - 0x76, 0x69, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x26, 0x0a, 0x0e, - 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x22, 0x6a, - 0x0a, 0x04, 0x44, 0x61, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x79, 0x65, 0x61, 0x72, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x79, 0x65, 0x61, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x65, - 0x71, 0x31, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x73, 0x65, 0x71, 0x31, 0x12, 0x12, - 0x0a, 0x04, 0x73, 0x65, 0x71, 0x32, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x73, 0x65, - 0x71, 0x32, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x65, 0x71, 0x33, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x04, 0x73, 0x65, 0x71, 0x33, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x65, 0x71, 0x34, 0x18, 0x09, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x73, 0x65, 0x71, 0x34, 0x42, 0x0e, 0x5a, 0x0c, 0x2e, 0x2e, - 0x2f, 0x2e, 0x2e, 0x2f, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x63, 0x74, 0x32, 0x12, 0x4e, 0x0a, 0x07, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, + 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x45, 0x6d, + 0x70, 0x74, 0x79, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x31, 0x52, 0x07, 0x75, 0x6e, 0x6b, 0x6e, + 0x6f, 0x77, 0x6e, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x22, + 0x4c, 0x0a, 0x08, 0x42, 0x61, 0x73, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x54, + 0x54, 0x4c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x54, 0x54, 0x4c, 0x12, 0x2e, 0x0a, + 0x08, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x41, 0x72, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x12, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, + 0x41, 0x72, 0x72, 0x52, 0x08, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x41, 0x72, 0x72, 0x22, 0x52, 0x0a, + 0x0b, 0x52, 0x50, 0x43, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, + 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x75, + 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x12, 0x29, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, + 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, + 0x61, 0x22, 0x62, 0x0a, 0x06, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x75, + 0x73, 0x65, 0x72, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, + 0x72, 0x49, 0x44, 0x12, 0x26, 0x0a, 0x0e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x72, 0x65, 0x67, + 0x69, 0x73, 0x74, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x6e, + 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6e, 0x65, + 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x22, 0x6a, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x65, 0x12, 0x12, 0x0a, + 0x04, 0x79, 0x65, 0x61, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x79, 0x65, 0x61, + 0x72, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x65, 0x71, 0x31, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x04, 0x73, 0x65, 0x71, 0x31, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x65, 0x71, 0x32, 0x18, 0x05, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x04, 0x73, 0x65, 0x71, 0x32, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x65, 0x71, + 0x33, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x73, 0x65, 0x71, 0x33, 0x12, 0x12, 0x0a, + 0x04, 0x73, 0x65, 0x71, 0x34, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x73, 0x65, 0x71, + 0x34, 0x42, 0x0e, 0x5a, 0x0c, 0x2e, 0x2e, 0x2f, 0x2e, 0x2e, 0x2f, 0x62, 0x69, 0x6e, 0x61, 0x72, + 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/libgm/binary/pairing.pb.go b/libgm/binary/pairing.pb.go index 19c5c6d..5b8f0e0 100644 --- a/libgm/binary/pairing.pb.go +++ b/libgm/binary/pairing.pb.go @@ -25,7 +25,7 @@ type BrowserDetails struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - UserAgent string `protobuf:"bytes,1,opt,name=user_agent,json=userAgent,proto3" json:"user_agent,omitempty"` + UserAgent string `protobuf:"bytes,1,opt,name=userAgent,proto3" json:"userAgent,omitempty"` SomeInt int32 `protobuf:"varint,2,opt,name=someInt,proto3" json:"someInt,omitempty"` Os string `protobuf:"bytes,3,opt,name=os,proto3" json:"os,omitempty"` SomeBool bool `protobuf:"varint,6,opt,name=someBool,proto3" json:"someBool,omitempty"` @@ -96,7 +96,7 @@ type PhoneRelayBody struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"` Bugle string `protobuf:"bytes,3,opt,name=bugle,proto3" json:"bugle,omitempty"` RpcKey []byte `protobuf:"bytes,6,opt,name=rpcKey,proto3" json:"rpcKey,omitempty"` Date *Date `protobuf:"bytes,7,opt,name=date,proto3" json:"date,omitempty"` @@ -134,9 +134,9 @@ func (*PhoneRelayBody) Descriptor() ([]byte, []int) { return file_pairing_proto_rawDescGZIP(), []int{1} } -func (x *PhoneRelayBody) GetId() string { +func (x *PhoneRelayBody) GetID() string { if x != nil { - return x.Id + return x.ID } return "" } @@ -411,9 +411,9 @@ type UrlData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - PairingKey []byte `protobuf:"bytes,1,opt,name=pairingKey,proto3" json:"pairingKey,omitempty"` - AES_CTR_KEY_256 []byte `protobuf:"bytes,2,opt,name=AES_CTR_KEY_256,json=AESCTRKEY256,proto3" json:"AES_CTR_KEY_256,omitempty"` - SHA_256_KEY []byte `protobuf:"bytes,3,opt,name=SHA_256_KEY,json=SHA256KEY,proto3" json:"SHA_256_KEY,omitempty"` + PairingKey []byte `protobuf:"bytes,1,opt,name=pairingKey,proto3" json:"pairingKey,omitempty"` + AESCTR256Key []byte `protobuf:"bytes,2,opt,name=AESCTR256Key,proto3" json:"AESCTR256Key,omitempty"` + SHA256Key []byte `protobuf:"bytes,3,opt,name=SHA256Key,proto3" json:"SHA256Key,omitempty"` } func (x *UrlData) Reset() { @@ -455,16 +455,16 @@ func (x *UrlData) GetPairingKey() []byte { return nil } -func (x *UrlData) GetAES_CTR_KEY_256() []byte { +func (x *UrlData) GetAESCTR256Key() []byte { if x != nil { - return x.AES_CTR_KEY_256 + return x.AESCTR256Key } return nil } -func (x *UrlData) GetSHA_256_KEY() []byte { +func (x *UrlData) GetSHA256Key() []byte { if x != nil { - return x.SHA_256_KEY + return x.SHA256Key } return nil } @@ -474,66 +474,66 @@ var File_pairing_proto protoreflect.FileDescriptor var file_pairing_proto_rawDesc = []byte{ 0x0a, 0x0d, 0x70, 0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x07, 0x70, 0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x1a, 0x0e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, - 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x75, 0x0a, 0x0e, 0x42, 0x72, 0x6f, 0x77, - 0x73, 0x65, 0x72, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x75, 0x73, - 0x65, 0x72, 0x5f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, - 0x75, 0x73, 0x65, 0x72, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6f, 0x6d, - 0x65, 0x49, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6f, 0x6d, 0x65, - 0x49, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x6f, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x02, 0x6f, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x6f, 0x6d, 0x65, 0x42, 0x6f, 0x6f, 0x6c, 0x18, - 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x73, 0x6f, 0x6d, 0x65, 0x42, 0x6f, 0x6f, 0x6c, 0x22, - 0x72, 0x0a, 0x0e, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x52, 0x65, 0x6c, 0x61, 0x79, 0x42, 0x6f, 0x64, - 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, - 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x75, 0x67, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x05, 0x62, 0x75, 0x67, 0x6c, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x70, 0x63, 0x4b, 0x65, - 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x72, 0x70, 0x63, 0x4b, 0x65, 0x79, 0x12, - 0x22, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, - 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x44, 0x61, 0x74, 0x65, 0x52, 0x04, 0x64, - 0x61, 0x74, 0x65, 0x22, 0x55, 0x0a, 0x09, 0x45, 0x43, 0x44, 0x53, 0x41, 0x4b, 0x65, 0x79, 0x73, - 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x65, 0x72, - 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a, 0x0d, 0x65, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x65, - 0x64, 0x4b, 0x65, 0x79, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x65, 0x6e, 0x63, - 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x4b, 0x65, 0x79, 0x73, 0x22, 0xd5, 0x01, 0x0a, 0x0e, 0x50, - 0x61, 0x69, 0x72, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x28, 0x0a, - 0x06, 0x6d, 0x6f, 0x62, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, - 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, - 0x06, 0x6d, 0x6f, 0x62, 0x69, 0x6c, 0x65, 0x12, 0x30, 0x0a, 0x09, 0x65, 0x63, 0x64, 0x73, 0x61, - 0x4b, 0x65, 0x79, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x61, 0x69, - 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x45, 0x43, 0x44, 0x53, 0x41, 0x4b, 0x65, 0x79, 0x73, 0x52, 0x09, - 0x65, 0x63, 0x64, 0x73, 0x61, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x3b, 0x0a, 0x0e, 0x77, 0x65, 0x62, - 0x41, 0x75, 0x74, 0x68, 0x4b, 0x65, 0x79, 0x44, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x13, 0x2e, 0x70, 0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x57, 0x65, 0x62, 0x41, - 0x75, 0x74, 0x68, 0x4b, 0x65, 0x79, 0x52, 0x0e, 0x77, 0x65, 0x62, 0x41, 0x75, 0x74, 0x68, 0x4b, - 0x65, 0x79, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2a, 0x0a, 0x07, 0x62, 0x72, 0x6f, 0x77, 0x73, 0x65, - 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, - 0x65, 0x73, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x07, 0x62, 0x72, 0x6f, 0x77, 0x73, - 0x65, 0x72, 0x22, 0x48, 0x0a, 0x0a, 0x57, 0x65, 0x62, 0x41, 0x75, 0x74, 0x68, 0x4b, 0x65, 0x79, - 0x12, 0x1e, 0x0a, 0x0a, 0x77, 0x65, 0x62, 0x41, 0x75, 0x74, 0x68, 0x4b, 0x65, 0x79, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x77, 0x65, 0x62, 0x41, 0x75, 0x74, 0x68, 0x4b, 0x65, 0x79, - 0x12, 0x1a, 0x0a, 0x08, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x46, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x08, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x46, 0x6f, 0x72, 0x22, 0xc6, 0x01, 0x0a, - 0x09, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x12, 0x37, 0x0a, 0x0a, 0x50, 0x68, - 0x6f, 0x6e, 0x65, 0x52, 0x65, 0x6c, 0x61, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, - 0x2e, 0x70, 0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x52, 0x65, - 0x6c, 0x61, 0x79, 0x42, 0x6f, 0x64, 0x79, 0x52, 0x0a, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x52, 0x65, - 0x6c, 0x61, 0x79, 0x12, 0x3f, 0x0a, 0x0e, 0x62, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x44, 0x65, - 0x74, 0x61, 0x69, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x70, 0x61, - 0x69, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x42, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x44, 0x65, 0x74, - 0x61, 0x69, 0x6c, 0x73, 0x52, 0x0e, 0x62, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x44, 0x65, 0x74, - 0x61, 0x69, 0x6c, 0x73, 0x12, 0x3f, 0x0a, 0x0e, 0x70, 0x61, 0x69, 0x72, 0x44, 0x65, 0x76, 0x69, - 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x70, - 0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x61, 0x69, 0x72, 0x44, 0x65, 0x76, 0x69, 0x63, - 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0e, 0x70, 0x61, 0x69, 0x72, 0x44, 0x65, 0x76, 0x69, 0x63, - 0x65, 0x44, 0x61, 0x74, 0x61, 0x22, 0x70, 0x0a, 0x07, 0x55, 0x72, 0x6c, 0x44, 0x61, 0x74, 0x61, - 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x4b, 0x65, 0x79, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x70, 0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x4b, 0x65, 0x79, - 0x12, 0x25, 0x0a, 0x0f, 0x41, 0x45, 0x53, 0x5f, 0x43, 0x54, 0x52, 0x5f, 0x4b, 0x45, 0x59, 0x5f, - 0x32, 0x35, 0x36, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x41, 0x45, 0x53, 0x43, 0x54, - 0x52, 0x4b, 0x45, 0x59, 0x32, 0x35, 0x36, 0x12, 0x1e, 0x0a, 0x0b, 0x53, 0x48, 0x41, 0x5f, 0x32, - 0x35, 0x36, 0x5f, 0x4b, 0x45, 0x59, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x53, 0x48, - 0x41, 0x32, 0x35, 0x36, 0x4b, 0x45, 0x59, 0x42, 0x0e, 0x5a, 0x0c, 0x2e, 0x2e, 0x2f, 0x2e, 0x2e, - 0x2f, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x74, 0x0a, 0x0e, 0x42, 0x72, 0x6f, 0x77, + 0x73, 0x65, 0x72, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x73, + 0x65, 0x72, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x75, + 0x73, 0x65, 0x72, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6f, 0x6d, 0x65, + 0x49, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6f, 0x6d, 0x65, 0x49, + 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x6f, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, + 0x6f, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x6f, 0x6d, 0x65, 0x42, 0x6f, 0x6f, 0x6c, 0x18, 0x06, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x73, 0x6f, 0x6d, 0x65, 0x42, 0x6f, 0x6f, 0x6c, 0x22, 0x72, + 0x0a, 0x0e, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x52, 0x65, 0x6c, 0x61, 0x79, 0x42, 0x6f, 0x64, 0x79, + 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x44, + 0x12, 0x14, 0x0a, 0x05, 0x62, 0x75, 0x67, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x05, 0x62, 0x75, 0x67, 0x6c, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x70, 0x63, 0x4b, 0x65, 0x79, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x72, 0x70, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x22, + 0x0a, 0x04, 0x64, 0x61, 0x74, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x44, 0x61, 0x74, 0x65, 0x52, 0x04, 0x64, 0x61, + 0x74, 0x65, 0x22, 0x55, 0x0a, 0x09, 0x45, 0x43, 0x44, 0x53, 0x41, 0x4b, 0x65, 0x79, 0x73, 0x12, + 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x65, 0x72, 0x73, + 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a, 0x0d, 0x65, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, + 0x4b, 0x65, 0x79, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x65, 0x6e, 0x63, 0x72, + 0x79, 0x70, 0x74, 0x65, 0x64, 0x4b, 0x65, 0x79, 0x73, 0x22, 0xd5, 0x01, 0x0a, 0x0e, 0x50, 0x61, + 0x69, 0x72, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x28, 0x0a, 0x06, + 0x6d, 0x6f, 0x62, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x6d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x06, + 0x6d, 0x6f, 0x62, 0x69, 0x6c, 0x65, 0x12, 0x30, 0x0a, 0x09, 0x65, 0x63, 0x64, 0x73, 0x61, 0x4b, + 0x65, 0x79, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x61, 0x69, 0x72, + 0x69, 0x6e, 0x67, 0x2e, 0x45, 0x43, 0x44, 0x53, 0x41, 0x4b, 0x65, 0x79, 0x73, 0x52, 0x09, 0x65, + 0x63, 0x64, 0x73, 0x61, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x3b, 0x0a, 0x0e, 0x77, 0x65, 0x62, 0x41, + 0x75, 0x74, 0x68, 0x4b, 0x65, 0x79, 0x44, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x13, 0x2e, 0x70, 0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x57, 0x65, 0x62, 0x41, 0x75, + 0x74, 0x68, 0x4b, 0x65, 0x79, 0x52, 0x0e, 0x77, 0x65, 0x62, 0x41, 0x75, 0x74, 0x68, 0x4b, 0x65, + 0x79, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2a, 0x0a, 0x07, 0x62, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, + 0x73, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x07, 0x62, 0x72, 0x6f, 0x77, 0x73, 0x65, + 0x72, 0x22, 0x48, 0x0a, 0x0a, 0x57, 0x65, 0x62, 0x41, 0x75, 0x74, 0x68, 0x4b, 0x65, 0x79, 0x12, + 0x1e, 0x0a, 0x0a, 0x77, 0x65, 0x62, 0x41, 0x75, 0x74, 0x68, 0x4b, 0x65, 0x79, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x77, 0x65, 0x62, 0x41, 0x75, 0x74, 0x68, 0x4b, 0x65, 0x79, 0x12, + 0x1a, 0x0a, 0x08, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x46, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x08, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x46, 0x6f, 0x72, 0x22, 0xc6, 0x01, 0x0a, 0x09, + 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x12, 0x37, 0x0a, 0x0a, 0x50, 0x68, 0x6f, + 0x6e, 0x65, 0x52, 0x65, 0x6c, 0x61, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, + 0x70, 0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x52, 0x65, 0x6c, + 0x61, 0x79, 0x42, 0x6f, 0x64, 0x79, 0x52, 0x0a, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x52, 0x65, 0x6c, + 0x61, 0x79, 0x12, 0x3f, 0x0a, 0x0e, 0x62, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x44, 0x65, 0x74, + 0x61, 0x69, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x70, 0x61, 0x69, + 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x42, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x44, 0x65, 0x74, 0x61, + 0x69, 0x6c, 0x73, 0x52, 0x0e, 0x62, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x44, 0x65, 0x74, 0x61, + 0x69, 0x6c, 0x73, 0x12, 0x3f, 0x0a, 0x0e, 0x70, 0x61, 0x69, 0x72, 0x44, 0x65, 0x76, 0x69, 0x63, + 0x65, 0x44, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x70, 0x61, + 0x69, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x61, 0x69, 0x72, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, + 0x44, 0x61, 0x74, 0x61, 0x52, 0x0e, 0x70, 0x61, 0x69, 0x72, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, + 0x44, 0x61, 0x74, 0x61, 0x22, 0x6b, 0x0a, 0x07, 0x55, 0x72, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, + 0x1e, 0x0a, 0x0a, 0x70, 0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x4b, 0x65, 0x79, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x70, 0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x4b, 0x65, 0x79, 0x12, + 0x22, 0x0a, 0x0c, 0x41, 0x45, 0x53, 0x43, 0x54, 0x52, 0x32, 0x35, 0x36, 0x4b, 0x65, 0x79, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x41, 0x45, 0x53, 0x43, 0x54, 0x52, 0x32, 0x35, 0x36, + 0x4b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x4b, 0x65, 0x79, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x4b, 0x65, + 0x79, 0x42, 0x0e, 0x5a, 0x0c, 0x2e, 0x2e, 0x2f, 0x2e, 0x2e, 0x2f, 0x62, 0x69, 0x6e, 0x61, 0x72, + 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/libgm/binary/raw/client.proto b/libgm/binary/raw/client.proto index be65c15..acf6560 100644 --- a/libgm/binary/raw/client.proto +++ b/libgm/binary/raw/client.proto @@ -9,7 +9,7 @@ message SendMessage { messages.Device pairedDevice = 1; messages.MessageData messageData = 2; messages.AuthMessage authData = 3; - int64 ttl = 5; + int64 TTL = 5; messages.EmptyArr emptyArr = 9; } @@ -20,12 +20,12 @@ message AckMessagePayload { } message AckMessageData { - string request_id = 1; + string requestID = 1; messages.Device device = 2; } message ImageMetaData { - string imageId = 1; + string imageID = 1; bool encrypted = 2; } diff --git a/libgm/binary/raw/conversations.proto b/libgm/binary/raw/conversations.proto index 8d568eb..320b35a 100644 --- a/libgm/binary/raw/conversations.proto +++ b/libgm/binary/raw/conversations.proto @@ -4,18 +4,18 @@ package conversations; option go_package = "../../binary"; message SendMessagePayload { - string conversationId = 2; + string conversationID = 2; MessagePayload messagePayload = 3; - string tmpId = 5; + string tmpID = 5; } message MessagePayload { - string tmpId = 1; + string tmpID = 1; MessagePayloadContent messagePayloadContent = 6; - string conversationId = 7; - string selfParticipantId = 9; // might be participantId + string conversationID = 7; + string selfParticipantID = 9; // might be participantId repeated MessageInfo messageInfo = 10; - string tmpId2 = 12; + string tmpID2 = 12; } message MessagePayloadContent { @@ -23,7 +23,7 @@ message MessagePayloadContent { } message OpenConversationPayload { - string conversationId = 2; + string conversationID = 2; } message PrepareOpenConversationPayload { @@ -31,7 +31,7 @@ message PrepareOpenConversationPayload { } message FetchConversationMessagesPayload { - string conversationId = 2; + string conversationID = 2; int64 count = 3; Cursor cursor = 5; @@ -69,12 +69,12 @@ enum MessageType { } message Message { - string messageId = 1; + string messageID = 1; IsFromMe from = 3; MessageStatus messageStatus = 4; int64 timestamp = 5; - string conversationId = 7; - string participantId = 9; + string conversationID = 7; + string participantID = 9; repeated MessageInfo messageInfo = 10; MessageType type = 11; string tmpId = 12; @@ -90,12 +90,12 @@ message MessageInfo { message ImageContent { int64 someNumber = 1; - string imageId = 2; + string imageID = 2; string imageName = 4; int64 size = 5; ImagePixels pixels = 6; bytes imageData = 7; - string imageId2 = 9; + string imageID2 = 9; bytes decryptionKey = 11; bytes decryptionKey2 = 12; // same value as decryptionkey? } @@ -139,13 +139,13 @@ message Conversations { } message Conversation { - string conversationId = 1; + string conversationID = 1; string name = 2; LatestMessage latestMessage = 4; - int64 timestampMs = 5; + int64 timestampMS = 5; bool isGroupChat = 10; // not certain - string selfParticipantId = 11; + string selfParticipantID = 11; /* 1 = unarchived 2 = archived @@ -154,7 +154,7 @@ message Conversation { //bool bool1 = 13; int64 status = 12; string hashHex = 15; - string messageId = 17; + string messageID = 17; repeated Participant participants = 20; repeated string otherParticipants = 21; // participant ids excluding me int64 type = 22; @@ -173,7 +173,7 @@ message Participant { message SmallInfo { int64 type = 1; string number = 2; - string participantId = 3; + string participantID = 3; } message LatestMessage { diff --git a/libgm/binary/raw/events.proto b/libgm/binary/raw/events.proto index 027c08f..dbbbbfc 100644 --- a/libgm/binary/raw/events.proto +++ b/libgm/binary/raw/events.proto @@ -52,5 +52,5 @@ message UserAlertEvent { 10 = OBSERVER_REGISTERED (tf?) */ - int64 alert_type = 2; + int64 alertType = 2; } diff --git a/libgm/binary/raw/media.proto b/libgm/binary/raw/media.proto index c3b78c0..05ccaf7 100644 --- a/libgm/binary/raw/media.proto +++ b/libgm/binary/raw/media.proto @@ -17,6 +17,6 @@ message UploadMediaResponse { } message Media { - string mediaId = 1; + string mediaID = 1; int64 mediaNumber = 2; } diff --git a/libgm/binary/raw/messages.proto b/libgm/binary/raw/messages.proto index bfa394f..f6613b4 100644 --- a/libgm/binary/raw/messages.proto +++ b/libgm/binary/raw/messages.proto @@ -4,14 +4,14 @@ package messages; option go_package = "../../binary"; message EncodedPayload { - string request_id = 1; + string requestID = 1; int64 opcode = 2; bytes encryptedData = 5; - string session_id = 6; + string sessionID = 6; } message EncodedResponse { - string request_id = 1; + string requestID = 1; //int64 msg = 2; int64 unixNano = 3; int64 opcode = 4; @@ -23,8 +23,8 @@ message EncodedResponse { } message MessageData { - string request_id = 1; - int64 routing_op_code = 2; + string requestID = 1; + int64 routingOpCode = 2; string ts1 = 3; int64 field5 = 5; string ts2 = 6; @@ -32,7 +32,7 @@ message MessageData { Device mobile = 8; Device browser = 9; string encodedData = 12; - string encoded_request_id = 17; + string encodedRequestID = 17; MsgTypeArr msgTypeArr = 23; } @@ -46,7 +46,7 @@ message EmptyArr { } message AuthMessage { - string request_id = 1; + string requestID = 1; bytes rpcKey = 6; Date date = 7; } @@ -62,7 +62,7 @@ message ReceiveMessagesRequest { } message BaseData { - int64 Ttl = 2; + int64 TTL = 2; EmptyArr emptyArr = 6; } @@ -72,8 +72,8 @@ message RPCResponse { } message Device { - int64 userId = 1; - string registrationId = 2; + int64 userID = 1; + string registrationID = 2; string network = 3; } diff --git a/libgm/binary/raw/pairing.proto b/libgm/binary/raw/pairing.proto index 1afb596..da2ba0c 100644 --- a/libgm/binary/raw/pairing.proto +++ b/libgm/binary/raw/pairing.proto @@ -6,14 +6,14 @@ option go_package = "../../binary"; import "messages.proto"; message BrowserDetails { - string user_agent = 1; + string userAgent = 1; int32 someInt = 2; string os = 3; bool someBool = 6; } message PhoneRelayBody { - string id = 1; + string ID = 1; string bugle = 3; bytes rpcKey = 6; messages.Date date = 7; @@ -44,6 +44,6 @@ message Container { message UrlData { bytes pairingKey = 1; - bytes AES_CTR_KEY_256 = 2; - bytes SHA_256_KEY = 3; + bytes AESCTR256Key = 2; + bytes SHA256Key = 3; } diff --git a/libgm/binary/raw/relay.proto b/libgm/binary/raw/relay.proto index 36b1826..0f943f7 100644 --- a/libgm/binary/raw/relay.proto +++ b/libgm/binary/raw/relay.proto @@ -6,7 +6,7 @@ option go_package = "../../binary"; message RegisterPhoneRelayResponse { Message1 field1 = 1; Message2 field2 = 2; - bytes PairingKey = 3; + bytes pairingKey = 3; int64 field4 = 4; Message3 field5 = 5; bytes field6 = 6; diff --git a/libgm/binary/relay.pb.go b/libgm/binary/relay.pb.go index 86850f9..4e02a52 100644 --- a/libgm/binary/relay.pb.go +++ b/libgm/binary/relay.pb.go @@ -27,7 +27,7 @@ type RegisterPhoneRelayResponse struct { Field1 *Message1 `protobuf:"bytes,1,opt,name=field1,proto3" json:"field1,omitempty"` Field2 *Message2 `protobuf:"bytes,2,opt,name=field2,proto3" json:"field2,omitempty"` - PairingKey []byte `protobuf:"bytes,3,opt,name=PairingKey,proto3" json:"PairingKey,omitempty"` + PairingKey []byte `protobuf:"bytes,3,opt,name=pairingKey,proto3" json:"pairingKey,omitempty"` Field4 int64 `protobuf:"varint,4,opt,name=field4,proto3" json:"field4,omitempty"` Field5 *Message3 `protobuf:"bytes,5,opt,name=field5,proto3" json:"field5,omitempty"` Field6 []byte `protobuf:"bytes,6,opt,name=field6,proto3" json:"field6,omitempty"` @@ -404,8 +404,8 @@ var file_relay_proto_rawDesc = []byte{ 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x52, 0x65, 0x6c, 0x61, 0x79, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0x52, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x32, 0x12, 0x1e, 0x0a, 0x0a, - 0x50, 0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x4b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, - 0x52, 0x0a, 0x50, 0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x4b, 0x65, 0x79, 0x12, 0x16, 0x0a, 0x06, + 0x70, 0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x4b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, + 0x52, 0x0a, 0x70, 0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x4b, 0x65, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x34, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x34, 0x12, 0x34, 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x35, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x50, diff --git a/libgm/bugle_service.go b/libgm/bugle_service.go index 26621d1..233b966 100644 --- a/libgm/bugle_service.go +++ b/libgm/bugle_service.go @@ -5,7 +5,7 @@ import "go.mau.fi/mautrix-gmessages/libgm/binary" func (c *Client) handleBugleOpCode(bugleData *binary.BugleBackendService) { switch bugleData.Data.Type { case 2: - c.Logger.Info().Any("type", bugleData.Data.Type).Msg("Updated sessionId to " + c.sessionHandler.sessionId + " due to BROWSER_ACTIVE alert") + c.Logger.Info().Any("type", bugleData.Data.Type).Msg("Updated sessionId to " + c.sessionHandler.sessionID + " due to BROWSER_ACTIVE alert") case 6: c.Logger.Info().Any("type", bugleData.Data.Type).Msg("USER_ALERT:BATTERY") // tf ? } diff --git a/libgm/client.go b/libgm/client.go index 60fc2e7..944b350 100644 --- a/libgm/client.go +++ b/libgm/client.go @@ -88,12 +88,12 @@ func (c *Client) SetProxy(proxy string) error { } func (c *Client) Connect(rpcKey []byte) error { - rpcPayload, receiveMesageSessionId, err := payload.ReceiveMessages(rpcKey) + rpcPayload, receiveMesageSessionID, err := payload.ReceiveMessages(rpcKey) if err != nil { panic(err) return err } - c.rpc.rpcSessionId = receiveMesageSessionId + c.rpc.rpcSessionID = receiveMesageSessionID c.rpcKey = rpcKey c.rpc.ListenReceiveMessages(rpcPayload) c.Logger.Debug().Any("rpcKey", rpcKey).Msg("Successfully connected to server") @@ -152,7 +152,7 @@ func (c *Client) decryptImages(messages *binary.FetchMessagesResponse) error { for _, details := range msg.GetMessageInfo() { switch data := details.GetData().(type) { case *binary.MessageInfo_ImageContent: - decryptedImageData, err := c.decryptImageData(data.ImageContent.ImageId, data.ImageContent.DecryptionKey) + decryptedImageData, err := c.decryptImageData(data.ImageContent.ImageID, data.ImageContent.DecryptionKey) if err != nil { panic(err) return err @@ -169,11 +169,11 @@ func (c *Client) decryptImageData(imageId string, key []byte) ([]byte, error) { reqId := util.RandomUUIDv4() download_metadata := &binary.UploadImagePayload{ MetaData: &binary.ImageMetaData{ - ImageId: imageId, + ImageID: imageId, Encrypted: true, }, AuthData: &binary.AuthMessage{ - RequestId: reqId, + RequestID: reqId, RpcKey: c.rpcKey, Date: &binary.Date{ Year: 2023, diff --git a/libgm/conversations.go b/libgm/conversations.go index 3139ddd..2762496 100644 --- a/libgm/conversations.go +++ b/libgm/conversations.go @@ -18,9 +18,9 @@ type Conversations struct { func (c *Conversations) List(count int64) (*binary.Conversations, error) { encryptedProtoPayload := &binary.ListCoversationsPayload{Count: count, Field4: 1} instruction, _ := c.client.instructions.GetInstruction(LIST_CONVERSATIONS) - sentRequestId, _ := c.client.createAndSendRequest(instruction.Opcode, c.client.ttl, false, encryptedProtoPayload.ProtoReflect()) + sentRequestID, _ := c.client.createAndSendRequest(instruction.Opcode, c.client.ttl, false, encryptedProtoPayload.ProtoReflect()) - responses, err := c.client.sessionHandler.WaitForResponse(sentRequestId, instruction.Opcode) + responses, err := c.client.sessionHandler.WaitForResponse(sentRequestID, instruction.Opcode) if err != nil { return nil, err } @@ -37,9 +37,9 @@ func (c *Conversations) List(count int64) (*binary.Conversations, error) { } func (c *Conversations) SendMessage(messageBuilder *MessageBuilder, selfParticipantID string) (*binary.SendMessageResponse, error) { - hasSelfParticipantId := messageBuilder.GetSelfParticipantId() + hasSelfParticipantId := messageBuilder.GetSelfParticipantID() if hasSelfParticipantId == "" { - messageBuilder.SetSelfParticipantId(selfParticipantID) + messageBuilder.SetSelfParticipantID(selfParticipantID) } encryptedProtoPayload, failedToBuild := messageBuilder.Build() @@ -49,9 +49,9 @@ func (c *Conversations) SendMessage(messageBuilder *MessageBuilder, selfParticip instruction, _ := c.client.instructions.GetInstruction(SEND_TEXT_MESSAGE) c.client.Logger.Debug().Any("payload", encryptedProtoPayload).Msg("SendMessage Payload") - sentRequestId, _ := c.client.createAndSendRequest(instruction.Opcode, c.client.ttl, false, encryptedProtoPayload.ProtoReflect()) + sentRequestID, _ := c.client.createAndSendRequest(instruction.Opcode, c.client.ttl, false, encryptedProtoPayload.ProtoReflect()) - responses, err := c.client.sessionHandler.WaitForResponse(sentRequestId, instruction.Opcode) + responses, err := c.client.sessionHandler.WaitForResponse(sentRequestID, instruction.Opcode) if err != nil { panic(err) return nil, err @@ -99,11 +99,11 @@ type fetchConversationMessages struct { } func (f *fetchConversationMessages) Execute(convId string, count int64, cursor *binary.Cursor) ([]*Response, error) { - encryptedProtoPayload := &binary.FetchConversationMessagesPayload{ConversationId: convId, Count: count, Cursor: cursor} + encryptedProtoPayload := &binary.FetchConversationMessagesPayload{ConversationID: convId, Count: count, Cursor: cursor} instruction, _ := f.client.instructions.GetInstruction(FETCH_MESSAGES_CONVERSATION) - sentRequestId, _ := f.client.createAndSendRequest(instruction.Opcode, f.client.ttl, false, encryptedProtoPayload.ProtoReflect()) + sentRequestID, _ := f.client.createAndSendRequest(instruction.Opcode, f.client.ttl, false, encryptedProtoPayload.ProtoReflect()) - responses, err := f.client.sessionHandler.WaitForResponse(sentRequestId, instruction.Opcode) + responses, err := f.client.sessionHandler.WaitForResponse(sentRequestID, instruction.Opcode) if err != nil { return nil, err } @@ -116,11 +116,11 @@ type openConversation struct { } func (o *openConversation) Execute(convId string) ([]*Response, error) { - encryptedProtoPayload := &binary.OpenConversationPayload{ConversationId: convId} + encryptedProtoPayload := &binary.OpenConversationPayload{ConversationID: convId} instruction, _ := o.client.instructions.GetInstruction(OPEN_CONVERSATION) - sentRequestId, _ := o.client.createAndSendRequest(instruction.Opcode, o.client.ttl, false, encryptedProtoPayload.ProtoReflect()) + sentRequestID, _ := o.client.createAndSendRequest(instruction.Opcode, o.client.ttl, false, encryptedProtoPayload.ProtoReflect()) - responses, err := o.client.sessionHandler.WaitForResponse(sentRequestId, instruction.Opcode) + responses, err := o.client.sessionHandler.WaitForResponse(sentRequestID, instruction.Opcode) if err != nil { return nil, err } @@ -131,11 +131,11 @@ func (o *openConversation) Execute(convId string) ([]*Response, error) { } /* -func (c *Conversations) SendMessage(conversationId string, content string, participantCount string) (*binary.SendMessageResponse, error) { - encryptedProtoPayload := payload.NewSendConversationTextMessage(conversationId, content, participantCount) - sentRequestId, _ := c.client.createAndSendRequest(3, c.client.ttl, false, encryptedProtoPayload.ProtoReflect()) - c.client.Logger.Debug().Any("requestId", sentRequestId).Msg("Sent sendmessage request.") - response, responseErr := c.client.sessionHandler.WaitForResponse(sentRequestId, 3) +func (c *Conversations) SendMessage(conversationID string, content string, participantCount string) (*binary.SendMessageResponse, error) { + encryptedProtoPayload := payload.NewSendConversationTextMessage(conversationID, content, participantCount) + sentRequestID, _ := c.client.createAndSendRequest(3, c.client.ttl, false, encryptedProtoPayload.ProtoReflect()) + c.client.Logger.Debug().Any("requestId", sentRequestID).Msg("Sent sendmessage request.") + response, responseErr := c.client.sessionHandler.WaitForResponse(sentRequestID, 3) if responseErr != nil { c.client.Logger.Err(responseErr).Msg("SendMessage channel response error") return nil, responseErr @@ -155,9 +155,9 @@ func (c *Conversations) SendMessage(conversationId string, content string, parti func (c *Conversations) PrepareOpen() (interface{}, error) { encryptedProtoPayload := &binary.PrepareOpenConversationPayload{Field2:1} - sentRequestId, _ := c.client.createAndSendRequest(22, c.client.ttl, false, encryptedProtoPayload.ProtoReflect()) - c.client.Logger.Debug().Any("requestId", sentRequestId).Msg("Sent PrepareOpenConversation request.") - response, responseErr := c.client.sessionHandler.WaitForResponse(sentRequestId, 22) + sentRequestID, _ := c.client.createAndSendRequest(22, c.client.ttl, false, encryptedProtoPayload.ProtoReflect()) + c.client.Logger.Debug().Any("requestId", sentRequestID).Msg("Sent PrepareOpenConversation request.") + response, responseErr := c.client.sessionHandler.WaitForResponse(sentRequestID, 22) if responseErr != nil { c.client.Logger.Err(responseErr).Msg("PrepareOpenConversation channel response error") return nil, responseErr @@ -167,11 +167,11 @@ func (c *Conversations) PrepareOpen() (interface{}, error) { return nil, nil } -func (c *Conversations) Open(conversationId string) (interface{}, error) { - encryptedProtoPayload := &binary.OpenConversationPayload{ConversationId:conversationId} - sentRequestId, _ := c.client.createAndSendRequest(21, c.client.ttl, false, encryptedProtoPayload.ProtoReflect()) - c.client.Logger.Debug().Any("requestId", sentRequestId).Msg("Sent OpenConversation request.") - response, responseErr := c.client.sessionHandler.WaitForResponse(sentRequestId, 21) +func (c *Conversations) Open(conversationID string) (interface{}, error) { + encryptedProtoPayload := &binary.OpenConversationPayload{ConversationID:conversationID} + sentRequestID, _ := c.client.createAndSendRequest(21, c.client.ttl, false, encryptedProtoPayload.ProtoReflect()) + c.client.Logger.Debug().Any("requestId", sentRequestID).Msg("Sent OpenConversation request.") + response, responseErr := c.client.sessionHandler.WaitForResponse(sentRequestID, 21) if responseErr != nil { c.client.Logger.Err(responseErr).Msg("OpenConversation channel response error") return nil, responseErr @@ -181,11 +181,11 @@ func (c *Conversations) Open(conversationId string) (interface{}, error) { return nil, nil } -func (c *Conversations) FetchMessages(conversationId string, count int64) (*binary.FetchMessagesResponse, error) { - encryptedProtoPayload := &binary.FetchConversationMessagesPayload{ConversationId:conversationId,Count:count} - sentRequestId, _ := c.client.createAndSendRequest(2, c.client.ttl, false, encryptedProtoPayload.ProtoReflect()) - c.client.Logger.Debug().Any("requestId", sentRequestId).Msg("Sent FetchMessages request.") - response, responseErr := c.client.sessionHandler.WaitForResponse(sentRequestId, 2) +func (c *Conversations) FetchMessages(conversationID string, count int64) (*binary.FetchMessagesResponse, error) { + encryptedProtoPayload := &binary.FetchConversationMessagesPayload{ConversationID:conversationID,Count:count} + sentRequestID, _ := c.client.createAndSendRequest(2, c.client.ttl, false, encryptedProtoPayload.ProtoReflect()) + c.client.Logger.Debug().Any("requestId", sentRequestID).Msg("Sent FetchMessages request.") + response, responseErr := c.client.sessionHandler.WaitForResponse(sentRequestID, 2) if responseErr != nil { c.client.Logger.Err(responseErr).Msg("FetchMessages channel response error") return nil, responseErr diff --git a/libgm/crypto/cryptor.go b/libgm/crypto/cryptor.go index b700f58..f5d91e8 100644 --- a/libgm/crypto/cryptor.go +++ b/libgm/crypto/cryptor.go @@ -15,20 +15,21 @@ import ( ) type Cryptor struct { - AES_CTR_KEY_256, SHA_256_KEY []byte + AESCTR256Key []byte + SHA256Key []byte } -func NewCryptor(aes_key []byte, sha_key []byte) *Cryptor { - if aes_key != nil && sha_key != nil { +func NewCryptor(aesKey []byte, shaKey []byte) *Cryptor { + if aesKey != nil && shaKey != nil { return &Cryptor{ - AES_CTR_KEY_256: aes_key, - SHA_256_KEY: sha_key, + AESCTR256Key: aesKey, + SHA256Key: shaKey, } } - aes_key, sha_key = GenerateKeys() + aesKey, shaKey = GenerateKeys() return &Cryptor{ - AES_CTR_KEY_256: aes_key, - SHA_256_KEY: sha_key, + AESCTR256Key: aesKey, + SHA256Key: shaKey, } } @@ -38,7 +39,7 @@ func (c *Cryptor) Encrypt(plaintext []byte) ([]byte, error) { return nil, err } - block, err := aes.NewCipher(c.AES_CTR_KEY_256) + block, err := aes.NewCipher(c.AESCTR256Key) if err != nil { return nil, err } @@ -49,7 +50,7 @@ func (c *Cryptor) Encrypt(plaintext []byte) ([]byte, error) { ciphertext = append(ciphertext, iv...) - mac := hmac.New(sha256.New, c.SHA_256_KEY) + mac := hmac.New(sha256.New, c.SHA256Key) mac.Write(ciphertext) hmac := mac.Sum(nil) @@ -66,7 +67,7 @@ func (c *Cryptor) Decrypt(encryptedData []byte) ([]byte, error) { hmacSignature := encryptedData[len(encryptedData)-32:] encryptedDataWithoutHMAC := encryptedData[:len(encryptedData)-32] - mac := hmac.New(sha256.New, c.SHA_256_KEY) + mac := hmac.New(sha256.New, c.SHA256Key) mac.Write(encryptedDataWithoutHMAC) expectedHMAC := mac.Sum(nil) @@ -77,7 +78,7 @@ func (c *Cryptor) Decrypt(encryptedData []byte) ([]byte, error) { iv := encryptedDataWithoutHMAC[len(encryptedDataWithoutHMAC)-16:] encryptedDataWithoutHMAC = encryptedDataWithoutHMAC[:len(encryptedDataWithoutHMAC)-16] - block, err := aes.NewCipher(c.AES_CTR_KEY_256) + block, err := aes.NewCipher(c.AESCTR256Key) if err != nil { return nil, err } diff --git a/libgm/events/useralerts.go b/libgm/events/useralerts.go index faec8e1..e1392fe 100644 --- a/libgm/events/useralerts.go +++ b/libgm/events/useralerts.go @@ -1,12 +1,12 @@ package events type BrowserActive struct { - SessionId string + SessionID string } -func NewBrowserActive(sessionId string) *BrowserActive { +func NewBrowserActive(sessionID string) *BrowserActive { return &BrowserActive{ - SessionId: sessionId, + SessionID: sessionID, } } diff --git a/libgm/handler_useralert.go b/libgm/handler_useralert.go index 4a616e4..04b8ae1 100644 --- a/libgm/handler_useralert.go +++ b/libgm/handler_useralert.go @@ -8,7 +8,7 @@ import ( func (c *Client) handleUserAlertEvent(response *Response, evtData *binary.Event_UserAlertEvent) { switch evtData.UserAlertEvent.AlertType { case 2: - browserActive := events.NewBrowserActive(response.Data.RequestId) + browserActive := events.NewBrowserActive(response.Data.RequestID) c.triggerEvent(browserActive) return case 5, 6: diff --git a/libgm/image_builder.go b/libgm/image_builder.go index 04362f5..82dcc56 100644 --- a/libgm/image_builder.go +++ b/libgm/image_builder.go @@ -59,7 +59,7 @@ type Image struct { imageCryptor *crypto.ImageCryptor imageName string - imageId string + imageID string imageType ImageType imageBytes []byte imageSize int64 @@ -93,8 +93,8 @@ func (i *Image) GetImageType() ImageType { return i.imageType } -func (i *Image) GetImageId() string { - return i.imageId +func (i *Image) GetImageID() string { + return i.imageID } // This is the equivalent of dragging an image into the window on messages web @@ -142,7 +142,7 @@ func (mb *MessageBuilder) newImageData(imgBytes []byte, mime string) (*Image, er } return &Image{ imageCryptor: imageCryptor, - imageId: imageId, + imageID: imageId, imageBytes: imgBytes, imageType: imgType, imageSize: int64(len(imgBytes)), diff --git a/libgm/media_processor.go b/libgm/media_processor.go index bdf7bf3..1c34410 100644 --- a/libgm/media_processor.go +++ b/libgm/media_processor.go @@ -13,18 +13,18 @@ import ( ) type StartGoogleUpload struct { - UploadId string - UploadUrl string + UploadID string + UploadURL string UploadStatus string ChunkGranularity int64 - ControlUrl string + ControlURL string Image *Image EncryptedMediaBytes []byte } type MediaUpload struct { - MediaId string + MediaID string MediaNumber int64 Image *Image } @@ -39,7 +39,7 @@ func (c *Client) FinalizeUploadMedia(upload *StartGoogleUpload) (*MediaUpload, e encryptedImageSize := strconv.Itoa(len(upload.EncryptedMediaBytes)) finalizeUploadHeaders := util.NewMediaUploadHeaders(encryptedImageSize, "upload, finalize", "0", imageType.Format, "") - req, reqErr := http.NewRequest("POST", upload.UploadUrl, bytes.NewBuffer(upload.EncryptedMediaBytes)) + req, reqErr := http.NewRequest("POST", upload.UploadURL, bytes.NewBuffer(upload.EncryptedMediaBytes)) if reqErr != nil { return nil, reqErr } @@ -67,14 +67,14 @@ func (c *Client) FinalizeUploadMedia(upload *StartGoogleUpload) (*MediaUpload, e uploadStatus := rHeaders.Get("x-goog-upload-status") c.Logger.Debug().Str("upload_status", uploadStatus).Msg("Upload status") - mediaIds := &binary.UploadMediaResponse{} - err3 = crypto.DecodeAndEncodeB64(string(googleResponse), mediaIds) + mediaIDs := &binary.UploadMediaResponse{} + err3 = crypto.DecodeAndEncodeB64(string(googleResponse), mediaIDs) if err3 != nil { return nil, err3 } return &MediaUpload{ - MediaId: mediaIds.Media.MediaId, - MediaNumber: mediaIds.Media.MediaNumber, + MediaID: mediaIDs.Media.MediaID, + MediaNumber: mediaIDs.Media.MediaNumber, Image: upload.Image, }, nil } @@ -119,11 +119,11 @@ func (c *Client) StartUploadMedia(image *Image) (*StartGoogleUpload, error) { } uploadResponse := &StartGoogleUpload{ - UploadId: rHeaders.Get("x-guploader-uploadid"), - UploadUrl: rHeaders.Get("x-goog-upload-url"), + UploadID: rHeaders.Get("x-guploader-uploadid"), + UploadURL: rHeaders.Get("x-goog-upload-url"), UploadStatus: rHeaders.Get("x-goog-upload-status"), ChunkGranularity: int64(chunkGranularity), - ControlUrl: rHeaders.Get("x-goog-upload-control-url"), + ControlURL: rHeaders.Get("x-goog-upload-control-url"), Image: image, EncryptedMediaBytes: encryptedImageBytes, @@ -136,7 +136,7 @@ func (c *Client) buildStartUploadPayload() (string, error) { protoData := &binary.StartMediaUploadPayload{ ImageType: 1, AuthData: &binary.AuthMessage{ - RequestId: requestId, + RequestID: requestId, RpcKey: c.rpcKey, Date: &binary.Date{ Year: 2023, diff --git a/libgm/message_builder.go b/libgm/message_builder.go index 03fd29d..1b8993a 100644 --- a/libgm/message_builder.go +++ b/libgm/message_builder.go @@ -9,17 +9,17 @@ import ( var ( errContentNotSet = errors.New("failed to build MessageBuilder: content must be larger than length 0") - errConversationIdNotSet = errors.New("failed to build MessageBuilder: conversationId is empty") - errSelfParticipantIdNotSet = errors.New("failed to build MessageBuilder: selfParticipantId is empty") + errConversationIdNotSet = errors.New("failed to build MessageBuilder: conversationID is empty") + errSelfParticipantIdNotSet = errors.New("failed to build MessageBuilder: selfParticipantID is empty") ) type MessageBuilder struct { client *Client content string - conversationId string - tmpId string - selfParticipantId string + conversationID string + tmpID string + selfParticipantID string images []*MediaUpload @@ -44,42 +44,42 @@ func (mb *MessageBuilder) SetContent(content string) *MessageBuilder { return mb } -func (mb *MessageBuilder) GetConversationId() string { - return mb.conversationId +func (mb *MessageBuilder) GetConversationID() string { + return mb.conversationID } -func (mb *MessageBuilder) SetConversationId(conversationId string) *MessageBuilder { - mb.conversationId = conversationId +func (mb *MessageBuilder) SetConversationID(conversationId string) *MessageBuilder { + mb.conversationID = conversationId return mb } -func (mb *MessageBuilder) GetSelfParticipantId() string { - return mb.selfParticipantId +func (mb *MessageBuilder) GetSelfParticipantID() string { + return mb.selfParticipantID } // sendmessage function will set this automatically but if u want to set it yourself feel free -func (mb *MessageBuilder) SetSelfParticipantId(participantId string) *MessageBuilder { - mb.selfParticipantId = participantId +func (mb *MessageBuilder) SetSelfParticipantID(participantId string) *MessageBuilder { + mb.selfParticipantID = participantId return mb } -func (mb *MessageBuilder) GetTmpId() string { - return mb.tmpId +func (mb *MessageBuilder) GetTmpID() string { + return mb.tmpID } // sendmessage function will set this automatically but if u want to set it yourself feel free -func (mb *MessageBuilder) SetTmpId(tmpId string) *MessageBuilder { - mb.tmpId = tmpId +func (mb *MessageBuilder) SetTmpID(tmpId string) *MessageBuilder { + mb.tmpID = tmpId return mb } func (mb *MessageBuilder) Build() (*binary.SendMessagePayload, error) { - if mb.conversationId == "" { + if mb.conversationID == "" { return nil, errConversationIdNotSet } - if mb.selfParticipantId == "" { + if mb.selfParticipantID == "" { return nil, errSelfParticipantIdNotSet } @@ -87,8 +87,8 @@ func (mb *MessageBuilder) Build() (*binary.SendMessagePayload, error) { return nil, errContentNotSet } - if mb.tmpId == "" { - mb.tmpId = util.GenerateTmpId() + if mb.tmpID == "" { + mb.tmpID = util.GenerateTmpId() } return mb.newSendConversationMessage(), nil @@ -100,17 +100,17 @@ func (c *Client) NewMessageBuilder() *MessageBuilder { } tmpId := util.GenerateTmpId() - mb.SetTmpId(tmpId) + mb.SetTmpID(tmpId) return mb } func (mb *MessageBuilder) newSendConversationMessage() *binary.SendMessagePayload { - convId := mb.GetConversationId() + convID := mb.GetConversationID() content := mb.GetContent() - selfParticipantId := mb.GetSelfParticipantId() - tmpId := mb.GetTmpId() + selfParticipantID := mb.GetSelfParticipantID() + tmpID := mb.GetTmpID() messageInfo := make([]*binary.MessageInfo, 0) messageInfo = append(messageInfo, &binary.MessageInfo{Data: &binary.MessageInfo_MessageContent{ @@ -122,15 +122,15 @@ func (mb *MessageBuilder) newSendConversationMessage() *binary.SendMessagePayloa mb.appendImagesPayload(&messageInfo) sendMsgPayload := &binary.SendMessagePayload{ - ConversationId: convId, + ConversationID: convID, MessagePayload: &binary.MessagePayload{ - TmpId: tmpId, - ConversationId: convId, - SelfParticipantId: selfParticipantId, + TmpID: tmpID, + ConversationID: convID, + SelfParticipantID: selfParticipantID, MessageInfo: messageInfo, - TmpId2: tmpId, + TmpID2: tmpID, }, - TmpId: tmpId, + TmpID: tmpID, } if len(content) > 0 { sendMsgPayload.MessagePayload.MessagePayloadContent = &binary.MessagePayloadContent{ @@ -160,7 +160,7 @@ func (mb *MessageBuilder) newImageContent(media *MediaUpload) *binary.MessageInf Data: &binary.MessageInfo_ImageContent{ ImageContent: &binary.ImageContent{ SomeNumber: media.Image.GetImageType().Type, - ImageId: media.MediaId, + ImageID: media.MediaID, ImageName: media.Image.GetImageName(), Size: media.Image.GetImageSize(), DecryptionKey: media.Image.GetImageCryptor().GetKey(), diff --git a/libgm/msg_handler.go b/libgm/msg_handler.go index 3303d66..ac466cd 100644 --- a/libgm/msg_handler.go +++ b/libgm/msg_handler.go @@ -41,8 +41,8 @@ func (r *RPC) HandleRPCMsg(msgArr []interface{}) { } //hasBody := parsedResponse.Data.EncryptedData == nil //r.client.Logger.Info().Any("msgData", parsedResponse).Msg("Got event!") - r.client.sessionHandler.addResponseAck(parsedResponse.ResponseId) - _, waitingForResponse := r.client.sessionHandler.requests[parsedResponse.Data.RequestId] + r.client.sessionHandler.addResponseAck(parsedResponse.ResponseID) + _, waitingForResponse := r.client.sessionHandler.requests[parsedResponse.Data.RequestID] //log.Println(fmt.Sprintf("%v %v %v %v %v %v %v", parsedResponse.RoutingOpCode, parsedResponse.Data.Opcode, parsedResponse.Data.Sub, parsedResponse.Data.Third, parsedResponse.Data.Field9, hasBody, waitingForResponse)) //r.client.Logger.Debug().Any("waitingForResponse?", waitingForResponse).Msg("Got rpc response from server") if parsedResponse.Data.Opcode == 16 || waitingForResponse { diff --git a/libgm/payload/getWebEncryptionKey.go b/libgm/payload/getWebEncryptionKey.go index 18cdb8e..b261410 100644 --- a/libgm/payload/getWebEncryptionKey.go +++ b/libgm/payload/getWebEncryptionKey.go @@ -9,7 +9,7 @@ func GetWebEncryptionKey(WebPairKey []byte) ([]byte, *binary.Container, error) { id := util.RandomUUIDv4() payload := &binary.Container{ PhoneRelay: &binary.PhoneRelayBody{ - Id: id, + ID: id, RpcKey: WebPairKey, Date: &binary.Date{ Year: 2023, diff --git a/libgm/payload/receiveMessages.go b/libgm/payload/receiveMessages.go index 3bfb3d4..2149f35 100644 --- a/libgm/payload/receiveMessages.go +++ b/libgm/payload/receiveMessages.go @@ -12,7 +12,7 @@ import ( func ReceiveMessages(rpcKey []byte) ([]byte, string, error) { payload := &binary.ReceiveMessagesRequest{ Auth: &binary.AuthMessage{ - RequestId: uuid.New().String(), + RequestID: uuid.New().String(), RpcKey: rpcKey, Date: &binary.Date{ Year: 2023, @@ -34,5 +34,5 @@ func ReceiveMessages(rpcKey []byte) ([]byte, string, error) { if err != nil { return nil, "", err } - return jsonData, payload.Auth.RequestId, nil + return jsonData, payload.Auth.RequestID, nil } diff --git a/libgm/payload/refreshPhoneRelay.go b/libgm/payload/refreshPhoneRelay.go index e07caab..3d83681 100644 --- a/libgm/payload/refreshPhoneRelay.go +++ b/libgm/payload/refreshPhoneRelay.go @@ -8,7 +8,7 @@ import ( func RefreshPhoneRelay(rpcKey []byte) ([]byte, *binary.Container, error) { payload := &binary.Container{ PhoneRelay: &binary.PhoneRelayBody{ - Id: util.RandomUUIDv4(), + ID: util.RandomUUIDv4(), Bugle: "Bugle", RpcKey: rpcKey, Date: &binary.Date{ diff --git a/libgm/payload/registerPhoneRelay.go b/libgm/payload/registerPhoneRelay.go index 4316a38..31d9bb2 100644 --- a/libgm/payload/registerPhoneRelay.go +++ b/libgm/payload/registerPhoneRelay.go @@ -32,7 +32,7 @@ func RegisterPhoneRelay(jwk *crypto.JWK) ([]byte, *binary.Container, error) { payloadData := &binary.Container{ PhoneRelay: &binary.PhoneRelayBody{ - Id: id, + ID: id, Bugle: "Bugle", Date: &binary.Date{ Year: 2023, diff --git a/libgm/payload/sendMessage.go b/libgm/payload/sendMessage.go index de0b17c..b0337bb 100644 --- a/libgm/payload/sendMessage.go +++ b/libgm/payload/sendMessage.go @@ -4,7 +4,7 @@ import "go.mau.fi/mautrix-gmessages/libgm/binary" func NewMessageData(requestID string, encodedStr string, routingOpCode int64, msgType int64) *binary.MessageData { return &binary.MessageData{ - RequestId: requestID, + RequestID: requestID, RoutingOpCode: routingOpCode, EncodedData: encodedStr, MsgTypeArr: &binary.MsgTypeArr{ @@ -14,18 +14,18 @@ func NewMessageData(requestID string, encodedStr string, routingOpCode int64, ms } } -func NewEncodedPayload(requestId string, opCode int64, encryptedData []byte, sessionId string) *binary.EncodedPayload { +func NewEncodedPayload(requestId string, opCode int64, encryptedData []byte, sessionID string) *binary.EncodedPayload { return &binary.EncodedPayload{ - RequestId: requestId, + RequestID: requestId, Opcode: opCode, EncryptedData: encryptedData, - SessionId: sessionId, + SessionID: sessionID, } } func NewAuthData(requestId string, rpcKey []byte, date *binary.Date) *binary.AuthMessage { return &binary.AuthMessage{ - RequestId: requestId, + RequestID: requestId, RpcKey: rpcKey, Date: date, } @@ -36,7 +36,7 @@ func NewSendMessage(pairedDevice *binary.Device, messageData *binary.MessageData PairedDevice: pairedDevice, MessageData: messageData, AuthData: authData, - Ttl: ttl, + TTL: ttl, EmptyArr: &binary.EmptyArr{}, } } diff --git a/libgm/qr.go b/libgm/qr.go index e9ed186..9e4dd86 100644 --- a/libgm/qr.go +++ b/libgm/qr.go @@ -9,9 +9,9 @@ import ( func (p *Pairer) GenerateQRCodeData() (string, error) { urlData := &binary.UrlData{ - PairingKey: p.pairingKey, - AES_CTR_KEY_256: p.client.cryptor.AES_CTR_KEY_256, - SHA_256_KEY: p.client.cryptor.SHA_256_KEY, + PairingKey: p.pairingKey, + AESCTR256Key: p.client.cryptor.AESCTR256Key, + SHA256Key: p.client.cryptor.SHA256Key, } encodedUrlData, err := binary.EncodeProtoMessage(urlData) if err != nil { diff --git a/libgm/response_handler.go b/libgm/response_handler.go index 6c2328f..6b59a98 100644 --- a/libgm/response_handler.go +++ b/libgm/response_handler.go @@ -42,7 +42,7 @@ func (s *SessionHandler) addRequestToChannel(requestId string, opCode int64) { } func (s *SessionHandler) respondToRequestChannel(res *Response) { - requestId := res.Data.RequestId + requestId := res.Data.RequestID reqChannel, ok := s.requests[requestId] if !ok { return diff --git a/libgm/rpc.go b/libgm/rpc.go index 0df0b0e..dfab147 100644 --- a/libgm/rpc.go +++ b/libgm/rpc.go @@ -17,7 +17,7 @@ type RPC struct { client *Client http *http.Client conn io.ReadCloser - rpcSessionId string + rpcSessionID string webAuthKey []byte } diff --git a/libgm/session.go b/libgm/session.go index a71b022..0717481 100644 --- a/libgm/session.go +++ b/libgm/session.go @@ -10,7 +10,7 @@ type Session struct { } func (s *Session) SetActiveSession() (*util.SessionResponse, error) { - s.client.sessionHandler.ResetSessionId() + s.client.sessionHandler.ResetSessionID() prepareResponses, prepareSessionErr := s.prepareNewSession.Execute() if prepareSessionErr != nil { @@ -36,9 +36,9 @@ type prepareNewSession struct { func (p *prepareNewSession) Execute() ([]*Response, error) { instruction, _ := p.client.instructions.GetInstruction(PREPARE_NEW_SESSION_OPCODE) - sentRequestId, _ := p.client.createAndSendRequest(instruction.Opcode, p.client.ttl, false, nil) + sentRequestID, _ := p.client.createAndSendRequest(instruction.Opcode, p.client.ttl, false, nil) - responses, err := p.client.sessionHandler.WaitForResponse(sentRequestId, instruction.Opcode) + responses, err := p.client.sessionHandler.WaitForResponse(sentRequestID, instruction.Opcode) if err != nil { return nil, err } @@ -52,9 +52,9 @@ type newSession struct { func (n *newSession) Execute() ([]*Response, error) { instruction, _ := n.client.instructions.GetInstruction(NEW_SESSION_OPCODE) - sentRequestId, _ := n.client.createAndSendRequest(instruction.Opcode, 0, true, nil) + sentRequestID, _ := n.client.createAndSendRequest(instruction.Opcode, 0, true, nil) - responses, err := n.client.sessionHandler.WaitForResponse(sentRequestId, instruction.Opcode) + responses, err := n.client.sessionHandler.WaitForResponse(sentRequestID, instruction.Opcode) if err != nil { return nil, err } diff --git a/libgm/session_handler.go b/libgm/session_handler.go index b975ad8..b099e4d 100644 --- a/libgm/session_handler.go +++ b/libgm/session_handler.go @@ -18,7 +18,7 @@ import ( type Response struct { client *Client - ResponseId string + ResponseID string RoutingOpCode int64 Data *binary.EncodedResponse // base64 encoded (decode -> protomessage) @@ -34,7 +34,7 @@ type SessionHandler struct { ackMap []string ackTicker *time.Ticker - sessionId string + sessionID string responseTimeout time.Duration } @@ -43,8 +43,8 @@ func (s *SessionHandler) SetResponseTimeout(milliSeconds int) { s.responseTimeout = time.Duration(milliSeconds) * time.Millisecond } -func (s *SessionHandler) ResetSessionId() { - s.sessionId = util.RandomUUIDv4() +func (s *SessionHandler) ResetSessionID() { + s.sessionID = util.RandomUUIDv4() } func (c *Client) createAndSendRequest(instructionId int64, ttl int64, newSession bool, encryptedProtoMessage protoreflect.Message) (string, error) { @@ -55,7 +55,7 @@ func (c *Client) createAndSendRequest(instructionId int64, ttl int64, newSession } if newSession { - requestId = c.sessionHandler.sessionId + requestId = c.sessionHandler.sessionID } var encryptedData []byte @@ -68,7 +68,7 @@ func (c *Client) createAndSendRequest(instructionId int64, ttl int64, newSession c.Logger.Info().Any("encryptedData", encryptedData).Msg("Sending request with encrypted data") } - encodedData := payload.NewEncodedPayload(requestId, instruction.Opcode, encryptedData, c.sessionHandler.sessionId) + encodedData := payload.NewEncodedPayload(requestId, instruction.Opcode, encryptedData, c.sessionHandler.sessionID) encodedStr, encodeErr := crypto.EncodeProtoB64(encodedData) if encodeErr != nil { panic(fmt.Errorf("Failed to encode data: %w", encodeErr)) @@ -77,11 +77,11 @@ func (c *Client) createAndSendRequest(instructionId int64, ttl int64, newSession authMessage := payload.NewAuthData(requestId, c.rpcKey, &binary.Date{Year: 2023, Seq1: 6, Seq2: 8, Seq3: 4, Seq4: 6}) sendMessage := payload.NewSendMessage(c.devicePair.Mobile, messageData, authMessage, ttl) - sentRequestId, reqErr := c.sessionHandler.completeSendMessage(encodedData.RequestId, instruction.Opcode, sendMessage) + sentRequestID, reqErr := c.sessionHandler.completeSendMessage(encodedData.RequestID, instruction.Opcode, sendMessage) if reqErr != nil { return "", fmt.Errorf("failed to send message request for opcode: %v", instructionId) } - return sentRequestId, nil + return sentRequestID, nil } func (s *SessionHandler) completeSendMessage(requestId string, opCode int64, msg *binary.SendMessage) (string, error) { @@ -137,7 +137,7 @@ func (s *SessionHandler) sendAckRequest() { reqId := util.RandomUUIDv4() ackMessagePayload := &binary.AckMessagePayload{ AuthData: &binary.AuthMessage{ - RequestId: reqId, + RequestID: reqId, RpcKey: s.client.rpcKey, Date: &binary.Date{Year: 2023, Seq1: 6, Seq2: 8, Seq3: 4, Seq4: 6}, }, @@ -150,7 +150,7 @@ func (s *SessionHandler) sendAckRequest() { } ackMessages := make([][]interface{}, 0) for _, reqId := range s.ackMap { - ackMessageData := &binary.AckMessageData{RequestId: reqId, Device: s.client.devicePair.Browser} + ackMessageData := &binary.AckMessageData{RequestID: reqId, Device: s.client.devicePair.Browser} ackMessageDataArr, err := pblite.Serialize(ackMessageData.ProtoReflect()) if err != nil { panic(err) @@ -179,7 +179,7 @@ func (s *SessionHandler) NewResponse(response *binary.RPCResponse) (*Response, e } return &Response{ client: s.client, - ResponseId: response.Data.RequestId, + ResponseID: response.Data.RequestID, RoutingOpCode: response.Data.RoutingOpCode, StartExecute: response.Data.Ts1, FinishExecute: response.Data.Ts2, @@ -211,5 +211,5 @@ func (r *Response) decryptData() (proto.Message, error) { return protoMessageData, nil } - return nil, fmt.Errorf("no encrypted data to decrypt for requestId: %s", r.Data.RequestId) + return nil, fmt.Errorf("no encrypted data to decrypt for requestID: %s", r.Data.RequestID) }