Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 0 additions & 57 deletions proto/common/v2/common.proto
Original file line number Diff line number Diff line change
Expand Up @@ -31,60 +31,3 @@ message SsoReserveFields {
optional uint32 sso_ip_origin = 28;
optional bytes presure_token = 30;
}
message IncPullRequest {
optional uint32 req_count = 2;
optional int64 time = 3;
optional uint32 local_seq = 4;
optional bytes cookie = 5;
optional int32 flag = 6;
optional uint32 proxy_seq = 7;
repeated IncPullRequestBiz request_biz = 10001;
repeated uint32 ext_sns_flag_key = 10002;
repeated uint32 ext_private_id_list_key = 10003;
}

message IncPullRequestBiz {
optional int32 biz_type = 1;
optional IncPullRequestBizBusi biz_data = 2;
}

message IncPullRequestBizBusi {
repeated int32 ext_busi = 1;
}

message IncPullResponse {
optional uint32 seq = 1;
optional bytes cookie = 2;
optional bool is_end = 3;
optional int64 time = 6;
optional int64 self_uin = 7;
optional uint32 small_seq = 8;
repeated IncPullResponseFriend friend_list = 101;
repeated IncPullResponseCategory category = 102;
}

message IncPullResponseFriend {
optional string uid = 1;
optional int32 category_id = 2;
optional int64 uin = 3;
map<int32, IncPullResponseSubBiz> sub_biz = 10001;
}

message IncPullResponseSubBiz {
map<int32, int32> num_data = 1;
map<int32, string> data = 2;
}

message IncPullResponseCategory {
optional int32 category_id = 1;
optional string category_name = 2;
optional int32 category_member_count = 3;
optional int32 catogory_sort_id = 4;
}

message KickNTReq {
optional int64 uin = 1;
optional bool is_same_device = 2;
optional string tips_info = 3;
optional string tips_title = 4;
}
27 changes: 19 additions & 8 deletions proto/login/v2/login.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@ syntax = "proto2";

package login.v2;

enum NTLoginCodeType {
NT_LOGIN_CODE_TYPE_AUTHCODE = 0;
NT_LOGIN_CODE_TYPE_TGT = 1;
NT_LOGIN_CODE_TYPE_A2 = 2;
NT_LOGIN_CODE_TYPE_TGTGT = 3;
}

enum NTLoginPlatform {
NT_LOGIN_PLATFORM_UNKNOWN = 0;
NT_LOGIN_PLATFORM_IOS = 1;
Expand All @@ -14,13 +21,6 @@ enum NTLoginPlatform {
NT_LOGIN_PLATFORM_HARMONY = 8;
}

enum NTLoginCodeType {
NT_LOGIN_CODE_TYPE_AUTHCODE = 0;
NT_LOGIN_CODE_TYPE_TGT = 1;
NT_LOGIN_CODE_TYPE_A2 = 2;
NT_LOGIN_CODE_TYPE_TGTGT = 3;
}

message KeyExchangeRequest {
optional bytes public_key = 1;
optional uint32 type = 2;
Expand Down Expand Up @@ -50,6 +50,7 @@ message NTLoginForwardRequest {
optional bytes session_ticket = 1;
optional bytes buffer = 3;
optional uint32 type = 4;
optional bytes sec_buffer = 5;
}

message NTLoginHead {
Expand Down Expand Up @@ -295,7 +296,7 @@ message NTLoginEasyLoginUnusualDeviceRspBody {
message NTLoginTGTExchangeFastLoginReqBody {
optional bytes tgt = 1;
optional bytes sec_extra = 2;
optional int32 code_type = 3;
optional NTLoginCodeType code_type = 3;
}

message NTLoginTGTExchangeFastLoginRspBody {
Expand Down Expand Up @@ -328,6 +329,16 @@ message NTLoginCommon {
optional bytes body = 2;
}

message NTLoginAndroidExt {
optional int32 field1 = 1;
optional string uin = 2;
}

message NTLoginAndroidCommon {
optional NTLoginCommon common = 2;
optional NTLoginAndroidExt ext = 3;
}

message QrLogin {
optional uint32 scan_result = 1;
optional SafeInfo safe_info = 2;
Expand Down
127 changes: 85 additions & 42 deletions proto/message/v2/message.proto
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ message Elem {
optional Text text = 1;
optional Face face = 2;
optional NotOnlineImage not_online_image = 4;
optional TransElem trans_elem = 5;
optional MarketFace market_face = 6;
optional TransElem trans_elem_info = 5;
optional CustomFace custom_face = 8;
optional RichMsg rich_msg = 12;
optional VideoFile video_file = 19;
Expand Down Expand Up @@ -64,26 +63,10 @@ message NotOnlineImage {
}

message TransElem {
optional int32 elem_type = 1;
optional uint32 elem_type = 1;
optional bytes elem_value = 2;
}

message MarketFace {
optional bytes face_name = 1;
optional int32 item_type = 2;
optional int32 face_info = 3;
optional bytes face_id = 4;
optional int32 tab_id = 5;
optional int32 sub_type = 6;
optional bytes key = 7;
optional bytes param = 8;
optional int32 media_type = 9;
optional int32 image_width = 10;
optional int32 image_height = 11;
optional bytes mobileparam = 12;
optional bytes pb_reserve = 13;
}

message CustomFace {
optional bytes guid = 1;
optional string file_path = 2;
Expand Down Expand Up @@ -118,7 +101,7 @@ message CustomFace {
optional string x400_url = 31;
optional int32 x400_width = 32;
optional int32 x400_height = 33;
optional PbReserve1 pb_reserve = 34;
optional CustomFacePbReserve1 pb_reserve = 34;
}

message RichMsg {
Expand Down Expand Up @@ -158,7 +141,7 @@ message VideoFile {
}

message SourceMsg {
repeated uint32 orig_seqs = 1;
repeated uint64 orig_seqs = 1;
optional uint64 sender_uin = 2;
optional uint32 time = 3;
optional uint32 flag = 4;
Expand Down Expand Up @@ -212,6 +195,27 @@ message SourceMsgResvAttr {
optional string receiver_uid = 7;
}

message GroupFileExtra {
optional uint32 field1 = 1;
optional string file_name = 2;
optional string display = 3;
optional GroupFileExtraInner inner = 7;
}

message GroupFileExtraInner {
optional GroupFileExtraInfo info = 2;
}

message GroupFileExtraInfo {
optional uint32 bus_id = 1;
optional string file_id = 2;
optional int64 file_size = 3;
optional string file_name = 4;
optional uint32 field5 = 5;
optional string field7 = 7;
optional string file_md5 = 8;
}

message FeedsInfo {
optional uint32 bus_id = 1;
optional string file_id = 2;
Expand Down Expand Up @@ -355,15 +359,15 @@ message CommonMessage {
message ContentHead {
optional int32 type = 1;
optional int32 sub_type = 2;
optional int32 c2c_command = 3;
optional int32 c2_c_command = 3;
optional uint32 random = 4;
optional int32 sequence = 5;
optional uint64 sequence = 5;
optional int64 time = 6;
optional int32 pkg_num = 7;
optional int32 pkg_index = 8;
optional int32 div_seq = 9;
optional int32 auto_reply = 10;
optional int32 client_sequence = 11;
optional uint64 client_sequence = 11;
optional uint64 msg_uid = 12;
}

Expand All @@ -374,12 +378,12 @@ message RoutingHead {
optional int32 from_inst_id = 4;
optional int64 to_uin = 5;
optional string to_uid = 6;
optional CommonC2C common_c2c = 7;
optional CommonC2C common_c2_c = 7;
optional CommonGroup group = 8;
}

message CommonC2C {
optional int32 c2c_type = 1;
optional int32 c2_c_type = 1;
optional int32 service_type = 2;
optional bytes sig = 3;
optional int64 from_tiny_id = 4;
Expand Down Expand Up @@ -494,7 +498,7 @@ message TmpPtt {

message Trans211TmpMsg {
optional bytes msg_body = 1;
optional uint32 c2c_cmd = 2;
optional uint32 c2_c_cmd = 2;
}

message MsgPush {
Expand All @@ -506,7 +510,7 @@ message PbSendMsgReq {
optional SendRoutingHead routing_head = 1;
optional SendContentHead content_head = 2;
optional MessageBody message_body = 3;
optional int32 client_sequence = 4;
optional uint64 client_sequence = 4;
optional uint32 random = 5;
}

Expand All @@ -515,8 +519,8 @@ message PbSendMsgResp {
optional string err_msg = 2;
optional int64 send_time = 3;
optional uint32 msg_info_flag = 10;
optional int32 sequence = 11;
optional int32 client_sequence = 14;
optional uint64 sequence = 11;
optional uint64 client_sequence = 14;
}

message SendContentHead {
Expand All @@ -527,7 +531,7 @@ message SendContentHead {
}

message SendRoutingHead {
optional C2C c2c = 1;
optional C2C c2_c = 1;
optional Grp group = 2;
optional Trans0X211 trans0_x211 = 15;
}
Expand All @@ -547,18 +551,40 @@ message Trans0X211 {
optional string uid = 8;
}

message SsoC2CRecallMsgReq {
optional uint32 type = 1;
optional string target_uid = 3;
optional SsoC2CRecallMsgReqInfo info = 4;
optional SsoC2CRecallMsgReqSettings settings = 5;
optional bool field6 = 6;
}

message SsoC2CRecallMsgReqInfo {
optional uint64 sequence = 1;
optional uint32 random = 2;
optional uint64 message_id = 3;
optional uint32 timestamp = 4;
optional uint32 field5 = 5;
optional uint64 client_sequence = 6;
}

message SsoC2CRecallMsgReqSettings {
optional bool field1 = 1;
optional bool field2 = 2;
}

message SsoGetC2CMsgReq {
optional int64 peer_uin = 1;
optional string peer_uid = 2;
optional int32 start_sequence = 3;
optional int32 end_sequence = 4;
optional uint64 start_sequence = 3;
optional uint64 end_sequence = 4;
}

message SsoGetC2CMsgRsp {
optional uint32 retcode = 1;
optional string message = 2;
optional uint32 start_sequence = 3;
optional uint32 end_sequence = 4;
optional uint64 start_sequence = 3;
optional uint64 end_sequence = 4;
repeated CommonMessage messages = 7;
}

Expand All @@ -569,8 +595,8 @@ message SsoGetGroupMsg {

message SsoGetGroupMsgInfo {
optional int64 group_uin = 1;
optional int32 start_sequence = 2;
optional int32 end_sequence = 3;
optional uint64 start_sequence = 2;
optional uint64 end_sequence = 3;
}

message SsoGetGroupMsgRsp {
Expand All @@ -583,8 +609,8 @@ message SsoGetGroupMsgRspBody {
optional uint32 retcode = 1;
optional string message = 2;
optional uint32 group_uin = 3;
optional uint32 start_sequence = 4;
optional uint32 end_sequence = 5;
optional uint64 start_sequence = 4;
optional uint64 end_sequence = 5;
repeated CommonMessage messages = 6;
}

Expand All @@ -604,17 +630,34 @@ message SsoGetRoamMsgRsp {
repeated CommonMessage messages = 7;
}

message PbReserve1 {
message SsoGroupRecallMsgReq {
optional uint32 type = 1;
optional int64 group_uin = 2;
optional SsoGroupRecallMsgReqField3 field3 = 3;
optional SsoGroupRecallMsgReqField4 field4 = 4;
}

message SsoGroupRecallMsgReqField3 {
optional uint64 sequence = 1;
optional uint32 random = 2;
optional uint32 field3 = 3;
}

message SsoGroupRecallMsgReqField4 {
optional uint32 field1 = 1;
}

message CustomFacePbReserve1 {
optional int32 sub_type = 1;
optional int32 field3 = 3;
optional int32 field4 = 4;
optional string summary = 9;
optional int32 field10 = 10;
optional PbReserve2 field21 = 21;
optional CustomFacePbReserve2 field21 = 21;
optional string field31 = 31;
}

message PbReserve2 {
message CustomFacePbReserve2 {
optional int32 field1 = 1;
optional string field2 = 2;
optional int32 field3 = 3;
Expand Down
Loading
Loading