diff --git a/pkg/proto/sdk_ws/ws.pb.go b/pkg/proto/sdk_ws/ws.pb.go index 5a4ae90c5..1ce815b28 100644 --- a/pkg/proto/sdk_ws/ws.pb.go +++ b/pkg/proto/sdk_ws/ws.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: ws.proto +// source: sdk_ws/ws.proto -package open_im_sdk +package open_im_sdk // import "./sdk_ws" import proto "github.com/golang/protobuf/proto" import fmt "fmt" @@ -32,7 +32,7 @@ func (m *PullMessageBySeqListResp) Reset() { *m = PullMessageBySeqListRe func (m *PullMessageBySeqListResp) String() string { return proto.CompactTextString(m) } func (*PullMessageBySeqListResp) ProtoMessage() {} func (*PullMessageBySeqListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{0} + return fileDescriptor_ws_a9634e8f434358ba, []int{0} } func (m *PullMessageBySeqListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PullMessageBySeqListResp.Unmarshal(m, b) @@ -91,7 +91,7 @@ func (m *PullMessageBySeqListReq) Reset() { *m = PullMessageBySeqListReq func (m *PullMessageBySeqListReq) String() string { return proto.CompactTextString(m) } func (*PullMessageBySeqListReq) ProtoMessage() {} func (*PullMessageBySeqListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{1} + return fileDescriptor_ws_a9634e8f434358ba, []int{1} } func (m *PullMessageBySeqListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PullMessageBySeqListReq.Unmarshal(m, b) @@ -128,7 +128,7 @@ func (m *GetMaxAndMinSeqReq) Reset() { *m = GetMaxAndMinSeqReq{} } func (m *GetMaxAndMinSeqReq) String() string { return proto.CompactTextString(m) } func (*GetMaxAndMinSeqReq) ProtoMessage() {} func (*GetMaxAndMinSeqReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{2} + return fileDescriptor_ws_a9634e8f434358ba, []int{2} } func (m *GetMaxAndMinSeqReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMaxAndMinSeqReq.Unmarshal(m, b) @@ -160,7 +160,7 @@ func (m *GetMaxAndMinSeqResp) Reset() { *m = GetMaxAndMinSeqResp{} } func (m *GetMaxAndMinSeqResp) String() string { return proto.CompactTextString(m) } func (*GetMaxAndMinSeqResp) ProtoMessage() {} func (*GetMaxAndMinSeqResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{3} + return fileDescriptor_ws_a9634e8f434358ba, []int{3} } func (m *GetMaxAndMinSeqResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMaxAndMinSeqResp.Unmarshal(m, b) @@ -196,9 +196,9 @@ func (m *GetMaxAndMinSeqResp) GetMinSeq() int64 { type GatherFormat struct { // @inject_tag: json:"id" - ID string `protobuf:"bytes,1,opt,name=ID" json:"ID,omitempty"` + ID string `protobuf:"bytes,1,opt,name=ID" json:"id"` // @inject_tag: json:"list" - List []*MsgFormat `protobuf:"bytes,2,rep,name=List" json:"List,omitempty"` + List []*MsgFormat `protobuf:"bytes,2,rep,name=List" json:"list"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -208,7 +208,7 @@ func (m *GatherFormat) Reset() { *m = GatherFormat{} } func (m *GatherFormat) String() string { return proto.CompactTextString(m) } func (*GatherFormat) ProtoMessage() {} func (*GatherFormat) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{4} + return fileDescriptor_ws_a9634e8f434358ba, []int{4} } func (m *GatherFormat) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GatherFormat.Unmarshal(m, b) @@ -244,29 +244,29 @@ func (m *GatherFormat) GetList() []*MsgFormat { type MsgFormat struct { // @inject_tag: json:"sendID" - SendID string `protobuf:"bytes,1,opt,name=SendID" json:"SendID,omitempty"` + SendID string `protobuf:"bytes,1,opt,name=SendID" json:"sendID"` // @inject_tag: json:"recvID" - RecvID string `protobuf:"bytes,2,opt,name=RecvID" json:"RecvID,omitempty"` + RecvID string `protobuf:"bytes,2,opt,name=RecvID" json:"recvID"` // @inject_tag: json:"msgFrom" - MsgFrom int32 `protobuf:"varint,3,opt,name=MsgFrom" json:"MsgFrom,omitempty"` + MsgFrom int32 `protobuf:"varint,3,opt,name=MsgFrom" json:"msgFrom"` // @inject_tag: json:"contentType" - ContentType int32 `protobuf:"varint,4,opt,name=ContentType" json:"ContentType,omitempty"` + ContentType int32 `protobuf:"varint,4,opt,name=ContentType" json:"contentType"` // @inject_tag: json:"serverMsgID" - ServerMsgID string `protobuf:"bytes,5,opt,name=ServerMsgID" json:"ServerMsgID,omitempty"` + ServerMsgID string `protobuf:"bytes,5,opt,name=ServerMsgID" json:"serverMsgID"` // @inject_tag: json:"content" - Content string `protobuf:"bytes,6,opt,name=Content" json:"Content,omitempty"` + Content string `protobuf:"bytes,6,opt,name=Content" json:"content"` // @inject_tag: json:"seq" - Seq int64 `protobuf:"varint,7,opt,name=Seq" json:"Seq,omitempty"` + Seq int64 `protobuf:"varint,7,opt,name=Seq" json:"seq"` // @inject_tag: json:"sendTime" - SendTime int64 `protobuf:"varint,8,opt,name=SendTime" json:"SendTime,omitempty"` + SendTime int64 `protobuf:"varint,8,opt,name=SendTime" json:"sendTime"` // @inject_tag: json:"senderPlatformID" - SenderPlatformID int32 `protobuf:"varint,9,opt,name=SenderPlatformID" json:"SenderPlatformID,omitempty"` + SenderPlatformID int32 `protobuf:"varint,9,opt,name=SenderPlatformID" json:"senderPlatformID"` // @inject_tag: json:"senderNickName" - SenderNickName string `protobuf:"bytes,10,opt,name=SenderNickName" json:"SenderNickName,omitempty"` + SenderNickName string `protobuf:"bytes,10,opt,name=SenderNickName" json:"senderNickName"` // @inject_tag: json:"senderFaceUrl" - SenderFaceURL string `protobuf:"bytes,11,opt,name=SenderFaceURL" json:"SenderFaceURL,omitempty"` + SenderFaceURL string `protobuf:"bytes,11,opt,name=SenderFaceURL" json:"senderFaceUrl"` // @inject_tag: json:"clientMsgID" - ClientMsgID string `protobuf:"bytes,12,opt,name=ClientMsgID" json:"ClientMsgID,omitempty"` + ClientMsgID string `protobuf:"bytes,12,opt,name=ClientMsgID" json:"clientMsgID"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -276,7 +276,7 @@ func (m *MsgFormat) Reset() { *m = MsgFormat{} } func (m *MsgFormat) String() string { return proto.CompactTextString(m) } func (*MsgFormat) ProtoMessage() {} func (*MsgFormat) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{5} + return fileDescriptor_ws_a9634e8f434358ba, []int{5} } func (m *MsgFormat) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MsgFormat.Unmarshal(m, b) @@ -401,7 +401,7 @@ func (m *UserSendMsgReq) Reset() { *m = UserSendMsgReq{} } func (m *UserSendMsgReq) String() string { return proto.CompactTextString(m) } func (*UserSendMsgReq) ProtoMessage() {} func (*UserSendMsgReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{6} + return fileDescriptor_ws_a9634e8f434358ba, []int{6} } func (m *UserSendMsgReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserSendMsgReq.Unmarshal(m, b) @@ -511,7 +511,7 @@ func (m *UserSendMsgResp) Reset() { *m = UserSendMsgResp{} } func (m *UserSendMsgResp) String() string { return proto.CompactTextString(m) } func (*UserSendMsgResp) ProtoMessage() {} func (*UserSendMsgResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{7} + return fileDescriptor_ws_a9634e8f434358ba, []int{7} } func (m *UserSendMsgResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserSendMsgResp.Unmarshal(m, b) @@ -553,29 +553,34 @@ func (m *UserSendMsgResp) GetSendTime() int64 { } type MsgData struct { - SendID string `protobuf:"bytes,1,opt,name=sendID" json:"sendID,omitempty"` - RecvID string `protobuf:"bytes,2,opt,name=recvID" json:"recvID,omitempty"` - SessionType int32 `protobuf:"varint,3,opt,name=sessionType" json:"sessionType,omitempty"` - MsgFrom int32 `protobuf:"varint,4,opt,name=msgFrom" json:"msgFrom,omitempty"` - ContentType int32 `protobuf:"varint,5,opt,name=contentType" json:"contentType,omitempty"` - ServerMsgID string `protobuf:"bytes,6,opt,name=serverMsgID" json:"serverMsgID,omitempty"` - Content []byte `protobuf:"bytes,7,opt,name=content,proto3" json:"content,omitempty"` - SendTime int64 `protobuf:"varint,8,opt,name=sendTime" json:"sendTime,omitempty"` - Seq int64 `protobuf:"varint,9,opt,name=seq" json:"seq,omitempty"` - SenderPlatformID int32 `protobuf:"varint,10,opt,name=senderPlatformID" json:"senderPlatformID,omitempty"` - SenderNickName string `protobuf:"bytes,11,opt,name=senderNickName" json:"senderNickName,omitempty"` - SenderFaceURL string `protobuf:"bytes,12,opt,name=senderFaceURL" json:"senderFaceURL,omitempty"` - ClientMsgID string `protobuf:"bytes,13,opt,name=clientMsgID" json:"clientMsgID,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + SendID string `protobuf:"bytes,1,opt,name=sendID" json:"sendID,omitempty"` + RecvID string `protobuf:"bytes,2,opt,name=recvID" json:"recvID,omitempty"` + GroupID string `protobuf:"bytes,3,opt,name=groupID" json:"groupID,omitempty"` + ClientMsgID string `protobuf:"bytes,4,opt,name=clientMsgID" json:"clientMsgID,omitempty"` + ServerMsgID string `protobuf:"bytes,5,opt,name=serverMsgID" json:"serverMsgID,omitempty"` + SenderPlatformID int32 `protobuf:"varint,6,opt,name=senderPlatformID" json:"senderPlatformID,omitempty"` + SenderNickName string `protobuf:"bytes,7,opt,name=senderNickName" json:"senderNickName,omitempty"` + SenderFaceURL string `protobuf:"bytes,8,opt,name=senderFaceURL" json:"senderFaceURL,omitempty"` + SessionType int32 `protobuf:"varint,9,opt,name=sessionType" json:"sessionType,omitempty"` + MsgFrom int32 `protobuf:"varint,10,opt,name=msgFrom" json:"msgFrom,omitempty"` + ContentType int32 `protobuf:"varint,11,opt,name=contentType" json:"contentType,omitempty"` + Content []byte `protobuf:"bytes,12,opt,name=content,proto3" json:"content,omitempty"` + ForceList []string `protobuf:"bytes,13,rep,name=forceList" json:"forceList,omitempty"` + Seq int64 `protobuf:"varint,14,opt,name=seq" json:"seq,omitempty"` + SendTime int64 `protobuf:"varint,15,opt,name=sendTime" json:"sendTime,omitempty"` + CreateTime int64 `protobuf:"varint,16,opt,name=createTime" json:"createTime,omitempty"` + Options map[string]bool `protobuf:"bytes,17,rep,name=Options" json:"Options,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` + OfflinePushInfo *OfflinePushInfo `protobuf:"bytes,18,opt,name=offlinePushInfo" json:"offlinePushInfo,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *MsgData) Reset() { *m = MsgData{} } func (m *MsgData) String() string { return proto.CompactTextString(m) } func (*MsgData) ProtoMessage() {} func (*MsgData) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{8} + return fileDescriptor_ws_a9634e8f434358ba, []int{8} } func (m *MsgData) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MsgData.Unmarshal(m, b) @@ -609,25 +614,18 @@ func (m *MsgData) GetRecvID() string { return "" } -func (m *MsgData) GetSessionType() int32 { +func (m *MsgData) GetGroupID() string { if m != nil { - return m.SessionType + return m.GroupID } - return 0 + return "" } -func (m *MsgData) GetMsgFrom() int32 { +func (m *MsgData) GetClientMsgID() string { if m != nil { - return m.MsgFrom + return m.ClientMsgID } - return 0 -} - -func (m *MsgData) GetContentType() int32 { - if m != nil { - return m.ContentType - } - return 0 + return "" } func (m *MsgData) GetServerMsgID() string { @@ -637,27 +635,6 @@ func (m *MsgData) GetServerMsgID() string { return "" } -func (m *MsgData) GetContent() []byte { - if m != nil { - return m.Content - } - return nil -} - -func (m *MsgData) GetSendTime() int64 { - if m != nil { - return m.SendTime - } - return 0 -} - -func (m *MsgData) GetSeq() int64 { - if m != nil { - return m.Seq - } - return 0 -} - func (m *MsgData) GetSenderPlatformID() int32 { if m != nil { return m.SenderPlatformID @@ -679,11 +656,74 @@ func (m *MsgData) GetSenderFaceURL() string { return "" } -func (m *MsgData) GetClientMsgID() string { +func (m *MsgData) GetSessionType() int32 { if m != nil { - return m.ClientMsgID + return m.SessionType } - return "" + return 0 +} + +func (m *MsgData) GetMsgFrom() int32 { + if m != nil { + return m.MsgFrom + } + return 0 +} + +func (m *MsgData) GetContentType() int32 { + if m != nil { + return m.ContentType + } + return 0 +} + +func (m *MsgData) GetContent() []byte { + if m != nil { + return m.Content + } + return nil +} + +func (m *MsgData) GetForceList() []string { + if m != nil { + return m.ForceList + } + return nil +} + +func (m *MsgData) GetSeq() int64 { + if m != nil { + return m.Seq + } + return 0 +} + +func (m *MsgData) GetSendTime() int64 { + if m != nil { + return m.SendTime + } + return 0 +} + +func (m *MsgData) GetCreateTime() int64 { + if m != nil { + return m.CreateTime + } + return 0 +} + +func (m *MsgData) GetOptions() map[string]bool { + if m != nil { + return m.Options + } + return nil +} + +func (m *MsgData) GetOfflinePushInfo() *OfflinePushInfo { + if m != nil { + return m.OfflinePushInfo + } + return nil } type OfflinePushInfo struct { @@ -701,7 +741,7 @@ func (m *OfflinePushInfo) Reset() { *m = OfflinePushInfo{} } func (m *OfflinePushInfo) String() string { return proto.CompactTextString(m) } func (*OfflinePushInfo) ProtoMessage() {} func (*OfflinePushInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{9} + return fileDescriptor_ws_a9634e8f434358ba, []int{9} } func (m *OfflinePushInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OfflinePushInfo.Unmarshal(m, b) @@ -775,7 +815,7 @@ func (m *GroupInfo) Reset() { *m = GroupInfo{} } func (m *GroupInfo) String() string { return proto.CompactTextString(m) } func (*GroupInfo) ProtoMessage() {} func (*GroupInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{10} + return fileDescriptor_ws_a9634e8f434358ba, []int{10} } func (m *GroupInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupInfo.Unmarshal(m, b) @@ -869,7 +909,7 @@ func (m *GroupMemberFullInfo) Reset() { *m = GroupMemberFullInfo{} } func (m *GroupMemberFullInfo) String() string { return proto.CompactTextString(m) } func (*GroupMemberFullInfo) ProtoMessage() {} func (*GroupMemberFullInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{11} + return fileDescriptor_ws_a9634e8f434358ba, []int{11} } func (m *GroupMemberFullInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMemberFullInfo.Unmarshal(m, b) @@ -941,8 +981,8 @@ func (m *GroupMemberFullInfo) GetFriendRemark() string { // private, Friends have permission to view type UserInfo struct { UserID string `protobuf:"bytes,1,opt,name=UserID" json:"UserID,omitempty"` - Name string `protobuf:"bytes,2,opt,name=Name" json:"Name,omitempty"` - Icon string `protobuf:"bytes,3,opt,name=Icon" json:"Icon,omitempty"` + Nickname string `protobuf:"bytes,2,opt,name=Nickname" json:"Nickname,omitempty"` + FaceUrl string `protobuf:"bytes,3,opt,name=FaceUrl" json:"FaceUrl,omitempty"` Gender int32 `protobuf:"varint,4,opt,name=Gender" json:"Gender,omitempty"` Mobile string `protobuf:"bytes,5,opt,name=Mobile" json:"Mobile,omitempty"` Birth string `protobuf:"bytes,6,opt,name=Birth" json:"Birth,omitempty"` @@ -956,7 +996,7 @@ func (m *UserInfo) Reset() { *m = UserInfo{} } func (m *UserInfo) String() string { return proto.CompactTextString(m) } func (*UserInfo) ProtoMessage() {} func (*UserInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{12} + return fileDescriptor_ws_a9634e8f434358ba, []int{12} } func (m *UserInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserInfo.Unmarshal(m, b) @@ -983,16 +1023,16 @@ func (m *UserInfo) GetUserID() string { return "" } -func (m *UserInfo) GetName() string { +func (m *UserInfo) GetNickname() string { if m != nil { - return m.Name + return m.Nickname } return "" } -func (m *UserInfo) GetIcon() string { +func (m *UserInfo) GetFaceUrl() string { if m != nil { - return m.Icon + return m.FaceUrl } return "" } @@ -1040,7 +1080,7 @@ func (m *PublicUserInfo) Reset() { *m = PublicUserInfo{} } func (m *PublicUserInfo) String() string { return proto.CompactTextString(m) } func (*PublicUserInfo) ProtoMessage() {} func (*PublicUserInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{13} + return fileDescriptor_ws_a9634e8f434358ba, []int{13} } func (m *PublicUserInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PublicUserInfo.Unmarshal(m, b) @@ -1100,7 +1140,7 @@ func (m *TipsComm) Reset() { *m = TipsComm{} } func (m *TipsComm) String() string { return proto.CompactTextString(m) } func (*TipsComm) ProtoMessage() {} func (*TipsComm) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{14} + return fileDescriptor_ws_a9634e8f434358ba, []int{14} } func (m *TipsComm) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TipsComm.Unmarshal(m, b) @@ -1138,7 +1178,7 @@ func (m *TipsComm) GetDefaultTips() string { // Actively join the group type MemberEnterTips struct { Group *GroupInfo `protobuf:"bytes,1,opt,name=Group" json:"Group,omitempty"` - Member *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=Member" json:"Member,omitempty"` + EntrantUser *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=EntrantUser" json:"EntrantUser,omitempty"` OperationTime uint64 `protobuf:"varint,3,opt,name=OperationTime" json:"OperationTime,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -1149,7 +1189,7 @@ func (m *MemberEnterTips) Reset() { *m = MemberEnterTips{} } func (m *MemberEnterTips) String() string { return proto.CompactTextString(m) } func (*MemberEnterTips) ProtoMessage() {} func (*MemberEnterTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{15} + return fileDescriptor_ws_a9634e8f434358ba, []int{15} } func (m *MemberEnterTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberEnterTips.Unmarshal(m, b) @@ -1176,9 +1216,9 @@ func (m *MemberEnterTips) GetGroup() *GroupInfo { return nil } -func (m *MemberEnterTips) GetMember() *GroupMemberFullInfo { +func (m *MemberEnterTips) GetEntrantUser() *GroupMemberFullInfo { if m != nil { - return m.Member + return m.EntrantUser } return nil } @@ -1193,7 +1233,7 @@ func (m *MemberEnterTips) GetOperationTime() uint64 { // Actively leave the group type MemberLeaveTips struct { Group *GroupInfo `protobuf:"bytes,1,opt,name=Group" json:"Group,omitempty"` - Member *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=Member" json:"Member,omitempty"` + LeaverUser *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=LeaverUser" json:"LeaverUser,omitempty"` OperationTime uint64 `protobuf:"varint,3,opt,name=OperationTime" json:"OperationTime,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -1204,7 +1244,7 @@ func (m *MemberLeaveTips) Reset() { *m = MemberLeaveTips{} } func (m *MemberLeaveTips) String() string { return proto.CompactTextString(m) } func (*MemberLeaveTips) ProtoMessage() {} func (*MemberLeaveTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{16} + return fileDescriptor_ws_a9634e8f434358ba, []int{16} } func (m *MemberLeaveTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberLeaveTips.Unmarshal(m, b) @@ -1231,9 +1271,9 @@ func (m *MemberLeaveTips) GetGroup() *GroupInfo { return nil } -func (m *MemberLeaveTips) GetMember() *GroupMemberFullInfo { +func (m *MemberLeaveTips) GetLeaverUser() *GroupMemberFullInfo { if m != nil { - return m.Member + return m.LeaverUser } return nil } @@ -1248,7 +1288,7 @@ func (m *MemberLeaveTips) GetOperationTime() uint64 { type MemberInvitedTips struct { Group *GroupInfo `protobuf:"bytes,1,opt,name=Group" json:"Group,omitempty"` OpUser *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=OpUser" json:"OpUser,omitempty"` - Member *GroupMemberFullInfo `protobuf:"bytes,3,opt,name=Member" json:"Member,omitempty"` + InvitedUser *GroupMemberFullInfo `protobuf:"bytes,3,opt,name=InvitedUser" json:"InvitedUser,omitempty"` OperationTime uint64 `protobuf:"varint,4,opt,name=OperationTime" json:"OperationTime,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -1259,7 +1299,7 @@ func (m *MemberInvitedTips) Reset() { *m = MemberInvitedTips{} } func (m *MemberInvitedTips) String() string { return proto.CompactTextString(m) } func (*MemberInvitedTips) ProtoMessage() {} func (*MemberInvitedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{17} + return fileDescriptor_ws_a9634e8f434358ba, []int{17} } func (m *MemberInvitedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberInvitedTips.Unmarshal(m, b) @@ -1293,9 +1333,9 @@ func (m *MemberInvitedTips) GetOpUser() *GroupMemberFullInfo { return nil } -func (m *MemberInvitedTips) GetMember() *GroupMemberFullInfo { +func (m *MemberInvitedTips) GetInvitedUser() *GroupMemberFullInfo { if m != nil { - return m.Member + return m.InvitedUser } return nil } @@ -1310,7 +1350,7 @@ func (m *MemberInvitedTips) GetOperationTime() uint64 { type MemberKickedTips struct { Group *GroupInfo `protobuf:"bytes,1,opt,name=Group" json:"Group,omitempty"` OpUser *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=OpUser" json:"OpUser,omitempty"` - Member *GroupMemberFullInfo `protobuf:"bytes,3,opt,name=Member" json:"Member,omitempty"` + KickedUser *GroupMemberFullInfo `protobuf:"bytes,3,opt,name=KickedUser" json:"KickedUser,omitempty"` OperationTime uint64 `protobuf:"varint,4,opt,name=OperationTime" json:"OperationTime,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -1321,7 +1361,7 @@ func (m *MemberKickedTips) Reset() { *m = MemberKickedTips{} } func (m *MemberKickedTips) String() string { return proto.CompactTextString(m) } func (*MemberKickedTips) ProtoMessage() {} func (*MemberKickedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{18} + return fileDescriptor_ws_a9634e8f434358ba, []int{18} } func (m *MemberKickedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberKickedTips.Unmarshal(m, b) @@ -1355,9 +1395,9 @@ func (m *MemberKickedTips) GetOpUser() *GroupMemberFullInfo { return nil } -func (m *MemberKickedTips) GetMember() *GroupMemberFullInfo { +func (m *MemberKickedTips) GetKickedUser() *GroupMemberFullInfo { if m != nil { - return m.Member + return m.KickedUser } return nil } @@ -1369,81 +1409,22 @@ func (m *MemberKickedTips) GetOperationTime() uint64 { return 0 } -type GroupMemberChangeInfo struct { +type MemberInfoChangedTips struct { ChangeType int32 `protobuf:"varint,1,opt,name=ChangeType" json:"ChangeType,omitempty"` OpUser *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=OpUser" json:"OpUser,omitempty"` - Member *GroupMemberFullInfo `protobuf:"bytes,3,opt,name=Member" json:"Member,omitempty"` + FinalInfo *GroupMemberFullInfo `protobuf:"bytes,3,opt,name=FinalInfo" json:"FinalInfo,omitempty"` MuteTime uint64 `protobuf:"varint,4,opt,name=MuteTime" json:"MuteTime,omitempty"` + Group *GroupInfo `protobuf:"bytes,5,opt,name=Group" json:"Group,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *GroupMemberChangeInfo) Reset() { *m = GroupMemberChangeInfo{} } -func (m *GroupMemberChangeInfo) String() string { return proto.CompactTextString(m) } -func (*GroupMemberChangeInfo) ProtoMessage() {} -func (*GroupMemberChangeInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{19} -} -func (m *GroupMemberChangeInfo) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GroupMemberChangeInfo.Unmarshal(m, b) -} -func (m *GroupMemberChangeInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GroupMemberChangeInfo.Marshal(b, m, deterministic) -} -func (dst *GroupMemberChangeInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_GroupMemberChangeInfo.Merge(dst, src) -} -func (m *GroupMemberChangeInfo) XXX_Size() int { - return xxx_messageInfo_GroupMemberChangeInfo.Size(m) -} -func (m *GroupMemberChangeInfo) XXX_DiscardUnknown() { - xxx_messageInfo_GroupMemberChangeInfo.DiscardUnknown(m) -} - -var xxx_messageInfo_GroupMemberChangeInfo proto.InternalMessageInfo - -func (m *GroupMemberChangeInfo) GetChangeType() int32 { - if m != nil { - return m.ChangeType - } - return 0 -} - -func (m *GroupMemberChangeInfo) GetOpUser() *GroupMemberFullInfo { - if m != nil { - return m.OpUser - } - return nil -} - -func (m *GroupMemberChangeInfo) GetMember() *GroupMemberFullInfo { - if m != nil { - return m.Member - } - return nil -} - -func (m *GroupMemberChangeInfo) GetMuteTime() uint64 { - if m != nil { - return m.MuteTime - } - return 0 -} - -type MemberInfoChangedTips struct { - Group *GroupInfo `protobuf:"bytes,1,opt,name=Group" json:"Group,omitempty"` - MemberChanged *GroupMemberChangeInfo `protobuf:"bytes,2,opt,name=MemberChanged" json:"MemberChanged,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - func (m *MemberInfoChangedTips) Reset() { *m = MemberInfoChangedTips{} } func (m *MemberInfoChangedTips) String() string { return proto.CompactTextString(m) } func (*MemberInfoChangedTips) ProtoMessage() {} func (*MemberInfoChangedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{20} + return fileDescriptor_ws_a9634e8f434358ba, []int{19} } func (m *MemberInfoChangedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberInfoChangedTips.Unmarshal(m, b) @@ -1463,16 +1444,37 @@ func (m *MemberInfoChangedTips) XXX_DiscardUnknown() { var xxx_messageInfo_MemberInfoChangedTips proto.InternalMessageInfo -func (m *MemberInfoChangedTips) GetGroup() *GroupInfo { +func (m *MemberInfoChangedTips) GetChangeType() int32 { if m != nil { - return m.Group + return m.ChangeType + } + return 0 +} + +func (m *MemberInfoChangedTips) GetOpUser() *GroupMemberFullInfo { + if m != nil { + return m.OpUser } return nil } -func (m *MemberInfoChangedTips) GetMemberChanged() *GroupMemberChangeInfo { +func (m *MemberInfoChangedTips) GetFinalInfo() *GroupMemberFullInfo { if m != nil { - return m.MemberChanged + return m.FinalInfo + } + return nil +} + +func (m *MemberInfoChangedTips) GetMuteTime() uint64 { + if m != nil { + return m.MuteTime + } + return 0 +} + +func (m *MemberInfoChangedTips) GetGroup() *GroupInfo { + if m != nil { + return m.Group } return nil } @@ -1491,7 +1493,7 @@ func (m *GroupCreatedTips) Reset() { *m = GroupCreatedTips{} } func (m *GroupCreatedTips) String() string { return proto.CompactTextString(m) } func (*GroupCreatedTips) ProtoMessage() {} func (*GroupCreatedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{21} + return fileDescriptor_ws_a9634e8f434358ba, []int{20} } func (m *GroupCreatedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupCreatedTips.Unmarshal(m, b) @@ -1552,7 +1554,7 @@ func (m *GroupInfoChangedTips) Reset() { *m = GroupInfoChangedTips{} } func (m *GroupInfoChangedTips) String() string { return proto.CompactTextString(m) } func (*GroupInfoChangedTips) ProtoMessage() {} func (*GroupInfoChangedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{22} + return fileDescriptor_ws_a9634e8f434358ba, []int{21} } func (m *GroupInfoChangedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupInfoChangedTips.Unmarshal(m, b) @@ -1606,7 +1608,7 @@ func (m *ReceiveJoinApplicationTips) Reset() { *m = ReceiveJoinApplicati func (m *ReceiveJoinApplicationTips) String() string { return proto.CompactTextString(m) } func (*ReceiveJoinApplicationTips) ProtoMessage() {} func (*ReceiveJoinApplicationTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{23} + return fileDescriptor_ws_a9634e8f434358ba, []int{22} } func (m *ReceiveJoinApplicationTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ReceiveJoinApplicationTips.Unmarshal(m, b) @@ -1661,7 +1663,7 @@ func (m *ApplicationProcessedTips) Reset() { *m = ApplicationProcessedTi func (m *ApplicationProcessedTips) String() string { return proto.CompactTextString(m) } func (*ApplicationProcessedTips) ProtoMessage() {} func (*ApplicationProcessedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{24} + return fileDescriptor_ws_a9634e8f434358ba, []int{23} } func (m *ApplicationProcessedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ApplicationProcessedTips.Unmarshal(m, b) @@ -1711,10 +1713,10 @@ func (m *ApplicationProcessedTips) GetReason() string { // ////////////////////friend///////////////////// type FriendInfo struct { - OwnerUserID string `protobuf:"bytes,1,opt,name=OwnerUserID" json:"OwnerUserID,omitempty"` + OwnerUser *UserInfo `protobuf:"bytes,1,opt,name=OwnerUser" json:"OwnerUser,omitempty"` Remark string `protobuf:"bytes,2,opt,name=Remark" json:"Remark,omitempty"` CreateTime uint64 `protobuf:"varint,3,opt,name=CreateTime" json:"CreateTime,omitempty"` - FriendUserInfo *UserInfo `protobuf:"bytes,4,opt,name=FriendUserInfo" json:"FriendUserInfo,omitempty"` + FriendUser *UserInfo `protobuf:"bytes,4,opt,name=FriendUser" json:"FriendUser,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1724,7 +1726,7 @@ func (m *FriendInfo) Reset() { *m = FriendInfo{} } func (m *FriendInfo) String() string { return proto.CompactTextString(m) } func (*FriendInfo) ProtoMessage() {} func (*FriendInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{25} + return fileDescriptor_ws_a9634e8f434358ba, []int{24} } func (m *FriendInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendInfo.Unmarshal(m, b) @@ -1744,11 +1746,11 @@ func (m *FriendInfo) XXX_DiscardUnknown() { var xxx_messageInfo_FriendInfo proto.InternalMessageInfo -func (m *FriendInfo) GetOwnerUserID() string { +func (m *FriendInfo) GetOwnerUser() *UserInfo { if m != nil { - return m.OwnerUserID + return m.OwnerUser } - return "" + return nil } func (m *FriendInfo) GetRemark() string { @@ -1765,17 +1767,17 @@ func (m *FriendInfo) GetCreateTime() uint64 { return 0 } -func (m *FriendInfo) GetFriendUserInfo() *UserInfo { +func (m *FriendInfo) GetFriendUser() *UserInfo { if m != nil { - return m.FriendUserInfo + return m.FriendUser } return nil } type FriendApplication struct { - AddTime uint64 `protobuf:"varint,4,opt,name=AddTime" json:"AddTime,omitempty"` - AddSource string `protobuf:"bytes,5,opt,name=AddSource" json:"AddSource,omitempty"` - AddWording string `protobuf:"bytes,6,opt,name=AddWording" json:"AddWording,omitempty"` + AddTime uint64 `protobuf:"varint,1,opt,name=AddTime" json:"AddTime,omitempty"` + AddSource string `protobuf:"bytes,2,opt,name=AddSource" json:"AddSource,omitempty"` + AddWording string `protobuf:"bytes,3,opt,name=AddWording" json:"AddWording,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1785,7 +1787,7 @@ func (m *FriendApplication) Reset() { *m = FriendApplication{} } func (m *FriendApplication) String() string { return proto.CompactTextString(m) } func (*FriendApplication) ProtoMessage() {} func (*FriendApplication) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{26} + return fileDescriptor_ws_a9634e8f434358ba, []int{25} } func (m *FriendApplication) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplication.Unmarshal(m, b) @@ -1827,318 +1829,383 @@ func (m *FriendApplication) GetAddWording() string { } // user1 add user2 -type FriendApplicationListAddedTips struct { +type FriendApplicationAddedTips struct { OpUser *PublicUserInfo `protobuf:"bytes,1,opt,name=OpUser" json:"OpUser,omitempty"` Application *FriendApplication `protobuf:"bytes,2,opt,name=Application" json:"Application,omitempty"` OpedUser *PublicUserInfo `protobuf:"bytes,3,opt,name=OpedUser" json:"OpedUser,omitempty"` + OperationTime uint64 `protobuf:"varint,4,opt,name=OperationTime" json:"OperationTime,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *FriendApplicationListAddedTips) Reset() { *m = FriendApplicationListAddedTips{} } -func (m *FriendApplicationListAddedTips) String() string { return proto.CompactTextString(m) } -func (*FriendApplicationListAddedTips) ProtoMessage() {} -func (*FriendApplicationListAddedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{27} +func (m *FriendApplicationAddedTips) Reset() { *m = FriendApplicationAddedTips{} } +func (m *FriendApplicationAddedTips) String() string { return proto.CompactTextString(m) } +func (*FriendApplicationAddedTips) ProtoMessage() {} +func (*FriendApplicationAddedTips) Descriptor() ([]byte, []int) { + return fileDescriptor_ws_a9634e8f434358ba, []int{26} } -func (m *FriendApplicationListAddedTips) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_FriendApplicationListAddedTips.Unmarshal(m, b) +func (m *FriendApplicationAddedTips) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_FriendApplicationAddedTips.Unmarshal(m, b) } -func (m *FriendApplicationListAddedTips) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_FriendApplicationListAddedTips.Marshal(b, m, deterministic) +func (m *FriendApplicationAddedTips) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_FriendApplicationAddedTips.Marshal(b, m, deterministic) } -func (dst *FriendApplicationListAddedTips) XXX_Merge(src proto.Message) { - xxx_messageInfo_FriendApplicationListAddedTips.Merge(dst, src) +func (dst *FriendApplicationAddedTips) XXX_Merge(src proto.Message) { + xxx_messageInfo_FriendApplicationAddedTips.Merge(dst, src) } -func (m *FriendApplicationListAddedTips) XXX_Size() int { - return xxx_messageInfo_FriendApplicationListAddedTips.Size(m) +func (m *FriendApplicationAddedTips) XXX_Size() int { + return xxx_messageInfo_FriendApplicationAddedTips.Size(m) } -func (m *FriendApplicationListAddedTips) XXX_DiscardUnknown() { - xxx_messageInfo_FriendApplicationListAddedTips.DiscardUnknown(m) +func (m *FriendApplicationAddedTips) XXX_DiscardUnknown() { + xxx_messageInfo_FriendApplicationAddedTips.DiscardUnknown(m) } -var xxx_messageInfo_FriendApplicationListAddedTips proto.InternalMessageInfo +var xxx_messageInfo_FriendApplicationAddedTips proto.InternalMessageInfo -func (m *FriendApplicationListAddedTips) GetOpUser() *PublicUserInfo { +func (m *FriendApplicationAddedTips) GetOpUser() *PublicUserInfo { if m != nil { return m.OpUser } return nil } -func (m *FriendApplicationListAddedTips) GetApplication() *FriendApplication { +func (m *FriendApplicationAddedTips) GetApplication() *FriendApplication { if m != nil { return m.Application } return nil } -func (m *FriendApplicationListAddedTips) GetOpedUser() *PublicUserInfo { +func (m *FriendApplicationAddedTips) GetOpedUser() *PublicUserInfo { if m != nil { return m.OpedUser } return nil } -// user2 accept -type FriendApplicationListAcceptTips struct { +func (m *FriendApplicationAddedTips) GetOperationTime() uint64 { + if m != nil { + return m.OperationTime + } + return 0 +} + +// user2 accept or reject +type FriendApplicationProcessedTips struct { OpUser *PublicUserInfo `protobuf:"bytes,1,opt,name=OpUser" json:"OpUser,omitempty"` OpedUser *PublicUserInfo `protobuf:"bytes,2,opt,name=OpedUser" json:"OpedUser,omitempty"` + Result int32 `protobuf:"varint,3,opt,name=result" json:"result,omitempty"` + OperationTime uint64 `protobuf:"varint,4,opt,name=OperationTime" json:"OperationTime,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *FriendApplicationListAcceptTips) Reset() { *m = FriendApplicationListAcceptTips{} } -func (m *FriendApplicationListAcceptTips) String() string { return proto.CompactTextString(m) } -func (*FriendApplicationListAcceptTips) ProtoMessage() {} -func (*FriendApplicationListAcceptTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{28} +func (m *FriendApplicationProcessedTips) Reset() { *m = FriendApplicationProcessedTips{} } +func (m *FriendApplicationProcessedTips) String() string { return proto.CompactTextString(m) } +func (*FriendApplicationProcessedTips) ProtoMessage() {} +func (*FriendApplicationProcessedTips) Descriptor() ([]byte, []int) { + return fileDescriptor_ws_a9634e8f434358ba, []int{27} } -func (m *FriendApplicationListAcceptTips) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_FriendApplicationListAcceptTips.Unmarshal(m, b) +func (m *FriendApplicationProcessedTips) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_FriendApplicationProcessedTips.Unmarshal(m, b) } -func (m *FriendApplicationListAcceptTips) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_FriendApplicationListAcceptTips.Marshal(b, m, deterministic) +func (m *FriendApplicationProcessedTips) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_FriendApplicationProcessedTips.Marshal(b, m, deterministic) } -func (dst *FriendApplicationListAcceptTips) XXX_Merge(src proto.Message) { - xxx_messageInfo_FriendApplicationListAcceptTips.Merge(dst, src) +func (dst *FriendApplicationProcessedTips) XXX_Merge(src proto.Message) { + xxx_messageInfo_FriendApplicationProcessedTips.Merge(dst, src) } -func (m *FriendApplicationListAcceptTips) XXX_Size() int { - return xxx_messageInfo_FriendApplicationListAcceptTips.Size(m) +func (m *FriendApplicationProcessedTips) XXX_Size() int { + return xxx_messageInfo_FriendApplicationProcessedTips.Size(m) } -func (m *FriendApplicationListAcceptTips) XXX_DiscardUnknown() { - xxx_messageInfo_FriendApplicationListAcceptTips.DiscardUnknown(m) +func (m *FriendApplicationProcessedTips) XXX_DiscardUnknown() { + xxx_messageInfo_FriendApplicationProcessedTips.DiscardUnknown(m) } -var xxx_messageInfo_FriendApplicationListAcceptTips proto.InternalMessageInfo +var xxx_messageInfo_FriendApplicationProcessedTips proto.InternalMessageInfo -func (m *FriendApplicationListAcceptTips) GetOpUser() *PublicUserInfo { +func (m *FriendApplicationProcessedTips) GetOpUser() *PublicUserInfo { if m != nil { return m.OpUser } return nil } -func (m *FriendApplicationListAcceptTips) GetOpedUser() *PublicUserInfo { +func (m *FriendApplicationProcessedTips) GetOpedUser() *PublicUserInfo { if m != nil { return m.OpedUser } return nil } -// user2 reject -type FriendApplicationListRejectTips struct { - OpUser *PublicUserInfo `protobuf:"bytes,1,opt,name=OpUser" json:"OpUser,omitempty"` - OpedUser *PublicUserInfo `protobuf:"bytes,2,opt,name=OpedUser" json:"OpedUser,omitempty"` +func (m *FriendApplicationProcessedTips) GetResult() int32 { + if m != nil { + return m.Result + } + return 0 +} + +func (m *FriendApplicationProcessedTips) GetOperationTime() uint64 { + if m != nil { + return m.OperationTime + } + return 0 +} + +type FriendAddedTips struct { + Friend *FriendInfo `protobuf:"bytes,1,opt,name=Friend" json:"Friend,omitempty"` + OperationTime uint64 `protobuf:"varint,2,opt,name=OperationTime" json:"OperationTime,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *FriendAddedTips) Reset() { *m = FriendAddedTips{} } +func (m *FriendAddedTips) String() string { return proto.CompactTextString(m) } +func (*FriendAddedTips) ProtoMessage() {} +func (*FriendAddedTips) Descriptor() ([]byte, []int) { + return fileDescriptor_ws_a9634e8f434358ba, []int{28} +} +func (m *FriendAddedTips) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_FriendAddedTips.Unmarshal(m, b) +} +func (m *FriendAddedTips) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_FriendAddedTips.Marshal(b, m, deterministic) +} +func (dst *FriendAddedTips) XXX_Merge(src proto.Message) { + xxx_messageInfo_FriendAddedTips.Merge(dst, src) +} +func (m *FriendAddedTips) XXX_Size() int { + return xxx_messageInfo_FriendAddedTips.Size(m) +} +func (m *FriendAddedTips) XXX_DiscardUnknown() { + xxx_messageInfo_FriendAddedTips.DiscardUnknown(m) +} + +var xxx_messageInfo_FriendAddedTips proto.InternalMessageInfo + +func (m *FriendAddedTips) GetFriend() *FriendInfo { + if m != nil { + return m.Friend + } + return nil +} + +func (m *FriendAddedTips) GetOperationTime() uint64 { + if m != nil { + return m.OperationTime + } + return 0 +} + +type FriendDeletedTips struct { + Friend *FriendInfo `protobuf:"bytes,1,opt,name=Friend" json:"Friend,omitempty"` + OperationTime uint64 `protobuf:"varint,2,opt,name=OperationTime" json:"OperationTime,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *FriendDeletedTips) Reset() { *m = FriendDeletedTips{} } +func (m *FriendDeletedTips) String() string { return proto.CompactTextString(m) } +func (*FriendDeletedTips) ProtoMessage() {} +func (*FriendDeletedTips) Descriptor() ([]byte, []int) { + return fileDescriptor_ws_a9634e8f434358ba, []int{29} +} +func (m *FriendDeletedTips) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_FriendDeletedTips.Unmarshal(m, b) +} +func (m *FriendDeletedTips) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_FriendDeletedTips.Marshal(b, m, deterministic) +} +func (dst *FriendDeletedTips) XXX_Merge(src proto.Message) { + xxx_messageInfo_FriendDeletedTips.Merge(dst, src) +} +func (m *FriendDeletedTips) XXX_Size() int { + return xxx_messageInfo_FriendDeletedTips.Size(m) +} +func (m *FriendDeletedTips) XXX_DiscardUnknown() { + xxx_messageInfo_FriendDeletedTips.DiscardUnknown(m) +} + +var xxx_messageInfo_FriendDeletedTips proto.InternalMessageInfo + +func (m *FriendDeletedTips) GetFriend() *FriendInfo { + if m != nil { + return m.Friend + } + return nil +} + +func (m *FriendDeletedTips) GetOperationTime() uint64 { + if m != nil { + return m.OperationTime + } + return 0 +} + +type BlackInfo struct { + OwnerUser *PublicUserInfo `protobuf:"bytes,1,opt,name=OwnerUser" json:"OwnerUser,omitempty"` + CreateTime uint64 `protobuf:"varint,3,opt,name=CreateTime" json:"CreateTime,omitempty"` + BlackUser *PublicUserInfo `protobuf:"bytes,4,opt,name=BlackUser" json:"BlackUser,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *FriendApplicationListRejectTips) Reset() { *m = FriendApplicationListRejectTips{} } -func (m *FriendApplicationListRejectTips) String() string { return proto.CompactTextString(m) } -func (*FriendApplicationListRejectTips) ProtoMessage() {} -func (*FriendApplicationListRejectTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{29} +func (m *BlackInfo) Reset() { *m = BlackInfo{} } +func (m *BlackInfo) String() string { return proto.CompactTextString(m) } +func (*BlackInfo) ProtoMessage() {} +func (*BlackInfo) Descriptor() ([]byte, []int) { + return fileDescriptor_ws_a9634e8f434358ba, []int{30} } -func (m *FriendApplicationListRejectTips) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_FriendApplicationListRejectTips.Unmarshal(m, b) +func (m *BlackInfo) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_BlackInfo.Unmarshal(m, b) } -func (m *FriendApplicationListRejectTips) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_FriendApplicationListRejectTips.Marshal(b, m, deterministic) +func (m *BlackInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_BlackInfo.Marshal(b, m, deterministic) } -func (dst *FriendApplicationListRejectTips) XXX_Merge(src proto.Message) { - xxx_messageInfo_FriendApplicationListRejectTips.Merge(dst, src) +func (dst *BlackInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_BlackInfo.Merge(dst, src) } -func (m *FriendApplicationListRejectTips) XXX_Size() int { - return xxx_messageInfo_FriendApplicationListRejectTips.Size(m) +func (m *BlackInfo) XXX_Size() int { + return xxx_messageInfo_BlackInfo.Size(m) } -func (m *FriendApplicationListRejectTips) XXX_DiscardUnknown() { - xxx_messageInfo_FriendApplicationListRejectTips.DiscardUnknown(m) +func (m *BlackInfo) XXX_DiscardUnknown() { + xxx_messageInfo_BlackInfo.DiscardUnknown(m) } -var xxx_messageInfo_FriendApplicationListRejectTips proto.InternalMessageInfo +var xxx_messageInfo_BlackInfo proto.InternalMessageInfo -func (m *FriendApplicationListRejectTips) GetOpUser() *PublicUserInfo { +func (m *BlackInfo) GetOwnerUser() *PublicUserInfo { if m != nil { - return m.OpUser + return m.OwnerUser } return nil } -func (m *FriendApplicationListRejectTips) GetOpedUser() *PublicUserInfo { +func (m *BlackInfo) GetCreateTime() uint64 { if m != nil { - return m.OpedUser + return m.CreateTime + } + return 0 +} + +func (m *BlackInfo) GetBlackUser() *PublicUserInfo { + if m != nil { + return m.BlackUser } return nil } -type FriendListAddedTips struct { - Friend *FriendInfo `protobuf:"bytes,1,opt,name=Friend" json:"Friend,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +type BlackAddedTips struct { + Black *BlackInfo `protobuf:"bytes,1,opt,name=Black" json:"Black,omitempty"` + OperationTime uint64 `protobuf:"varint,2,opt,name=OperationTime" json:"OperationTime,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *FriendListAddedTips) Reset() { *m = FriendListAddedTips{} } -func (m *FriendListAddedTips) String() string { return proto.CompactTextString(m) } -func (*FriendListAddedTips) ProtoMessage() {} -func (*FriendListAddedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{30} +func (m *BlackAddedTips) Reset() { *m = BlackAddedTips{} } +func (m *BlackAddedTips) String() string { return proto.CompactTextString(m) } +func (*BlackAddedTips) ProtoMessage() {} +func (*BlackAddedTips) Descriptor() ([]byte, []int) { + return fileDescriptor_ws_a9634e8f434358ba, []int{31} } -func (m *FriendListAddedTips) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_FriendListAddedTips.Unmarshal(m, b) +func (m *BlackAddedTips) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_BlackAddedTips.Unmarshal(m, b) } -func (m *FriendListAddedTips) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_FriendListAddedTips.Marshal(b, m, deterministic) +func (m *BlackAddedTips) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_BlackAddedTips.Marshal(b, m, deterministic) } -func (dst *FriendListAddedTips) XXX_Merge(src proto.Message) { - xxx_messageInfo_FriendListAddedTips.Merge(dst, src) +func (dst *BlackAddedTips) XXX_Merge(src proto.Message) { + xxx_messageInfo_BlackAddedTips.Merge(dst, src) } -func (m *FriendListAddedTips) XXX_Size() int { - return xxx_messageInfo_FriendListAddedTips.Size(m) +func (m *BlackAddedTips) XXX_Size() int { + return xxx_messageInfo_BlackAddedTips.Size(m) } -func (m *FriendListAddedTips) XXX_DiscardUnknown() { - xxx_messageInfo_FriendListAddedTips.DiscardUnknown(m) +func (m *BlackAddedTips) XXX_DiscardUnknown() { + xxx_messageInfo_BlackAddedTips.DiscardUnknown(m) } -var xxx_messageInfo_FriendListAddedTips proto.InternalMessageInfo +var xxx_messageInfo_BlackAddedTips proto.InternalMessageInfo -func (m *FriendListAddedTips) GetFriend() *FriendInfo { +func (m *BlackAddedTips) GetBlack() *BlackInfo { if m != nil { - return m.Friend + return m.Black } return nil } -type FriendListDeletedTips struct { - Friend *FriendInfo `protobuf:"bytes,1,opt,name=Friend" json:"Friend,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *FriendListDeletedTips) Reset() { *m = FriendListDeletedTips{} } -func (m *FriendListDeletedTips) String() string { return proto.CompactTextString(m) } -func (*FriendListDeletedTips) ProtoMessage() {} -func (*FriendListDeletedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{31} -} -func (m *FriendListDeletedTips) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_FriendListDeletedTips.Unmarshal(m, b) -} -func (m *FriendListDeletedTips) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_FriendListDeletedTips.Marshal(b, m, deterministic) -} -func (dst *FriendListDeletedTips) XXX_Merge(src proto.Message) { - xxx_messageInfo_FriendListDeletedTips.Merge(dst, src) -} -func (m *FriendListDeletedTips) XXX_Size() int { - return xxx_messageInfo_FriendListDeletedTips.Size(m) -} -func (m *FriendListDeletedTips) XXX_DiscardUnknown() { - xxx_messageInfo_FriendListDeletedTips.DiscardUnknown(m) -} - -var xxx_messageInfo_FriendListDeletedTips proto.InternalMessageInfo - -func (m *FriendListDeletedTips) GetFriend() *FriendInfo { +func (m *BlackAddedTips) GetOperationTime() uint64 { if m != nil { - return m.Friend + return m.OperationTime + } + return 0 +} + +type BlackDeletedTips struct { + Black *BlackInfo `protobuf:"bytes,1,opt,name=Black" json:"Black,omitempty"` + OperationTime uint64 `protobuf:"varint,2,opt,name=OperationTime" json:"OperationTime,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *BlackDeletedTips) Reset() { *m = BlackDeletedTips{} } +func (m *BlackDeletedTips) String() string { return proto.CompactTextString(m) } +func (*BlackDeletedTips) ProtoMessage() {} +func (*BlackDeletedTips) Descriptor() ([]byte, []int) { + return fileDescriptor_ws_a9634e8f434358ba, []int{32} +} +func (m *BlackDeletedTips) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_BlackDeletedTips.Unmarshal(m, b) +} +func (m *BlackDeletedTips) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_BlackDeletedTips.Marshal(b, m, deterministic) +} +func (dst *BlackDeletedTips) XXX_Merge(src proto.Message) { + xxx_messageInfo_BlackDeletedTips.Merge(dst, src) +} +func (m *BlackDeletedTips) XXX_Size() int { + return xxx_messageInfo_BlackDeletedTips.Size(m) +} +func (m *BlackDeletedTips) XXX_DiscardUnknown() { + xxx_messageInfo_BlackDeletedTips.DiscardUnknown(m) +} + +var xxx_messageInfo_BlackDeletedTips proto.InternalMessageInfo + +func (m *BlackDeletedTips) GetBlack() *BlackInfo { + if m != nil { + return m.Black } return nil } -type BlackListAddTips struct { - Friend *FriendInfo `protobuf:"bytes,1,opt,name=Friend" json:"Friend,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *BlackListAddTips) Reset() { *m = BlackListAddTips{} } -func (m *BlackListAddTips) String() string { return proto.CompactTextString(m) } -func (*BlackListAddTips) ProtoMessage() {} -func (*BlackListAddTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{32} -} -func (m *BlackListAddTips) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_BlackListAddTips.Unmarshal(m, b) -} -func (m *BlackListAddTips) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_BlackListAddTips.Marshal(b, m, deterministic) -} -func (dst *BlackListAddTips) XXX_Merge(src proto.Message) { - xxx_messageInfo_BlackListAddTips.Merge(dst, src) -} -func (m *BlackListAddTips) XXX_Size() int { - return xxx_messageInfo_BlackListAddTips.Size(m) -} -func (m *BlackListAddTips) XXX_DiscardUnknown() { - xxx_messageInfo_BlackListAddTips.DiscardUnknown(m) -} - -var xxx_messageInfo_BlackListAddTips proto.InternalMessageInfo - -func (m *BlackListAddTips) GetFriend() *FriendInfo { +func (m *BlackDeletedTips) GetOperationTime() uint64 { if m != nil { - return m.Friend + return m.OperationTime } - return nil -} - -type BlackListDeletedTips struct { - Friend *FriendInfo `protobuf:"bytes,1,opt,name=Friend" json:"Friend,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *BlackListDeletedTips) Reset() { *m = BlackListDeletedTips{} } -func (m *BlackListDeletedTips) String() string { return proto.CompactTextString(m) } -func (*BlackListDeletedTips) ProtoMessage() {} -func (*BlackListDeletedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{33} -} -func (m *BlackListDeletedTips) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_BlackListDeletedTips.Unmarshal(m, b) -} -func (m *BlackListDeletedTips) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_BlackListDeletedTips.Marshal(b, m, deterministic) -} -func (dst *BlackListDeletedTips) XXX_Merge(src proto.Message) { - xxx_messageInfo_BlackListDeletedTips.Merge(dst, src) -} -func (m *BlackListDeletedTips) XXX_Size() int { - return xxx_messageInfo_BlackListDeletedTips.Size(m) -} -func (m *BlackListDeletedTips) XXX_DiscardUnknown() { - xxx_messageInfo_BlackListDeletedTips.DiscardUnknown(m) -} - -var xxx_messageInfo_BlackListDeletedTips proto.InternalMessageInfo - -func (m *BlackListDeletedTips) GetFriend() *FriendInfo { - if m != nil { - return m.Friend - } - return nil + return 0 } type FriendInfoChangedTips struct { - Friend *FriendInfo `protobuf:"bytes,1,opt,name=Friend" json:"Friend,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Friend *FriendInfo `protobuf:"bytes,1,opt,name=Friend" json:"Friend,omitempty"` + OpUser *PublicUserInfo `protobuf:"bytes,2,opt,name=OpUser" json:"OpUser,omitempty"` + OperationTime uint64 `protobuf:"varint,3,opt,name=OperationTime" json:"OperationTime,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *FriendInfoChangedTips) Reset() { *m = FriendInfoChangedTips{} } func (m *FriendInfoChangedTips) String() string { return proto.CompactTextString(m) } func (*FriendInfoChangedTips) ProtoMessage() {} func (*FriendInfoChangedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{34} + return fileDescriptor_ws_a9634e8f434358ba, []int{33} } func (m *FriendInfoChangedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendInfoChangedTips.Unmarshal(m, b) @@ -2165,19 +2232,35 @@ func (m *FriendInfoChangedTips) GetFriend() *FriendInfo { return nil } +func (m *FriendInfoChangedTips) GetOpUser() *PublicUserInfo { + if m != nil { + return m.OpUser + } + return nil +} + +func (m *FriendInfoChangedTips) GetOperationTime() uint64 { + if m != nil { + return m.OperationTime + } + return 0 +} + // ////////////////////user///////////////////// type SelfInfoUpdatedTips struct { - SelfUserInfo *UserInfo `protobuf:"bytes,1,opt,name=SelfUserInfo" json:"SelfUserInfo,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + SelfUserInfo *UserInfo `protobuf:"bytes,1,opt,name=SelfUserInfo" json:"SelfUserInfo,omitempty"` + OpUser *PublicUserInfo `protobuf:"bytes,2,opt,name=OpUser" json:"OpUser,omitempty"` + OperationTime uint64 `protobuf:"varint,3,opt,name=OperationTime" json:"OperationTime,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *SelfInfoUpdatedTips) Reset() { *m = SelfInfoUpdatedTips{} } func (m *SelfInfoUpdatedTips) String() string { return proto.CompactTextString(m) } func (*SelfInfoUpdatedTips) ProtoMessage() {} func (*SelfInfoUpdatedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_e1a0eca386827677, []int{35} + return fileDescriptor_ws_a9634e8f434358ba, []int{34} } func (m *SelfInfoUpdatedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SelfInfoUpdatedTips.Unmarshal(m, b) @@ -2204,6 +2287,20 @@ func (m *SelfInfoUpdatedTips) GetSelfUserInfo() *UserInfo { return nil } +func (m *SelfInfoUpdatedTips) GetOpUser() *PublicUserInfo { + if m != nil { + return m.OpUser + } + return nil +} + +func (m *SelfInfoUpdatedTips) GetOperationTime() uint64 { + if m != nil { + return m.OperationTime + } + return 0 +} + func init() { proto.RegisterType((*PullMessageBySeqListResp)(nil), "open_im_sdk.PullMessageBySeqListResp") proto.RegisterType((*PullMessageBySeqListReq)(nil), "open_im_sdk.PullMessageBySeqListReq") @@ -2215,6 +2312,7 @@ func init() { proto.RegisterMapType((map[string]int32)(nil), "open_im_sdk.UserSendMsgReq.OptionsEntry") proto.RegisterType((*UserSendMsgResp)(nil), "open_im_sdk.UserSendMsgResp") proto.RegisterType((*MsgData)(nil), "open_im_sdk.MsgData") + proto.RegisterMapType((map[string]bool)(nil), "open_im_sdk.MsgData.OptionsEntry") proto.RegisterType((*OfflinePushInfo)(nil), "open_im_sdk.OfflinePushInfo") proto.RegisterType((*GroupInfo)(nil), "open_im_sdk.GroupInfo") proto.RegisterType((*GroupMemberFullInfo)(nil), "open_im_sdk.GroupMemberFullInfo") @@ -2225,7 +2323,6 @@ func init() { proto.RegisterType((*MemberLeaveTips)(nil), "open_im_sdk.MemberLeaveTips") proto.RegisterType((*MemberInvitedTips)(nil), "open_im_sdk.MemberInvitedTips") proto.RegisterType((*MemberKickedTips)(nil), "open_im_sdk.MemberKickedTips") - proto.RegisterType((*GroupMemberChangeInfo)(nil), "open_im_sdk.GroupMemberChangeInfo") proto.RegisterType((*MemberInfoChangedTips)(nil), "open_im_sdk.MemberInfoChangedTips") proto.RegisterType((*GroupCreatedTips)(nil), "open_im_sdk.GroupCreatedTips") proto.RegisterType((*GroupInfoChangedTips)(nil), "open_im_sdk.GroupInfoChangedTips") @@ -2233,125 +2330,135 @@ func init() { proto.RegisterType((*ApplicationProcessedTips)(nil), "open_im_sdk.ApplicationProcessedTips") proto.RegisterType((*FriendInfo)(nil), "open_im_sdk.FriendInfo") proto.RegisterType((*FriendApplication)(nil), "open_im_sdk.FriendApplication") - proto.RegisterType((*FriendApplicationListAddedTips)(nil), "open_im_sdk.FriendApplicationListAddedTips") - proto.RegisterType((*FriendApplicationListAcceptTips)(nil), "open_im_sdk.FriendApplicationListAcceptTips") - proto.RegisterType((*FriendApplicationListRejectTips)(nil), "open_im_sdk.FriendApplicationListRejectTips") - proto.RegisterType((*FriendListAddedTips)(nil), "open_im_sdk.FriendListAddedTips") - proto.RegisterType((*FriendListDeletedTips)(nil), "open_im_sdk.FriendListDeletedTips") - proto.RegisterType((*BlackListAddTips)(nil), "open_im_sdk.BlackListAddTips") - proto.RegisterType((*BlackListDeletedTips)(nil), "open_im_sdk.BlackListDeletedTips") + proto.RegisterType((*FriendApplicationAddedTips)(nil), "open_im_sdk.FriendApplicationAddedTips") + proto.RegisterType((*FriendApplicationProcessedTips)(nil), "open_im_sdk.FriendApplicationProcessedTips") + proto.RegisterType((*FriendAddedTips)(nil), "open_im_sdk.FriendAddedTips") + proto.RegisterType((*FriendDeletedTips)(nil), "open_im_sdk.FriendDeletedTips") + proto.RegisterType((*BlackInfo)(nil), "open_im_sdk.BlackInfo") + proto.RegisterType((*BlackAddedTips)(nil), "open_im_sdk.BlackAddedTips") + proto.RegisterType((*BlackDeletedTips)(nil), "open_im_sdk.BlackDeletedTips") proto.RegisterType((*FriendInfoChangedTips)(nil), "open_im_sdk.FriendInfoChangedTips") proto.RegisterType((*SelfInfoUpdatedTips)(nil), "open_im_sdk.SelfInfoUpdatedTips") } -func init() { proto.RegisterFile("ws.proto", fileDescriptor_ws_e1a0eca386827677) } +func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_a9634e8f434358ba) } -var fileDescriptor_ws_e1a0eca386827677 = []byte{ - // 1689 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xd7, 0x7a, 0x1d, 0xc7, 0x7e, 0x76, 0xd2, 0x74, 0x93, 0xb4, 0x4b, 0x40, 0xc5, 0x5a, 0x21, - 0x14, 0x55, 0x28, 0x88, 0xf4, 0x40, 0x5b, 0xa9, 0xa2, 0x49, 0x9c, 0xa4, 0x2e, 0x71, 0x1d, 0xad, - 0x53, 0x71, 0xac, 0x36, 0xbb, 0x63, 0x67, 0xc9, 0xfe, 0x71, 0x76, 0xd6, 0x6e, 0xf3, 0x29, 0x38, - 0x22, 0x21, 0x55, 0x70, 0x81, 0x0f, 0xc0, 0x97, 0x40, 0xe2, 0x80, 0x38, 0xc3, 0x95, 0x2b, 0x1f, - 0x01, 0x09, 0xbd, 0x99, 0xd9, 0xf5, 0x8c, 0xed, 0x26, 0xa9, 0x8b, 0x28, 0xe2, 0x36, 0xef, 0xe7, - 0x37, 0xb3, 0xbf, 0xf7, 0xde, 0xef, 0xcd, 0xbc, 0x04, 0xca, 0xcf, 0xe9, 0x46, 0x3f, 0x89, 0xd3, - 0xd8, 0xa8, 0xc6, 0x7d, 0x12, 0x3d, 0xf3, 0xc3, 0x67, 0xd4, 0x3b, 0xb5, 0x7e, 0xd6, 0xc0, 0x3c, - 0x1c, 0x04, 0x41, 0x8b, 0x50, 0xea, 0xf4, 0xc8, 0xf6, 0x79, 0x87, 0x9c, 0x1d, 0xf8, 0x34, 0xb5, - 0x09, 0xed, 0x1b, 0x37, 0xa0, 0xd4, 0x72, 0x5e, 0x74, 0xc8, 0x99, 0xa9, 0xd5, 0xb5, 0x75, 0xdd, - 0x16, 0x16, 0xc3, 0xfd, 0x08, 0xf1, 0x82, 0xc0, 0x99, 0x65, 0x7c, 0x06, 0x0b, 0x1d, 0x3f, 0xea, - 0x05, 0xe4, 0x29, 0x25, 0x49, 0x8b, 0xf6, 0x4c, 0xbd, 0xae, 0xaf, 0x57, 0x37, 0xdf, 0xd9, 0x90, - 0xbe, 0xb8, 0xb1, 0xef, 0xa4, 0x27, 0x24, 0xd9, 0x8b, 0x93, 0xd0, 0x49, 0x6d, 0xd5, 0xdf, 0x78, - 0x00, 0xb5, 0xfd, 0x24, 0x1e, 0xf4, 0xb3, 0xfd, 0xc5, 0xcb, 0xf6, 0x2b, 0xee, 0xd6, 0x1d, 0xb8, - 0x39, 0x3d, 0x96, 0x33, 0xc3, 0x84, 0x79, 0xca, 0x2d, 0x53, 0xab, 0xeb, 0xeb, 0xba, 0x9d, 0x99, - 0xd6, 0x0a, 0x18, 0xfb, 0x24, 0x6d, 0x39, 0x2f, 0xb6, 0x22, 0x8f, 0xc7, 0x61, 0x93, 0x33, 0x6b, - 0x17, 0x96, 0x27, 0x50, 0x9e, 0x91, 0x50, 0xc9, 0x48, 0x98, 0x67, 0x24, 0x54, 0x32, 0xc2, 0x2d, - 0xeb, 0x31, 0xd4, 0x64, 0xbe, 0xc6, 0x22, 0x14, 0x9a, 0x0d, 0xb6, 0xb7, 0x62, 0x17, 0x9a, 0x0d, - 0xe3, 0x36, 0x14, 0x19, 0xa7, 0x02, 0x0b, 0xf4, 0x86, 0x12, 0x68, 0x8b, 0xf6, 0x44, 0x94, 0xcc, - 0xc7, 0xfa, 0xab, 0x00, 0x95, 0x1c, 0xc3, 0x2f, 0x76, 0x48, 0xe4, 0xe5, 0xa7, 0x09, 0x0b, 0x71, - 0x9b, 0xb8, 0xc3, 0x66, 0x83, 0x31, 0xa9, 0xd8, 0xc2, 0xc2, 0x04, 0xe0, 0xe6, 0x24, 0x0e, 0x4d, - 0xbd, 0xae, 0xad, 0xcf, 0xd9, 0x99, 0x69, 0xd4, 0xa1, 0xba, 0x13, 0x47, 0x29, 0x89, 0xd2, 0xa3, - 0xf3, 0x3e, 0x31, 0x8b, 0xec, 0x57, 0x19, 0x42, 0x8f, 0x0e, 0x49, 0x86, 0x2c, 0xc9, 0xcd, 0x86, - 0x39, 0xc7, 0x0e, 0x96, 0x21, 0x3c, 0x5d, 0x6c, 0x30, 0x4b, 0xec, 0xd7, 0xcc, 0x34, 0x96, 0x40, - 0xc7, 0xb4, 0xcc, 0xb3, 0xb4, 0xe0, 0xd2, 0x58, 0x83, 0x32, 0x72, 0x3d, 0xf2, 0x43, 0x62, 0x96, - 0x19, 0x9c, 0xdb, 0xc6, 0x6d, 0x58, 0xc2, 0x35, 0x49, 0x0e, 0x03, 0x27, 0xed, 0xc6, 0x49, 0xd8, - 0x6c, 0x98, 0x15, 0x46, 0x68, 0x02, 0x37, 0x3e, 0x84, 0x45, 0x8e, 0x3d, 0xf1, 0xdd, 0xd3, 0x27, - 0x4e, 0x48, 0x4c, 0x60, 0x9f, 0x1e, 0x43, 0x8d, 0x0f, 0x60, 0x81, 0x23, 0x7b, 0x8e, 0x4b, 0x9e, - 0xda, 0x07, 0x66, 0x95, 0xb9, 0xa9, 0x20, 0xcb, 0x42, 0xe0, 0x93, 0x28, 0xe5, 0x31, 0xd6, 0x78, - 0x8c, 0x12, 0x64, 0xfd, 0xa2, 0xc3, 0x22, 0x2a, 0x0d, 0xf7, 0xb5, 0x68, 0x0f, 0x55, 0xb5, 0x0d, - 0xf3, 0xed, 0x7e, 0xea, 0xc7, 0x11, 0x65, 0xaa, 0xaa, 0x6e, 0xae, 0x2b, 0x15, 0x54, 0xbd, 0x37, - 0x84, 0xeb, 0x6e, 0x94, 0x26, 0xe7, 0x76, 0xb6, 0x71, 0x4a, 0x18, 0x85, 0xab, 0x85, 0xa1, 0x4f, - 0x0b, 0xe3, 0x16, 0x80, 0x94, 0x3a, 0x5e, 0x4b, 0x09, 0xe1, 0xa5, 0xa4, 0xd4, 0x8f, 0x23, 0x56, - 0xec, 0x39, 0x5e, 0x6c, 0x09, 0x92, 0x85, 0x52, 0xba, 0x50, 0x28, 0xf3, 0x93, 0x42, 0x19, 0x89, - 0xaf, 0xac, 0x88, 0xef, 0x3d, 0xa8, 0xec, 0xc5, 0x89, 0x4b, 0x98, 0xd6, 0x2b, 0x75, 0x7d, 0xbd, - 0x62, 0x8f, 0x00, 0x59, 0x3c, 0xa0, 0x8a, 0x67, 0xac, 0x28, 0xd5, 0x89, 0xa2, 0xac, 0xdd, 0x87, - 0x9a, 0x9c, 0x56, 0x94, 0xdb, 0x29, 0x39, 0x17, 0x3d, 0x81, 0x4b, 0x63, 0x05, 0xe6, 0x86, 0x4e, - 0x30, 0xe0, 0x69, 0x9d, 0xb3, 0xb9, 0x71, 0xbf, 0x70, 0x57, 0xb3, 0xce, 0xe0, 0x9a, 0x52, 0x21, - 0xda, 0x1f, 0x57, 0xba, 0x36, 0xa9, 0xf4, 0x31, 0x4a, 0x85, 0x09, 0x4a, 0xa8, 0x6f, 0x9a, 0xe9, - 0x5b, 0xe7, 0xfa, 0xce, 0x6c, 0xeb, 0xa5, 0xce, 0xb2, 0xdb, 0x70, 0x52, 0x07, 0x93, 0x45, 0x95, - 0x0e, 0xa6, 0x79, 0x07, 0x27, 0x4a, 0x07, 0x73, 0x0b, 0xbf, 0x4c, 0xa5, 0xd2, 0xf1, 0x2e, 0x96, - 0x21, 0x4c, 0x64, 0x28, 0x4a, 0xc7, 0x2b, 0x9f, 0x99, 0xb8, 0xd7, 0x95, 0x4a, 0x27, 0xca, 0xee, - 0xaa, 0x3d, 0x4e, 0xa5, 0xc8, 0x79, 0x17, 0xcb, 0x10, 0x9e, 0x2e, 0x36, 0xb0, 0xd2, 0xd7, 0xec, - 0xcc, 0x54, 0x22, 0x2e, 0xab, 0x11, 0x63, 0x41, 0x28, 0x39, 0x63, 0x4d, 0xac, 0xdb, 0xb8, 0xc4, - 0x1e, 0xa7, 0xe3, 0x3d, 0x0e, 0xbc, 0xc7, 0xe9, 0x94, 0x1e, 0xa7, 0x6a, 0x73, 0x70, 0x0d, 0x8c, - 0xa1, 0xd8, 0x1c, 0x54, 0x69, 0x0e, 0xde, 0xbf, 0x2a, 0xc8, 0xb2, 0x20, 0xd5, 0x6e, 0x81, 0xc7, - 0x28, 0x41, 0xd6, 0xd7, 0x1a, 0x5c, 0x6b, 0x77, 0xbb, 0x81, 0x1f, 0x91, 0xc3, 0x01, 0x3d, 0x69, - 0x46, 0xdd, 0x18, 0x05, 0x74, 0xe4, 0xa7, 0x01, 0x11, 0x65, 0xe2, 0x86, 0x61, 0x40, 0xb1, 0x41, - 0xa8, 0x2b, 0x6a, 0xc4, 0xd6, 0x18, 0xeb, 0xee, 0x8b, 0x54, 0x34, 0x26, 0x2e, 0x0d, 0x0b, 0x6a, - 0x7e, 0xbb, 0x83, 0x47, 0x75, 0xe2, 0x41, 0xe4, 0xb1, 0xb2, 0x54, 0x6c, 0x05, 0x43, 0xee, 0x7e, - 0xbb, 0xb3, 0xed, 0x78, 0x3d, 0xb2, 0x13, 0x0f, 0xa2, 0x94, 0x55, 0xa7, 0x6c, 0xab, 0xa0, 0xf5, - 0x4d, 0x01, 0x2a, 0xec, 0xb1, 0x63, 0x9c, 0x4c, 0x98, 0xe7, 0x46, 0x26, 0x9e, 0xcc, 0xc4, 0x56, - 0x63, 0x4b, 0xe9, 0x26, 0x19, 0x01, 0xc8, 0xe7, 0x49, 0x9c, 0xfa, 0x5d, 0xdf, 0x75, 0xb0, 0x69, - 0x04, 0x55, 0x05, 0x43, 0x9f, 0x66, 0x94, 0x26, 0xb1, 0x37, 0x70, 0x99, 0x8f, 0xe0, 0x2c, 0x63, - 0xf8, 0x7d, 0x96, 0xd4, 0x24, 0x10, 0xaf, 0x41, 0x66, 0x1a, 0x9f, 0xc0, 0x5c, 0xfb, 0x79, 0x44, - 0x12, 0xa6, 0xa0, 0xea, 0xe6, 0xbb, 0xca, 0x85, 0x78, 0x38, 0x38, 0x0e, 0x7c, 0x17, 0x9b, 0x0e, - 0xa3, 0xb0, 0xb9, 0x27, 0xde, 0x59, 0x3b, 0x09, 0x71, 0x52, 0xc2, 0x04, 0x84, 0xda, 0x2a, 0xda, - 0x12, 0x82, 0x65, 0x6b, 0x91, 0xf0, 0x98, 0x24, 0x3c, 0x3d, 0xa8, 0xb0, 0x05, 0x5b, 0x86, 0xac, - 0x3f, 0x35, 0x58, 0x66, 0x41, 0x72, 0x70, 0x6f, 0x10, 0x04, 0x97, 0xa4, 0xe9, 0x06, 0x94, 0x18, - 0x8d, 0xbc, 0xc9, 0xb8, 0x65, 0x6c, 0x80, 0xb1, 0xe5, 0x85, 0x7e, 0xe4, 0xd3, 0x34, 0x71, 0xd2, - 0x38, 0x39, 0x20, 0x43, 0x12, 0x88, 0x5e, 0x9b, 0xf2, 0x0b, 0x4a, 0xff, 0x71, 0xec, 0x47, 0x8c, - 0x79, 0x91, 0x31, 0xcf, 0x6d, 0xfc, 0x2d, 0x97, 0x2d, 0xcf, 0x52, 0x6e, 0xcb, 0x09, 0x2c, 0xa9, - 0x09, 0xb4, 0xa0, 0xb6, 0x97, 0xf8, 0x24, 0xf2, 0x6c, 0x12, 0x3a, 0xc9, 0x29, 0xcb, 0x47, 0xc5, - 0x56, 0x30, 0xeb, 0x07, 0x0d, 0xca, 0x59, 0x16, 0xa5, 0x50, 0x34, 0x25, 0x14, 0x03, 0x8a, 0x92, - 0x08, 0xd8, 0x1a, 0xb1, 0xa6, 0x9b, 0xd7, 0x9d, 0xad, 0x71, 0xff, 0x3e, 0x6b, 0x13, 0x71, 0x69, - 0x08, 0x8b, 0x4d, 0x79, 0xf1, 0xb1, 0x1f, 0x64, 0xe4, 0x85, 0x85, 0xfd, 0xb0, 0xed, 0x27, 0xe9, - 0x89, 0x20, 0xce, 0x0d, 0x44, 0x77, 0x43, 0xc7, 0x0f, 0x04, 0x5f, 0x6e, 0x58, 0x43, 0x58, 0x54, - 0x6b, 0xfe, 0x4a, 0xb6, 0x22, 0x59, 0xd1, 0x88, 0x71, 0x6e, 0xcb, 0xc9, 0xd2, 0xd5, 0x64, 0xbd, - 0x82, 0xbb, 0xd5, 0x80, 0xf2, 0x91, 0xdf, 0xa7, 0x3b, 0x71, 0x18, 0xa2, 0x4f, 0x83, 0xa4, 0x48, - 0x4d, 0x63, 0xd7, 0x96, 0xb0, 0x50, 0x56, 0x0d, 0xd2, 0x75, 0x06, 0x41, 0x8a, 0xae, 0xd9, 0x4d, - 0x2e, 0x41, 0xd6, 0xb7, 0x1a, 0x5c, 0xe3, 0x8a, 0xda, 0x8d, 0x52, 0x92, 0x20, 0x66, 0x7c, 0x04, - 0x73, 0x4c, 0x43, 0xec, 0xb0, 0xf1, 0x91, 0x2d, 0x6f, 0x50, 0x9b, 0x3b, 0x19, 0x77, 0xa1, 0xc4, - 0x0f, 0x60, 0xc7, 0x57, 0x37, 0xeb, 0x93, 0xee, 0xaa, 0x64, 0x6d, 0xe1, 0x8f, 0xb7, 0x42, 0xbb, - 0x4f, 0x12, 0xd6, 0x92, 0xf9, 0x53, 0x52, 0xb4, 0x55, 0x50, 0x62, 0x78, 0x40, 0x9c, 0x21, 0xf9, - 0x0f, 0x32, 0xfc, 0x5d, 0x83, 0xeb, 0x7c, 0x43, 0x33, 0x1a, 0xfa, 0x29, 0xf1, 0x66, 0xe3, 0xd8, - 0x66, 0x43, 0xfe, 0xd5, 0x39, 0x72, 0x7f, 0x29, 0x3a, 0xfd, 0x4d, 0xa3, 0x2b, 0x4e, 0x8b, 0xee, - 0x37, 0x0d, 0x96, 0xf8, 0x86, 0xcf, 0x7d, 0xf7, 0xf4, 0x7f, 0x16, 0xdc, 0x4f, 0x1a, 0xac, 0x4a, - 0xa7, 0xec, 0x9c, 0x38, 0x51, 0x8f, 0xb0, 0x26, 0xc6, 0x1b, 0x9b, 0x59, 0x6c, 0x9a, 0xd0, 0xf8, - 0x94, 0x39, 0x42, 0xde, 0x4a, 0x4c, 0x6b, 0x50, 0x6e, 0x0d, 0xc4, 0x1b, 0x22, 0x6e, 0xe2, 0xcc, - 0xb6, 0xbe, 0xd2, 0x60, 0x35, 0x13, 0x61, 0x37, 0xe6, 0x44, 0x67, 0xa9, 0xd5, 0x23, 0x58, 0x90, - 0x73, 0xe1, 0x89, 0xf0, 0xac, 0x57, 0x91, 0x1c, 0xa5, 0xcc, 0x56, 0x37, 0x5a, 0x7f, 0x68, 0xb0, - 0xc4, 0x1c, 0xf9, 0x3b, 0x37, 0x0b, 0x99, 0xfb, 0x30, 0xcf, 0x36, 0xc7, 0x57, 0xcf, 0x72, 0xb6, - 0xc1, 0x78, 0x08, 0x20, 0xae, 0x0d, 0x9c, 0xc8, 0xf9, 0x9f, 0xe9, 0x97, 0x6f, 0x97, 0xf6, 0x5c, - 0x51, 0x42, 0xdf, 0x69, 0xb0, 0x92, 0x13, 0x97, 0xf3, 0x8e, 0x63, 0xb4, 0x30, 0x47, 0x12, 0x92, - 0xa1, 0x51, 0x32, 0x0a, 0xaf, 0xd7, 0x45, 0xfa, 0xeb, 0x29, 0xce, 0x7a, 0xa9, 0xc1, 0x9a, 0x4d, - 0x5c, 0xe2, 0x0f, 0x09, 0xbe, 0xdc, 0x5b, 0xfd, 0x7e, 0x20, 0x26, 0xa1, 0x19, 0x6a, 0x72, 0x0f, - 0x2a, 0xe2, 0x80, 0x28, 0x15, 0xc4, 0x2f, 0x9c, 0x80, 0x46, 0xde, 0xfc, 0x6f, 0x27, 0x87, 0xe6, - 0x8f, 0xb3, 0xb0, 0xac, 0x1f, 0x35, 0x30, 0x25, 0x52, 0x87, 0x49, 0xec, 0x12, 0x4a, 0xff, 0xe5, - 0xab, 0x86, 0x91, 0xa3, 0x83, 0x20, 0x15, 0xa3, 0x90, 0xb0, 0x24, 0xd2, 0x45, 0x85, 0xf4, 0xf7, - 0x1a, 0x00, 0x9f, 0x58, 0xd8, 0x7d, 0x51, 0x87, 0x2a, 0x1b, 0xf5, 0x94, 0x97, 0x5f, 0x86, 0xf8, - 0x41, 0x6c, 0xde, 0xc9, 0xff, 0x6d, 0x81, 0xd6, 0xd8, 0x6c, 0xa8, 0x4f, 0xcc, 0x86, 0x0f, 0x60, - 0x91, 0x7f, 0x27, 0x4b, 0x29, 0x23, 0x52, 0xdd, 0x5c, 0x9d, 0xf8, 0x43, 0x9c, 0xc5, 0x33, 0xe6, - 0x6c, 0x9d, 0xc2, 0x75, 0x8e, 0x48, 0x19, 0xc6, 0x71, 0x63, 0xcb, 0xf3, 0x24, 0x51, 0x67, 0x26, - 0x0e, 0xd7, 0x5b, 0x9e, 0xd7, 0x89, 0x07, 0x89, 0x9b, 0x4d, 0x45, 0x23, 0x00, 0xb9, 0x6e, 0x79, - 0xde, 0x17, 0x71, 0xe2, 0xf9, 0x51, 0x4f, 0x4c, 0x47, 0x12, 0x62, 0xfd, 0xaa, 0xc1, 0xad, 0x89, - 0xaf, 0x61, 0x33, 0x6d, 0x79, 0x9e, 0xa8, 0xe7, 0x9d, 0xbc, 0x42, 0xda, 0xe5, 0xe2, 0xc9, 0x8a, - 0xf3, 0x10, 0xaa, 0xd2, 0x81, 0xa2, 0xb6, 0xb7, 0x94, 0x9d, 0x13, 0x9f, 0xb5, 0xe5, 0x2d, 0xc6, - 0xa7, 0x50, 0x6e, 0xf7, 0x89, 0x27, 0xf5, 0xcf, 0x85, 0x1f, 0xce, 0x9d, 0xf1, 0x62, 0x7d, 0x7f, - 0x7a, 0x48, 0xae, 0x4b, 0xfa, 0xe9, 0xec, 0x31, 0xc9, 0x8c, 0x0a, 0xff, 0x08, 0x23, 0x9b, 0x7c, - 0x49, 0xdc, 0xb7, 0xc1, 0x68, 0x0f, 0x96, 0x39, 0x21, 0xb5, 0xd4, 0x1f, 0x43, 0x89, 0xc3, 0x82, - 0xc4, 0xcd, 0x29, 0x05, 0xe3, 0x04, 0xf8, 0xda, 0x7a, 0x04, 0xab, 0xa3, 0x73, 0x1a, 0x24, 0x20, - 0xe9, 0xac, 0x27, 0xed, 0xc0, 0xd2, 0x76, 0xe0, 0xb8, 0xa7, 0x82, 0xd0, 0x6c, 0x87, 0xec, 0xc3, - 0x4a, 0x7e, 0xc8, 0x1b, 0xb1, 0xc9, 0xe3, 0x1a, 0x7f, 0x23, 0x5e, 0xfb, 0xa4, 0x43, 0x58, 0xee, - 0x90, 0xa0, 0x8b, 0xd8, 0xd3, 0xbe, 0x97, 0x3f, 0xab, 0xf7, 0xa0, 0x86, 0x70, 0x7e, 0x43, 0x68, - 0x17, 0xdd, 0x10, 0x8a, 0xeb, 0x71, 0x89, 0xfd, 0xcb, 0xfc, 0xce, 0xdf, 0x01, 0x00, 0x00, 0xff, - 0xff, 0xca, 0x9b, 0xa2, 0xe6, 0x3e, 0x17, 0x00, 0x00, +var fileDescriptor_ws_a9634e8f434358ba = []byte{ + // 1855 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0x5f, 0x6f, 0xdc, 0x5a, + 0x11, 0x97, 0xf7, 0x5f, 0xb2, 0xb3, 0x69, 0x92, 0xba, 0x6d, 0xae, 0x29, 0x57, 0x55, 0xb0, 0x10, + 0x8a, 0xae, 0xae, 0x52, 0x91, 0x08, 0x71, 0xdb, 0x2b, 0xe0, 0x26, 0xd9, 0x24, 0xda, 0xd2, 0x34, + 0x91, 0xb7, 0x15, 0x12, 0x2f, 0x95, 0x6b, 0x9f, 0xdd, 0x98, 0xf5, 0x9f, 0x8d, 0x8f, 0x77, 0xdb, + 0x7e, 0x12, 0x24, 0x24, 0x24, 0x10, 0x0f, 0x08, 0xf1, 0x82, 0x10, 0xe2, 0x43, 0x20, 0xc4, 0x87, + 0x40, 0xf0, 0xc8, 0x0b, 0xaf, 0x08, 0x09, 0xcd, 0x9c, 0x63, 0xfb, 0x9c, 0xf5, 0x92, 0xec, 0xe6, + 0xaa, 0x7d, 0xf3, 0xfc, 0x3c, 0x73, 0xe6, 0xdf, 0x6f, 0xc6, 0x27, 0x1b, 0xd8, 0xe0, 0xfe, 0xe8, + 0xf5, 0x5b, 0xfe, 0xf8, 0x2d, 0xdf, 0x1d, 0xa7, 0x49, 0x96, 0x98, 0x9d, 0x64, 0xcc, 0xe2, 0xd7, + 0x41, 0xf4, 0x9a, 0xfb, 0x23, 0xfb, 0x2f, 0x06, 0x58, 0x17, 0x93, 0x30, 0x3c, 0x63, 0x9c, 0xbb, + 0x43, 0x76, 0xf8, 0xbe, 0xcf, 0xae, 0x9e, 0x07, 0x3c, 0x73, 0x18, 0x1f, 0x9b, 0x5b, 0xd0, 0x3a, + 0x73, 0xdf, 0xf5, 0xd9, 0x95, 0x65, 0x6c, 0x1b, 0x3b, 0x75, 0x47, 0x4a, 0x84, 0x07, 0x31, 0xe2, + 0x35, 0x89, 0x93, 0x64, 0xfe, 0x08, 0xee, 0xf4, 0x83, 0x78, 0x18, 0xb2, 0x57, 0x9c, 0xa5, 0x67, + 0x7c, 0x68, 0xd5, 0xb7, 0xeb, 0x3b, 0x9d, 0xbd, 0x6f, 0xec, 0x2a, 0x1e, 0x77, 0x4f, 0xdd, 0xec, + 0x92, 0xa5, 0x27, 0x49, 0x1a, 0xb9, 0x99, 0xa3, 0xeb, 0x9b, 0x3f, 0x80, 0xb5, 0xd3, 0x34, 0x99, + 0x8c, 0x73, 0xfb, 0xc6, 0x4d, 0xf6, 0x9a, 0xba, 0xbd, 0x0f, 0x9f, 0xcc, 0xcf, 0xe5, 0xca, 0xb4, + 0x60, 0x85, 0x0b, 0xc9, 0x32, 0xb6, 0xeb, 0x3b, 0x75, 0x27, 0x17, 0xed, 0xfb, 0x60, 0x9e, 0xb2, + 0xec, 0xcc, 0x7d, 0x77, 0x10, 0xfb, 0x22, 0x0f, 0x87, 0x5d, 0xd9, 0xc7, 0x70, 0xaf, 0x82, 0x8a, + 0x8a, 0x44, 0x5a, 0x45, 0xa2, 0xa2, 0x22, 0x91, 0x56, 0x11, 0x21, 0xd9, 0xcf, 0x60, 0x4d, 0x8d, + 0xd7, 0x5c, 0x87, 0x5a, 0xaf, 0x4b, 0xb6, 0x6d, 0xa7, 0xd6, 0xeb, 0x9a, 0x9f, 0x41, 0x83, 0x62, + 0xaa, 0x51, 0xa2, 0x5b, 0x5a, 0xa2, 0x67, 0x7c, 0x28, 0xb3, 0x24, 0x1d, 0xfb, 0xbf, 0x35, 0x68, + 0x17, 0x18, 0x7a, 0xec, 0xb3, 0xd8, 0x2f, 0x4e, 0x93, 0x12, 0xe2, 0x0e, 0xf3, 0xa6, 0xbd, 0x2e, + 0x45, 0xd2, 0x76, 0xa4, 0x84, 0x05, 0x40, 0xe3, 0x34, 0x89, 0xac, 0xfa, 0xb6, 0xb1, 0xd3, 0x74, + 0x72, 0xd1, 0xdc, 0x86, 0xce, 0x51, 0x12, 0x67, 0x2c, 0xce, 0x5e, 0xbe, 0x1f, 0x33, 0xab, 0x41, + 0x6f, 0x55, 0x08, 0x35, 0xfa, 0x2c, 0x9d, 0x52, 0x91, 0x7b, 0x5d, 0xab, 0x49, 0x07, 0xab, 0x10, + 0x9e, 0x2e, 0x0d, 0xac, 0x16, 0xbd, 0xcd, 0x45, 0x73, 0x13, 0xea, 0x58, 0x96, 0x15, 0x2a, 0x0b, + 0x3e, 0x9a, 0x0f, 0x61, 0x15, 0x63, 0x7d, 0x19, 0x44, 0xcc, 0x5a, 0x25, 0xb8, 0x90, 0xcd, 0xcf, + 0x60, 0x13, 0x9f, 0x59, 0x7a, 0x11, 0xba, 0xd9, 0x20, 0x49, 0xa3, 0x5e, 0xd7, 0x6a, 0x53, 0x40, + 0x15, 0xdc, 0xfc, 0x0e, 0xac, 0x0b, 0xec, 0x45, 0xe0, 0x8d, 0x5e, 0xb8, 0x11, 0xb3, 0x80, 0x5c, + 0xcf, 0xa0, 0xe6, 0xb7, 0xe1, 0x8e, 0x40, 0x4e, 0x5c, 0x8f, 0xbd, 0x72, 0x9e, 0x5b, 0x1d, 0x52, + 0xd3, 0x41, 0xaa, 0x42, 0x18, 0xb0, 0x38, 0x13, 0x39, 0xae, 0x89, 0x1c, 0x15, 0xc8, 0xfe, 0x5b, + 0x1d, 0xd6, 0x91, 0x69, 0x68, 0x77, 0xc6, 0x87, 0xc8, 0xaa, 0x43, 0x58, 0x39, 0x1f, 0x67, 0x41, + 0x12, 0x73, 0x62, 0x55, 0x67, 0x6f, 0x47, 0xeb, 0xa0, 0xae, 0xbd, 0x2b, 0x55, 0x8f, 0xe3, 0x2c, + 0x7d, 0xef, 0xe4, 0x86, 0x73, 0xd2, 0xa8, 0x2d, 0x96, 0x46, 0x7d, 0x5e, 0x1a, 0x8f, 0x00, 0x94, + 0xd2, 0x89, 0x5e, 0x2a, 0x88, 0x68, 0x25, 0xe7, 0x41, 0x12, 0x53, 0xb3, 0x9b, 0xa2, 0xd9, 0x0a, + 0xa4, 0x12, 0xa5, 0x75, 0x2d, 0x51, 0x56, 0xaa, 0x44, 0x29, 0xc9, 0xb7, 0xaa, 0x91, 0xef, 0x53, + 0x68, 0x9f, 0x24, 0xa9, 0xc7, 0x88, 0xeb, 0xed, 0xed, 0xfa, 0x4e, 0xdb, 0x29, 0x01, 0x95, 0x3c, + 0xa0, 0x93, 0x67, 0xa6, 0x29, 0x9d, 0x4a, 0x53, 0x1e, 0x3e, 0x85, 0x35, 0xb5, 0xac, 0x48, 0xb7, + 0x11, 0x7b, 0x2f, 0x67, 0x02, 0x1f, 0xcd, 0xfb, 0xd0, 0x9c, 0xba, 0xe1, 0x44, 0x94, 0xb5, 0xe9, + 0x08, 0xe1, 0x69, 0xed, 0x0b, 0xc3, 0xbe, 0x82, 0x0d, 0xad, 0x43, 0x7c, 0x3c, 0xcb, 0x74, 0xa3, + 0xca, 0xf4, 0x99, 0x90, 0x6a, 0x95, 0x90, 0x90, 0xdf, 0x3c, 0xe7, 0x77, 0x5d, 0xf0, 0x3b, 0x97, + 0xed, 0x3f, 0x37, 0xa9, 0xba, 0x5d, 0x37, 0x73, 0xb1, 0x58, 0x5c, 0x9b, 0x60, 0x5e, 0x4c, 0x70, + 0xaa, 0x4d, 0x70, 0x5a, 0x4c, 0xf0, 0x10, 0xb7, 0x5d, 0xaf, 0x2b, 0x5b, 0x9f, 0x8b, 0x18, 0x93, + 0xa7, 0xc4, 0xd4, 0x10, 0x31, 0x29, 0x10, 0x6a, 0xf0, 0xea, 0x04, 0x2b, 0x10, 0x4e, 0x1e, 0x9f, + 0x9d, 0x3c, 0xd1, 0xff, 0x0a, 0x8e, 0x94, 0xe5, 0x3a, 0x65, 0x57, 0x04, 0x65, 0x79, 0x85, 0xb2, + 0x5c, 0xa3, 0xac, 0x60, 0x85, 0x0e, 0x8a, 0xd8, 0x4a, 0x4a, 0x8a, 0x71, 0x57, 0x21, 0xcc, 0x3c, + 0x92, 0x94, 0x04, 0x41, 0xc9, 0xa8, 0xa4, 0xa4, 0xa7, 0x50, 0xb2, 0x23, 0x6c, 0x15, 0x08, 0x6d, + 0xa5, 0x48, 0x33, 0xbd, 0xe6, 0xe4, 0x22, 0x92, 0x72, 0x50, 0x90, 0xf2, 0x8e, 0x20, 0x65, 0x01, + 0x20, 0x91, 0x38, 0xbb, 0xb2, 0xd6, 0xc5, 0xde, 0xe2, 0x62, 0x6f, 0x15, 0x7d, 0xdd, 0xd0, 0xfb, + 0x8a, 0x63, 0xe7, 0xa5, 0xcc, 0xcd, 0x18, 0xbd, 0xdd, 0xa4, 0xb7, 0x0a, 0x62, 0x7e, 0x59, 0x2e, + 0x8a, 0xbb, 0xb4, 0x28, 0xbe, 0x35, 0xbb, 0xea, 0x91, 0x12, 0xff, 0x67, 0x43, 0x9c, 0xc0, 0x46, + 0x32, 0x18, 0x84, 0x41, 0xcc, 0x2e, 0x26, 0xfc, 0xb2, 0x17, 0x0f, 0x12, 0xcb, 0xdc, 0x36, 0x76, + 0x3a, 0x7b, 0x9f, 0x6a, 0x87, 0x9c, 0xeb, 0x3a, 0xce, 0xac, 0xd1, 0xb2, 0xb3, 0xb2, 0xaa, 0xce, + 0xca, 0xcf, 0x0d, 0xd8, 0x98, 0x71, 0x80, 0xda, 0x2f, 0x83, 0x2c, 0x64, 0xf2, 0x04, 0x21, 0x98, + 0x26, 0x34, 0xba, 0x8c, 0x7b, 0x92, 0xbc, 0xf4, 0x8c, 0x9e, 0x8e, 0xdf, 0x65, 0x92, 0xb6, 0xf8, + 0x68, 0xda, 0xb0, 0x16, 0x9c, 0xf7, 0xf1, 0xa8, 0x7e, 0x32, 0x89, 0x7d, 0xc9, 0x59, 0x0d, 0x43, + 0xfa, 0x04, 0xe7, 0xfd, 0x43, 0xd7, 0x1f, 0xb2, 0xa3, 0x64, 0x12, 0x67, 0x44, 0xdb, 0x55, 0x47, + 0x07, 0xed, 0x5f, 0xd4, 0xa0, 0x4d, 0xb7, 0x00, 0x8a, 0xc9, 0x82, 0x95, 0x53, 0x39, 0x24, 0x22, + 0xaa, 0x5c, 0xc4, 0x76, 0xd3, 0xa3, 0xb2, 0x62, 0x4b, 0x00, 0xe3, 0x79, 0x91, 0x64, 0xc1, 0x20, + 0xf0, 0x5c, 0xac, 0x90, 0x0c, 0x55, 0xc3, 0x50, 0xa7, 0x17, 0x67, 0x69, 0xe2, 0x4f, 0x3c, 0xd2, + 0x91, 0x31, 0xab, 0x18, 0xfa, 0x27, 0x5e, 0xa7, 0xa1, 0x1c, 0xb2, 0x5c, 0x34, 0xbf, 0x0b, 0xcd, + 0xf3, 0xb7, 0x31, 0x4b, 0x69, 0xaa, 0x3a, 0x7b, 0xdf, 0xd4, 0x7a, 0x77, 0x31, 0x79, 0x13, 0x06, + 0x1e, 0x6e, 0x23, 0x6a, 0x9d, 0xd0, 0x44, 0x56, 0x1d, 0x95, 0xac, 0xc2, 0x19, 0x6b, 0x38, 0x0a, + 0x82, 0xec, 0x3f, 0x63, 0xd1, 0x1b, 0x96, 0x8a, 0xf2, 0xe0, 0x74, 0xdd, 0x71, 0x54, 0xc8, 0xfe, + 0x97, 0x01, 0xf7, 0x28, 0x49, 0x01, 0x9e, 0x4c, 0xc2, 0xf0, 0x86, 0x32, 0x6d, 0x41, 0x8b, 0xc2, + 0x28, 0xb6, 0x8f, 0x90, 0xcc, 0x5d, 0x30, 0x0f, 0xfc, 0x28, 0x88, 0x03, 0x9e, 0xa5, 0x6e, 0x96, + 0xa4, 0xcf, 0xd9, 0x94, 0x85, 0xf2, 0x2a, 0x31, 0xe7, 0x0d, 0x4e, 0xcb, 0xb3, 0x24, 0x88, 0x29, + 0xf2, 0x06, 0x45, 0x5e, 0xc8, 0xf8, 0xae, 0xd8, 0x1c, 0xa2, 0x4a, 0x85, 0xac, 0x16, 0xb0, 0xa5, + 0x17, 0xd0, 0x86, 0xb5, 0x93, 0x34, 0x60, 0xb1, 0xef, 0xb0, 0xc8, 0x4d, 0x47, 0x72, 0xe7, 0x68, + 0x98, 0xfd, 0x27, 0x03, 0x56, 0xf3, 0x2a, 0x2a, 0xa9, 0x18, 0x5a, 0x2a, 0xd2, 0x7d, 0x5c, 0x12, + 0xa1, 0x90, 0x55, 0xf7, 0x75, 0xdd, 0xfd, 0x16, 0xb4, 0x4e, 0x69, 0x6f, 0xc9, 0xaf, 0xaa, 0x94, + 0xe8, 0x32, 0x9c, 0xbc, 0x09, 0xc2, 0x3c, 0x15, 0x29, 0xe1, 0x74, 0x1c, 0x06, 0x69, 0x76, 0x29, + 0xd3, 0x10, 0x02, 0xa2, 0xc7, 0x91, 0x1b, 0x84, 0x32, 0x7a, 0x21, 0xd8, 0x53, 0x58, 0xd7, 0x19, + 0xf0, 0x71, 0x62, 0xb7, 0xbb, 0xb0, 0xfa, 0x32, 0x18, 0xf3, 0xa3, 0x24, 0x8a, 0x50, 0xa7, 0xcb, + 0x32, 0x0c, 0xcd, 0xa0, 0x3d, 0x29, 0x25, 0x24, 0x59, 0x97, 0x0d, 0xdc, 0x49, 0x98, 0xa1, 0x6a, + 0xfe, 0xc1, 0x53, 0x20, 0xfb, 0x77, 0x06, 0x6c, 0x08, 0x7e, 0x1d, 0xc7, 0x19, 0x4b, 0x11, 0x33, + 0x3f, 0x87, 0x26, 0x31, 0x8a, 0x0e, 0x9b, 0xbd, 0xd9, 0x16, 0xe3, 0xea, 0x08, 0x25, 0xf3, 0x10, + 0x3a, 0xb8, 0x92, 0xdc, 0x38, 0xc3, 0x34, 0xc9, 0x47, 0x67, 0x6f, 0xbb, 0x6a, 0xa3, 0xb3, 0xd8, + 0x51, 0x8d, 0x70, 0x5b, 0x9c, 0x8f, 0x59, 0x4a, 0xa3, 0x5a, 0x7c, 0x7b, 0x1b, 0x8e, 0x0e, 0xda, + 0xbf, 0x2d, 0x62, 0x7d, 0xce, 0xdc, 0x29, 0xbb, 0x45, 0xac, 0x5f, 0x01, 0x90, 0x69, 0xba, 0x54, + 0xa8, 0x8a, 0xcd, 0x82, 0x91, 0xfe, 0xd3, 0x80, 0xbb, 0xe2, 0x90, 0x5e, 0x3c, 0x0d, 0x32, 0xe6, + 0xdf, 0x22, 0xd6, 0x2f, 0xa0, 0x75, 0x3e, 0x5e, 0x2a, 0x4e, 0xa9, 0x8f, 0x1d, 0x91, 0x6e, 0xc9, + 0xbc, 0xbe, 0x68, 0x47, 0x14, 0xa3, 0x6a, 0x9e, 0x8d, 0x79, 0x79, 0xfe, 0xdd, 0x80, 0x4d, 0x71, + 0xca, 0x8f, 0x03, 0x6f, 0xf4, 0x91, 0xd3, 0xfc, 0x0a, 0x40, 0x78, 0x5d, 0x2a, 0x4b, 0xc5, 0x66, + 0xc1, 0x24, 0xff, 0x63, 0xc0, 0x83, 0xbc, 0x99, 0x83, 0xe4, 0xe8, 0xd2, 0x8d, 0x87, 0x32, 0x53, + 0xdc, 0xf1, 0x24, 0xd2, 0x05, 0xc6, 0x10, 0x17, 0xf6, 0x12, 0xf9, 0x1a, 0xb9, 0xfd, 0x10, 0xda, + 0x27, 0x41, 0xec, 0x12, 0xb8, 0x70, 0x6a, 0xa5, 0x09, 0xae, 0x9a, 0xb3, 0x89, 0xfc, 0xf6, 0xc8, + 0x0d, 0x9e, 0xcb, 0x65, 0x7f, 0x9a, 0x0b, 0xf4, 0xc7, 0xfe, 0x87, 0x01, 0x9b, 0xf4, 0x24, 0xbe, + 0x5d, 0xb7, 0x69, 0xf1, 0x53, 0x58, 0x21, 0xe3, 0x64, 0xf1, 0x3a, 0xe4, 0x06, 0xd8, 0x64, 0x39, + 0xf2, 0x78, 0xd3, 0x13, 0xbf, 0x49, 0x2c, 0xd0, 0xe4, 0xd2, 0x66, 0xc1, 0x26, 0xff, 0xca, 0x80, + 0xfb, 0x45, 0xe0, 0x6a, 0x8f, 0xf1, 0x6f, 0x06, 0x29, 0x96, 0x4d, 0x56, 0xa1, 0xb2, 0x18, 0xb5, + 0xe5, 0xf8, 0x5e, 0x5f, 0x8e, 0x13, 0xf6, 0x2f, 0x0d, 0x78, 0xe8, 0x30, 0x8f, 0x05, 0x53, 0x86, + 0x5f, 0xe3, 0x83, 0xf1, 0x38, 0x94, 0xb7, 0x9b, 0x5b, 0xf4, 0xe4, 0x09, 0xb4, 0xe5, 0x01, 0x71, + 0x26, 0x03, 0xbf, 0xf6, 0x56, 0x53, 0x6a, 0x8b, 0x3f, 0x14, 0x5d, 0x5e, 0x5c, 0xb4, 0xa4, 0x64, + 0xff, 0xd1, 0x00, 0x4b, 0x09, 0xea, 0x22, 0x4d, 0x3c, 0xc6, 0xf9, 0x47, 0x5e, 0x0a, 0x14, 0x1c, + 0x9f, 0x84, 0x99, 0xbc, 0xde, 0x48, 0x49, 0x09, 0xba, 0xa1, 0x05, 0xfd, 0x07, 0x03, 0x40, 0xdc, + 0x42, 0x68, 0x6e, 0xf6, 0xa1, 0x4d, 0xd7, 0x37, 0xf2, 0x2d, 0x42, 0x7d, 0x50, 0xf9, 0x59, 0x40, + 0x14, 0xa4, 0xd0, 0x13, 0x67, 0xd3, 0xb5, 0xa6, 0xf8, 0xd9, 0x06, 0xa5, 0x99, 0x2b, 0x60, 0xbd, + 0x72, 0x05, 0xfc, 0x5e, 0xee, 0x9a, 0xbc, 0x35, 0xae, 0xf3, 0xa6, 0x28, 0xda, 0x23, 0xb8, 0x2b, + 0x24, 0xa5, 0xd8, 0x78, 0x7f, 0x38, 0xf0, 0xc5, 0xdf, 0x37, 0x06, 0x39, 0xca, 0x45, 0xbc, 0x3b, + 0x1f, 0xf8, 0x7e, 0x3f, 0x99, 0xa4, 0x5e, 0x71, 0x77, 0x2e, 0x00, 0x8c, 0xf1, 0xc0, 0xf7, 0x7f, + 0x92, 0xa4, 0x7e, 0x10, 0x0f, 0x65, 0x43, 0x15, 0xc4, 0xfe, 0xb7, 0x01, 0x0f, 0x2b, 0xde, 0x0e, + 0x7c, 0x5f, 0xb6, 0x75, 0xbf, 0x68, 0x94, 0x71, 0x33, 0x87, 0xca, 0xc5, 0xdd, 0x51, 0x0e, 0x93, + 0x2d, 0x7e, 0xa4, 0x59, 0x56, 0x5c, 0x3a, 0xaa, 0x89, 0xf9, 0x7d, 0x58, 0x3d, 0x1f, 0x6b, 0x8b, + 0xff, 0x5a, 0xc7, 0x85, 0xf2, 0x82, 0xcb, 0xe0, 0xaf, 0x06, 0x3c, 0xaa, 0x44, 0xa0, 0xf3, 0xf9, + 0x56, 0x89, 0xab, 0x61, 0xd7, 0x96, 0x09, 0x9b, 0x7e, 0x56, 0x50, 0x59, 0x2d, 0xa4, 0x05, 0xd3, + 0xb9, 0x84, 0x0d, 0x99, 0x4d, 0xd1, 0xb7, 0xc7, 0xd0, 0x12, 0x90, 0x0c, 0xff, 0x93, 0x39, 0xd5, + 0x17, 0xa1, 0x8b, 0xe7, 0xaa, 0xa7, 0xda, 0x3c, 0x4f, 0x3f, 0xcb, 0xa9, 0xd9, 0x65, 0x21, 0xcb, + 0x3e, 0xac, 0xaf, 0x5f, 0x1b, 0xd0, 0x3e, 0x0c, 0x5d, 0x6f, 0x44, 0x83, 0xfb, 0xa4, 0x3a, 0xb8, + 0xd7, 0xef, 0xb3, 0x72, 0x7c, 0x6f, 0x1a, 0xd3, 0x27, 0xd2, 0x8f, 0x32, 0xa5, 0xd7, 0x1f, 0x5d, + 0x68, 0xdb, 0x3e, 0xac, 0x93, 0x50, 0x16, 0xfe, 0x73, 0x68, 0x12, 0x32, 0x77, 0x0f, 0x16, 0xe9, + 0x38, 0x42, 0x69, 0xc1, 0x4a, 0x0c, 0x60, 0x93, 0xd4, 0xd5, 0xa2, 0x7f, 0x08, 0x3f, 0xbf, 0x31, + 0xe0, 0x41, 0xd9, 0x2e, 0xf5, 0x23, 0xb9, 0x74, 0x8b, 0xf7, 0x67, 0x16, 0xfc, 0x42, 0xe3, 0xb3, + 0xd8, 0xdd, 0xfb, 0xf7, 0x06, 0xdc, 0xeb, 0xb3, 0x70, 0x80, 0xa6, 0xaf, 0xc6, 0x7e, 0x71, 0x67, + 0x79, 0x02, 0x6b, 0x08, 0xe7, 0xa7, 0x5e, 0xbf, 0xdd, 0x35, 0xd5, 0x0f, 0x18, 0xed, 0xe1, 0xd6, + 0x4f, 0xef, 0xef, 0x3e, 0x16, 0xff, 0xe5, 0xf9, 0x52, 0x39, 0xf4, 0x4d, 0x8b, 0xfe, 0xdf, 0xb3, + 0xff, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x45, 0x72, 0x9b, 0x6e, 0x02, 0x1a, 0x00, 0x00, }