Skip to content

Commit 91fa972

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents 1be467b + 3dd2ef8 commit 91fa972

File tree

6 files changed

+945
-690
lines changed

6 files changed

+945
-690
lines changed

group/group.pb.go

+301-277
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

group/group.proto

+2-1
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,8 @@ message getGroupUsersReqApplicationListReq {
349349
}
350350

351351
message getGroupUsersReqApplicationListResp {
352-
352+
int64 total = 1;
353+
repeated sdkws.GroupRequest groupRequests = 2;
353354
}
354355

355356
service group{

sdkws/sdkws.pb.go

+292-282
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdkws/sdkws.proto

+2-1
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,8 @@ message GroupOwnerTransferredTips{
295295
GroupInfo group = 1;
296296
GroupMemberFullInfo opUser = 2;
297297
GroupMemberFullInfo newGroupOwner = 3;
298-
int64 operationTime = 4;
298+
string oldGroupOwner = 4;
299+
int64 operationTime = 5;
299300
}
300301

301302

user/user.pb.go

+325-120
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

user/user.proto

+23-9
Original file line numberDiff line numberDiff line change
@@ -159,24 +159,38 @@ message userRegisterCountResp {
159159
map<string, int64> count = 3;
160160
}
161161

162+
message subscribeOrCancelUsersStatusReq{
163+
string userID = 1;
164+
repeated string userIDs = 2;
165+
int64 genre = 3;
166+
}
167+
168+
message subscribeOrCancelUsersStatusResp{
169+
map<string, int64> status = 1;
170+
}
171+
172+
173+
162174
service user {
163-
//获取指定的用户信息 全字段
175+
//Get the specified user information full field
164176
rpc getDesignateUsers(getDesignateUsersReq) returns(getDesignateUsersResp);
165-
//更新用户信息
177+
//update user information
166178
rpc updateUserInfo(updateUserInfoReq) returns(updateUserInfoResp);
167-
//设置用户消息接收选项
179+
//Set user message receiving options
168180
rpc setGlobalRecvMessageOpt(setGlobalRecvMessageOptReq) returns(setGlobalRecvMessageOptResp);
169-
//获取用户消息接收选项 没找到不返回错误
181+
//Get the user message receiving option If not found, no error will be returned
170182
rpc getGlobalRecvMessageOpt(getGlobalRecvMessageOptReq) returns(getGlobalRecvMessageOptResp);
171-
//检查userID是否存在
183+
//Check if userID exists
172184
rpc accountCheck(accountCheckReq) returns (accountCheckResp);
173-
//翻页(或指定userID,昵称)拉取用户信息 全字段
185+
//Turn the page (or specify userID, nickname) to pull user information Full field
174186
rpc getPaginationUsers(getPaginationUsersReq) returns (getPaginationUsersResp);
175-
//用户注册
187+
//user registration
176188
rpc userRegister(userRegisterReq) returns (userRegisterResp);
177-
//获取所有用户ID
189+
//Get all user IDs
178190
rpc getAllUserID(getAllUserIDReq) returns (getAllUserIDResp);
179-
// 获取用户总数和指定时间段内的用户增量
191+
//Get the total number of users and the user increment within a specified time period
180192
rpc userRegisterCount(userRegisterCountReq)returns(userRegisterCountResp);
193+
//Subscribe or unsubscribe user presence
194+
rpc subscribeOrCancelUsersStatus(subscribeOrCancelUsersStatusReq)returns(subscribeOrCancelUsersStatusResp);
181195
}
182196

0 commit comments

Comments
 (0)